diff --git a/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm b/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm index 27ed10f7b271..151248e75019 100644 --- a/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm +++ b/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm @@ -51,6 +51,11 @@ }, /turf/open/water/beach, /area/ruin/beach/oceantown) +"aK" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp/bananalamp, +/turf/open/floor/carpet, +/area/ruin/beach/oceantown) "aM" = ( /obj/machinery/door/airlock{ name = "Employees Only" @@ -527,6 +532,11 @@ /obj/structure/flora/ausbushes/leafybush, /turf/open/floor/plating/grass/beach/lit, /area/ruin/beach/oceantown) +"gp" = ( +/obj/structure/table/wood, +/obj/machinery/light/small/directional/west, +/turf/open/floor/carpet/green, +/area/ruin/beach/oceantown) "gu" = ( /obj/effect/turf_decal/sand/plating{ light_range = 2 @@ -1264,10 +1274,6 @@ }, /turf/open/floor/plating/asteroid/sand/lit, /area/ruin/beach/oceantown) -"qJ" = ( -/obj/machinery/light/small/directional/west, -/turf/open/floor/plating/grass/beach/lit, -/area/ruin/beach/oceantown) "qW" = ( /obj/structure/chair/wood{ dir = 4 @@ -1775,6 +1781,12 @@ }, /turf/open/floor/plating/grass/beach/lit, /area/ruin/beach/oceantown) +"xu" = ( +/obj/structure/table/wood, +/obj/item/book/manual/ripley_build_and_repair, +/obj/machinery/light/small/directional/north, +/turf/open/floor/wood, +/area/ruin/beach/oceantown) "xx" = ( /obj/structure/flora/tree/palm{ icon_state = "palm2" @@ -1886,11 +1898,6 @@ light_range = 2 }, /area/ruin/beach/oceantown) -"yC" = ( -/obj/structure/table/wood, -/obj/machinery/light/small/directional/north, -/turf/open/floor/carpet/green, -/area/ruin/beach/oceantown) "yD" = ( /obj/effect/turf_decal/corner/opaque/white/diagonal{ dir = 8 @@ -2148,11 +2155,6 @@ /obj/structure/flora/ausbushes/ywflowers, /turf/open/floor/plating/grass/beach/lit, /area/ruin/beach/oceantown) -"BQ" = ( -/obj/structure/flora/ausbushes/fullgrass, -/obj/machinery/light/small/directional/west, -/turf/open/floor/plating/grass/beach/lit, -/area/ruin/beach/oceantown) "BV" = ( /obj/structure/filingcabinet, /turf/open/floor/plasteel/grimy, @@ -2498,12 +2500,6 @@ light_range = 2 }, /area/ruin/beach/oceantown) -"EX" = ( -/obj/structure/table/wood, -/obj/item/book/manual/ripley_build_and_repair, -/obj/machinery/light/small/directional/north, -/turf/open/floor/wood, -/area/ruin/beach/oceantown) "FA" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -2641,12 +2637,6 @@ light_range = 2 }, /area/ruin/beach/oceantown) -"Gz" = ( -/obj/structure/table/wood, -/obj/item/book/manual/wiki/medical_cloning, -/obj/machinery/light/small/directional/west, -/turf/open/floor/wood, -/area/ruin/beach/oceantown) "GA" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -2731,6 +2721,11 @@ light_range = 2 }, /area/ruin/beach/oceantown) +"Hk" = ( +/obj/effect/turf_decal/weather/sand, +/obj/effect/turf_decal/weather/sand, +/turf/open/water/beach, +/area/ruin/beach/oceantown) "Hp" = ( /obj/structure/table/wood, /obj/machinery/chem_dispenser/drinks/beer/fullupgrade{ @@ -3035,11 +3030,6 @@ light_range = 2 }, /area/ruin/beach/oceantown) -"Kr" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp/bananalamp, -/turf/open/floor/carpet, -/area/ruin/beach/oceantown) "Kx" = ( /obj/effect/turf_decal/road/stripes, /obj/effect/turf_decal/road/stripes{ @@ -3313,6 +3303,12 @@ light_range = 2 }, /area/ruin/beach/oceantown) +"Ni" = ( +/obj/structure/table/wood, +/obj/item/book/manual/wiki/medical_cloning, +/obj/machinery/light/small/directional/west, +/turf/open/floor/wood, +/area/ruin/beach/oceantown) "Np" = ( /turf/open/floor/plasteel, /area/ruin/beach/oceantown) @@ -3756,11 +3752,6 @@ /obj/effect/spawner/lootdrop/donut/jelly, /turf/open/floor/plasteel/patterned/grid, /area/ruin/beach/oceantown/shop) -"SV" = ( -/obj/structure/table/wood, -/obj/machinery/light/small/directional/west, -/turf/open/floor/carpet/green, -/area/ruin/beach/oceantown) "SY" = ( /obj/structure/chair/comfy/brown{ dir = 1 @@ -3918,26 +3909,11 @@ "UX" = ( /turf/closed/wall/mineral/wood/nonmetal, /area/ruin/beach/oceantown/shop) -"Vb" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/machinery/light/small/directional/west, -/turf/open/floor/wood{ - light_range = 2 - }, -/area/ruin/beach/oceantown) "Vf" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/effect/turf_decal/box, /turf/open/floor/plasteel/white, /area/ruin/beach/oceantown/bar) -"Vn" = ( -/obj/machinery/light/small/directional/west, -/turf/open/floor/concrete/pavement{ - light_range = 2 - }, -/area/ruin/beach/oceantown) "Vr" = ( /obj/structure/bed, /obj/item/bedsheet/dorms, @@ -4249,6 +4225,11 @@ /obj/structure/closet/crate/bin, /turf/open/floor/plating/asteroid/sand/lit, /area/ruin/beach/oceantown) +"Zc" = ( +/obj/structure/table/wood, +/obj/machinery/light/small/directional/north, +/turf/open/floor/carpet/green, +/area/ruin/beach/oceantown) "Zf" = ( /obj/machinery/door/airlock{ name = "Bathroom" @@ -6048,7 +6029,7 @@ Ru Ru Ru Ru -Vn +Ru Ru Ru Ru @@ -6117,11 +6098,11 @@ xo xo xo xo -Vb -Vb -Vb xo -Vb +xo +xo +xo +xo xo xo xo @@ -6190,10 +6171,10 @@ uC FF Wl Wl -qJ -qJ -qJ -qJ +Wl +Wl +Wl +Wl Wl Wl Wl @@ -6266,8 +6247,8 @@ pB Wl Wl FF -BQ -BQ +FF +FF Wl rl qw @@ -6510,14 +6491,14 @@ rl FF FF xh -SV +gp xF im dT IU VZ sj -Gz +Ni lc Al sp @@ -6896,7 +6877,7 @@ PC qw xh KO -Kr +aK sy xh ao @@ -8471,7 +8452,7 @@ YU YU "} (55,1,1) = {" -qp +Hk sa sa sa @@ -8548,7 +8529,7 @@ YU YU "} (56,1,1) = {" -ev +qp sa sa sa @@ -8625,7 +8606,7 @@ YU YU "} (57,1,1) = {" -ev +qp sa sa sa @@ -8702,7 +8683,7 @@ YU YU "} (58,1,1) = {" -ev +qp sa sa sa @@ -9228,7 +9209,7 @@ Ru fG Wl xh -EX +xu dT zl bu @@ -9767,7 +9748,7 @@ Ru fG gn xh -yC +Zc im Pm dT diff --git a/_maps/shuttles/shiptest/independent_beluga.dmm b/_maps/shuttles/shiptest/independent_beluga.dmm index 4d1e348e4bb4..6431371844ce 100644 --- a/_maps/shuttles/shiptest/independent_beluga.dmm +++ b/_maps/shuttles/shiptest/independent_beluga.dmm @@ -956,7 +956,9 @@ dir = 4 }, /obj/effect/turf_decal/steeldecal/steel_decals10, -/obj/machinery/door/airlock/engineering/glass, +/obj/machinery/door/airlock/engineering/glass{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, diff --git a/_maps/shuttles/shiptest/independent_box.dmm b/_maps/shuttles/shiptest/independent_box.dmm index 2f826995a898..82f081a1e8b9 100644 --- a/_maps/shuttles/shiptest/independent_box.dmm +++ b/_maps/shuttles/shiptest/independent_box.dmm @@ -687,6 +687,7 @@ name = "Egnine shutter"; pixel_y = 28 }, +/obj/machinery/light/small/broken/directional/south, /turf/open/floor/plating, /area/ship/engineering) "cJ" = ( @@ -1647,15 +1648,15 @@ dir = 1; id = "whiteship_windows"; name = "Windows Blast Door Control"; - pixel_x = -5; - pixel_y = -27 + pixel_x = -7; + pixel_y = -22 }, /obj/machinery/button/door{ dir = 1; id = "whiteship_bridge"; name = "Bridge Blast Door Control"; pixel_x = 5; - pixel_y = -27 + pixel_y = -22 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -1665,13 +1666,13 @@ id = "emergencybay_blastdoors"; name = "Emergency Bay Blastdoors"; pixel_x = 5; - pixel_y = -40 + pixel_y = -33 }, /obj/machinery/button/shieldwallgen{ dir = 1; id = "box_cargo"; pixel_x = -5; - pixel_y = -38 + pixel_y = -31 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/nanoweave/blue, @@ -1775,13 +1776,10 @@ /obj/effect/turf_decal/corner/opaque/blue{ dir = 4 }, -/obj/structure/sign/poster/official/mini_energy_gun{ - pixel_y = -32 - }, /obj/machinery/computer/cargo/express{ dir = 1 }, -/obj/machinery/firealarm/directional/west, +/obj/machinery/firealarm/directional/south, /turf/open/floor/plasteel/dark, /area/ship/bridge) "vE" = ( @@ -1960,7 +1958,6 @@ /turf/open/floor/plasteel/white, /area/ship/medical) "yA" = ( -/obj/machinery/light/small/directional/south, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 4 }, @@ -1972,7 +1969,7 @@ dir = 8 }, /obj/machinery/advanced_airlock_controller{ - pixel_y = -28 + pixel_y = -20 }, /obj/effect/turf_decal/arrows, /turf/open/floor/plating, @@ -1994,6 +1991,7 @@ name = "Egnine shutter"; pixel_y = -28 }, +/obj/machinery/light/small/directional/north, /turf/open/floor/plating, /area/ship/engineering) "yN" = ( @@ -2057,9 +2055,8 @@ layer = 2.35 }, /obj/machinery/advanced_airlock_controller{ - pixel_y = 28 + pixel_y = 24 }, -/obj/machinery/light/small/broken/directional/north, /turf/open/floor/plating, /area/ship/engineering) "AL" = ( diff --git a/_maps/shuttles/shiptest/independent_boyardee.dmm b/_maps/shuttles/shiptest/independent_boyardee.dmm index b2978137f068..ede51c9a219c 100644 --- a/_maps/shuttles/shiptest/independent_boyardee.dmm +++ b/_maps/shuttles/shiptest/independent_boyardee.dmm @@ -1,16 +1,4 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"ai" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/vending/clothing, -/obj/machinery/light/directional/east, -/obj/effect/turf_decal/siding/wood{ - dir = 8; - color = "#543C30" - }, -/turf/open/floor/wood/walnut, -/area/ship/crew) "ao" = ( /obj/machinery/power/smes/engineering, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ @@ -112,6 +100,26 @@ /obj/machinery/newscaster/directional/west, /turf/open/floor/plasteel/patterned/brushed, /area/ship/crew/canteen) +"cZ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/light_switch{ + pixel_x = -25; + pixel_y = 25 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 2; + color = "#543C30" + }, +/turf/open/floor/wood/walnut, +/area/ship/crew) "dh" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 @@ -123,6 +131,17 @@ /obj/item/toy/cards/deck/kotahi, /turf/open/floor/carpet/red_gold, /area/ship/crew/canteen) +"dr" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#543C30" + }, +/turf/open/floor/wood/walnut, +/area/ship/crew) "dt" = ( /obj/structure/urinal{ pixel_y = 32 @@ -156,6 +175,22 @@ /obj/machinery/suit_storage_unit/standard_unit, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) +"dP" = ( +/obj/machinery/vending/cigarette, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/turf/open/floor/wood, +/area/ship/crew/canteen) +"dU" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/structure/chair/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/ship/crew/canteen) "dV" = ( /turf/closed/wall, /area/ship/maintenance) @@ -186,26 +221,6 @@ }, /turf/open/floor/plasteel/dark, /area/ship/storage) -"ef" = ( -/obj/structure/table/wood, -/obj/item/paper_bin, -/obj/item/pen/fountain, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/item/megaphone{ - pixel_x = 3; - pixel_y = 1 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 2; - color = "#543C30" - }, -/turf/open/floor/wood/walnut, -/area/ship/crew) "ej" = ( /obj/structure/table/reinforced, /obj/item/storage/box/donkpockets, @@ -231,6 +246,18 @@ }, /turf/open/floor/plasteel/dark, /area/ship/bridge) +"ev" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/wood, +/area/ship/crew/canteen) "ex" = ( /obj/machinery/airalarm/directional/south, /turf/open/floor/plasteel, @@ -298,15 +325,19 @@ /obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, /area/ship/crew/hydroponics) -"fl" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 9 - }, -/turf/open/floor/wood, -/area/ship/crew/canteen) "fs" = ( /turf/open/floor/plasteel, /area/ship/crew/hydroponics) +"fz" = ( +/obj/machinery/cryopod{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood/corner{ + color = "#543C30"; + dir = 4 + }, +/turf/open/floor/wood/walnut, +/area/ship/crew) "fG" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -326,6 +357,12 @@ }, /turf/open/floor/plasteel/mono/white, /area/ship/bridge) +"gq" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/ship/crew/canteen) "gL" = ( /obj/effect/turf_decal/number/two, /turf/open/floor/plating/airless, @@ -363,6 +400,14 @@ }, /turf/open/floor/plating/airless, /area/ship/external) +"hJ" = ( +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#543C30" + }, +/turf/open/floor/wood/walnut, +/area/ship/crew) "hL" = ( /obj/structure/bed, /obj/item/bedsheet/random, @@ -390,25 +435,10 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/plating, /area/ship/maintenance) -"iA" = ( -/obj/structure/bed, -/obj/item/bedsheet/random, -/obj/structure/curtain/bounty, -/obj/effect/turf_decal/siding/wood{ - dir = 1; - color = "#543C30" - }, -/turf/open/floor/wood/walnut, -/area/ship/crew) "iB" = ( /obj/machinery/status_display/shuttle, /turf/closed/wall, /area/ship/storage) -"iR" = ( -/obj/machinery/light/directional/south, -/obj/effect/turf_decal/siding/wood, -/turf/open/floor/wood, -/area/ship/crew/canteen) "ja" = ( /obj/machinery/door/poddoor{ id = "windowlockdown"; @@ -442,49 +472,24 @@ /obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, /area/ship/cargo) -"jL" = ( -/obj/structure/chair/office{ - dir = 1 +"jA" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/obj/effect/turf_decal/siding/wood{ - dir = 4; - color = "#543C30" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/turf/open/floor/wood/walnut, -/area/ship/crew) +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/wood, +/area/ship/crew/canteen) "jN" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, /turf/open/floor/plasteel, /area/ship/cargo) -"kf" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/airalarm/directional/east, -/obj/effect/turf_decal/siding/wood{ - dir = 8; - color = "#543C30" - }, -/turf/open/floor/wood/walnut, -/area/ship/crew) -"kh" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp/green{ - pixel_x = -6; - pixel_y = 10 - }, -/obj/item/folder, -/obj/machinery/computer/cryopod/directional/north{ - pixel_y = 17 - }, -/obj/item/radio/intercom/directional/west, -/obj/effect/turf_decal/siding/wood/corner{ - color = "#543C30" - }, -/turf/open/floor/wood/walnut, -/area/ship/crew) "kr" = ( /obj/structure/sign/warning/chemdiamond, /turf/closed/wall, @@ -596,16 +601,6 @@ /obj/item/spacecash/bundle/c1000, /turf/open/floor/plasteel/dark, /area/ship/bridge) -"lY" = ( -/obj/machinery/cryopod{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood/corner{ - color = "#543C30"; - dir = 4 - }, -/turf/open/floor/wood/walnut, -/area/ship/crew) "me" = ( /obj/structure/window/reinforced/spawner/west, /obj/machinery/power/smes/shuttle/precharged{ @@ -661,13 +656,6 @@ /obj/item/stack/sheet/mineral/plasma/five, /turf/open/floor/plating, /area/ship/maintenance) -"mX" = ( -/obj/machinery/vending/cigarette, -/obj/effect/turf_decal/siding/wood{ - dir = 6 - }, -/turf/open/floor/wood, -/area/ship/crew/canteen) "nc" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/industrial/warning{ @@ -694,6 +682,18 @@ /obj/effect/turf_decal/corner/opaque/white/half, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) +"ny" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood, +/area/ship/crew/canteen) "nA" = ( /obj/effect/turf_decal/industrial/warning/corner{ dir = 1 @@ -726,20 +726,37 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/plasteel/freezer, /area/ship/storage) -"op" = ( -/obj/structure/table/reinforced, +"oX" = ( +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood, +/area/ship/crew/canteen) +"pb" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/structure/table/wood/fancy/black, +/obj/item/reagent_containers/food/condiment/saltshaker{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/reagent_containers/food/condiment/peppermill, +/turf/open/floor/wood, +/area/ship/crew/canteen) +"pg" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/obj/item/areaeditor/shuttle{ - pixel_x = -11 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/item/radio/intercom/wideband/table{ - dir = 8; - canhear_range = 5 +/obj/effect/turf_decal/siding/wood{ + dir = 4 }, -/turf/open/floor/plasteel/mono/white, -/area/ship/bridge) +/turf/open/floor/wood, +/area/ship/crew/canteen) "ph" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 @@ -767,16 +784,6 @@ /obj/machinery/status_display/shuttle, /turf/closed/wall/r_wall, /area/ship/bridge) -"pH" = ( -/obj/structure/bed, -/obj/item/bedsheet/random, -/obj/structure/curtain/bounty, -/obj/effect/turf_decal/siding/wood/corner{ - color = "#543C30"; - dir = 1 - }, -/turf/open/floor/wood/walnut, -/area/ship/crew) "pN" = ( /obj/machinery/atmospherics/components/binary/valve/digital, /obj/structure/cable{ @@ -826,6 +833,24 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/ship/crew/hydroponics) +"qB" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/obj/structure/chair/sofa/right{ + dir = 4 + }, +/turf/open/floor/wood, +/area/ship/crew/canteen) +"qE" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/structure/chair/stool/bar{ + dir = 8 + }, +/turf/open/floor/wood, +/area/ship/crew/canteen) "qO" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 @@ -841,10 +866,30 @@ }, /turf/open/floor/plating, /area/ship/maintenance) +"qZ" = ( +/obj/structure/bed, +/obj/item/bedsheet/random, +/obj/structure/curtain/bounty, +/obj/effect/turf_decal/siding/wood{ + dir = 1; + color = "#543C30" + }, +/turf/open/floor/wood/walnut, +/area/ship/crew) "rj" = ( /obj/structure/ore_box, /turf/open/floor/plasteel/dark, /area/ship/cargo) +"rk" = ( +/obj/machinery/computer/helm/viewscreen/directional/west, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/structure/chair/sofa/left{ + dir = 4 + }, +/turf/open/floor/wood, +/area/ship/crew/canteen) "rm" = ( /obj/structure/urinal{ pixel_y = 32 @@ -885,6 +930,16 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) +"rz" = ( +/obj/structure/chair/office{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#543C30" + }, +/turf/open/floor/wood/walnut, +/area/ship/crew) "rA" = ( /obj/structure/sink/kitchen{ dir = 4; @@ -898,52 +953,27 @@ }, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) -"rH" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/ship/maintenance) -"rM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/wood, -/area/ship/crew/canteen) -"rR" = ( +"rC" = ( +/obj/structure/table/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/wood, -/area/ship/crew/canteen) -"rY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/item/areaeditor/shuttle{ + pixel_x = -11 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/item/radio/intercom/wideband/table{ + dir = 8; + canhear_range = 5 }, +/turf/open/floor/plasteel/mono/white, +/area/ship/bridge) +"rH" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/turf/open/floor/wood, -/area/ship/crew/canteen) +/turf/open/floor/plating, +/area/ship/maintenance) "sg" = ( /turf/closed/wall, /area/ship/storage) @@ -979,8 +1009,13 @@ /obj/machinery/status_display/shuttle, /turf/closed/wall, /area/ship/cargo) -"sT" = ( -/obj/effect/turf_decal/siding/wood, +"sR" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/structure/chair/wood{ + dir = 8 + }, /turf/open/floor/wood, /area/ship/crew/canteen) "sU" = ( @@ -1008,25 +1043,14 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/plasteel/patterned, /area/ship/crew/canteen) -"tz" = ( -/obj/item/radio, -/obj/item/radio, -/obj/item/radio, -/obj/item/radio, -/obj/item/radio, -/obj/item/radio, -/obj/structure/closet/crate, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/item/radio/intercom/directional/east, -/obj/effect/turf_decal/siding/wood/corner{ - color = "#543C30"; +"tC" = ( +/obj/docking_port/stationary{ + width = 15; + height = 15; dir = 8 }, -/turf/open/floor/wood/walnut, -/area/ship/crew) +/turf/closed/wall, +/area/ship/crew/canteen) "tP" = ( /obj/effect/turf_decal/corner/transparent/neutral{ dir = 1 @@ -1053,19 +1077,6 @@ }, /turf/open/floor/carpet/red_gold, /area/ship/crew/canteen) -"tW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/siding/wood, -/turf/open/floor/wood, -/area/ship/crew/canteen) "ua" = ( /obj/effect/turf_decal/industrial/warning/corner{ dir = 4 @@ -1073,13 +1084,6 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/plasteel, /area/ship/cargo) -"uC" = ( -/obj/machinery/airalarm/directional/south, -/obj/effect/turf_decal/siding/wood{ - dir = 6 - }, -/turf/open/floor/wood, -/area/ship/crew/canteen) "uI" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -1091,7 +1095,7 @@ /obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, /area/ship/crew/hydroponics) -"uN" = ( +"uP" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, @@ -1099,17 +1103,13 @@ dir = 8 }, /obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "1-4" + icon_state = "4-8" }, /obj/effect/turf_decal/siding/wood{ - dir = 8; - color = "#543C30" + dir = 8 }, -/turf/open/floor/wood/walnut, -/area/ship/crew) +/turf/open/floor/wood, +/area/ship/crew/canteen) "uR" = ( /turf/closed/wall, /area/ship/crew) @@ -1125,6 +1125,21 @@ /obj/item/radio/intercom/directional/west, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) +"vi" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/ship/crew/canteen) "vw" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -1156,13 +1171,26 @@ /obj/machinery/holopad/emergency/kitchen, /turf/open/floor/plasteel/mono/white, /area/ship/bridge) -"wG" = ( -/obj/machinery/light/directional/north, +"wF" = ( +/obj/structure/table/wood, +/obj/item/paper_bin, +/obj/item/pen/fountain, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/item/megaphone{ + pixel_x = 3; + pixel_y = 1 + }, /obj/effect/turf_decal/siding/wood{ - dir = 5 + dir = 2; + color = "#543C30" }, -/turf/open/floor/wood, -/area/ship/crew/canteen) +/turf/open/floor/wood/walnut, +/area/ship/crew) "wO" = ( /obj/machinery/seed_extractor, /obj/effect/turf_decal/box, @@ -1232,9 +1260,15 @@ /obj/item/storage/pill_bottle/dice, /turf/open/floor/carpet/red_gold, /area/ship/crew/canteen) -"xC" = ( +"xH" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/turf/open/floor/plasteel/mono, +/area/ship/bridge) +"xO" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -1243,16 +1277,11 @@ icon_state = "4-8" }, /obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/turf/open/floor/wood, -/area/ship/crew/canteen) -"xH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 + dir = 4; + color = "#543C30" }, -/turf/open/floor/plasteel/mono, -/area/ship/bridge) +/turf/open/floor/wood/walnut, +/area/ship/crew) "xX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -1262,16 +1291,6 @@ }, /turf/open/floor/plasteel, /area/ship/crew/canteen) -"yg" = ( -/obj/machinery/light/directional/west, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/structure/chair/stool/bar{ - dir = 4 - }, -/turf/open/floor/wood, -/area/ship/crew/canteen) "yi" = ( /turf/open/floor/plating/airless, /area/ship/external) @@ -1342,17 +1361,6 @@ }, /turf/open/floor/plasteel/mono/white, /area/ship/bridge) -"zs" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/effect/turf_decal/siding/wood, -/obj/machinery/newscaster/directional/south, -/turf/open/floor/wood, -/area/ship/crew/canteen) "zu" = ( /obj/machinery/gibber, /obj/machinery/power/apc/auto_name/directional/west, @@ -1455,19 +1463,15 @@ /obj/item/toy/cards/deck/syndicate, /turf/open/floor/carpet/red_gold, /area/ship/crew/canteen) -"Bp" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/turf/open/floor/wood, -/area/ship/crew/canteen) -"Bq" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 10 +"Bk" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 }, -/obj/structure/chair/sofa/right{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 }, +/obj/effect/turf_decal/siding/wood, +/obj/machinery/newscaster/directional/south, /turf/open/floor/wood, /area/ship/crew/canteen) "BC" = ( @@ -1524,22 +1528,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/ship/bridge) -"CF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4; - color = "#543C30" - }, -/turf/open/floor/wood/walnut, -/area/ship/crew) "CP" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -1613,20 +1601,8 @@ /obj/item/toy/cards/deck/cas{ pixel_y = 8 }, -/obj/item/toy/cards/deck/cas/black, -/turf/open/floor/carpet/red_gold, -/area/ship/crew/canteen) -"Dk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/turf/open/floor/wood, +/obj/item/toy/cards/deck/cas/black, +/turf/open/floor/carpet/red_gold, /area/ship/crew/canteen) "Ds" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -1660,6 +1636,15 @@ /obj/effect/turf_decal/box, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) +"DC" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/structure/chair/stool/bar{ + dir = 4 + }, +/turf/open/floor/wood, +/area/ship/crew/canteen) "DD" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 @@ -1694,15 +1679,6 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/plasteel, /area/ship/cargo) -"DM" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/structure/chair/sofa{ - dir = 4 - }, -/turf/open/floor/wood, -/area/ship/crew/canteen) "DV" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 8; @@ -1734,13 +1710,9 @@ /obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, /area/ship/cargo) -"Eb" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/structure/chair/wood{ - dir = 8 - }, +"Ed" = ( +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/ship/crew/canteen) "Ei" = ( @@ -1778,13 +1750,6 @@ }, /turf/open/floor/plating, /area/ship/crew/canteen) -"Ey" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood/corner, -/turf/open/floor/wood, -/area/ship/crew/canteen) "EF" = ( /obj/effect/turf_decal/corner/transparent/neutral{ dir = 1 @@ -1862,6 +1827,16 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel/dark, /area/ship/bridge) +"FD" = ( +/obj/machinery/cryopod{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4; + color = "#543C30" + }, +/turf/open/floor/wood/walnut, +/area/ship/crew) "FE" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -1981,13 +1956,11 @@ }, /turf/open/floor/plating, /area/ship/maintenance) -"HT" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/structure/chair/stool/bar{ - dir = 8 +"HG" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 }, +/obj/effect/turf_decal/siding/wood/corner, /turf/open/floor/wood, /area/ship/crew/canteen) "HY" = ( @@ -2016,6 +1989,18 @@ /obj/structure/table/reinforced, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) +"Ix" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/vending/clothing, +/obj/machinery/light/directional/east, +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#543C30" + }, +/turf/open/floor/wood/walnut, +/area/ship/crew) "IC" = ( /obj/effect/turf_decal/ihejirika_small{ dir = 8 @@ -2050,6 +2035,22 @@ /obj/machinery/status_display/shuttle, /turf/closed/wall, /area/ship/crew/canteen) +"JE" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + pixel_x = -6; + pixel_y = 10 + }, +/obj/item/folder, +/obj/machinery/computer/cryopod/directional/north{ + pixel_y = 17 + }, +/obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/siding/wood/corner{ + color = "#543C30" + }, +/turf/open/floor/wood/walnut, +/area/ship/crew) "JR" = ( /turf/closed/wall/r_wall, /area/ship/crew) @@ -2256,23 +2257,6 @@ }, /turf/open/floor/plasteel/dark, /area/ship/crew) -"Pi" = ( -/obj/machinery/firealarm/directional/south, -/obj/effect/turf_decal/siding/wood{ - dir = 1; - color = "#543C30" - }, -/turf/open/floor/wood/walnut, -/area/ship/crew) -"PY" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/structure/chair/wood{ - dir = 4 - }, -/turf/open/floor/wood, -/area/ship/crew/canteen) "Qc" = ( /obj/structure/table/reinforced, /obj/effect/spawner/lootdrop/donkpockets, @@ -2312,16 +2296,6 @@ }, /turf/open/floor/plating, /area/ship/maintenance) -"QQ" = ( -/obj/machinery/computer/helm/viewscreen/directional/west, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/structure/chair/sofa/left{ - dir = 4 - }, -/turf/open/floor/wood, -/area/ship/crew/canteen) "QR" = ( /obj/item/storage/toolbox/electrical, /obj/item/storage/toolbox/electrical, @@ -2346,18 +2320,6 @@ /obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, /area/ship/cargo) -"Rk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/turf/open/floor/wood, -/area/ship/crew/canteen) "Ro" = ( /obj/machinery/smartfridge/food, /turf/closed/wall/mineral/titanium/nodiagonal, @@ -2375,6 +2337,16 @@ }, /turf/open/floor/plasteel/mono/white, /area/ship/bridge) +"RU" = ( +/obj/structure/bed, +/obj/item/bedsheet/random, +/obj/structure/curtain/bounty, +/obj/effect/turf_decal/siding/wood/corner{ + color = "#543C30"; + dir = 1 + }, +/turf/open/floor/wood/walnut, +/area/ship/crew) "Sa" = ( /turf/open/floor/plasteel, /area/ship/crew/canteen) @@ -2426,6 +2398,13 @@ }, /turf/open/floor/plasteel, /area/ship/crew/canteen) +"SM" = ( +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/turf/open/floor/wood, +/area/ship/crew/canteen) "SO" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/structure/closet/secure_closet/freezer/meat/open, @@ -2464,11 +2443,27 @@ }, /turf/open/floor/plating/airless, /area/ship/external) -"TB" = ( -/obj/machinery/light/directional/west, -/obj/effect/turf_decal/siding/wood{ +"To" = ( +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/structure/closet/crate, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/item/radio/intercom/directional/east, +/obj/effect/turf_decal/siding/wood/corner{ + color = "#543C30"; dir = 8 }, +/turf/open/floor/wood/walnut, +/area/ship/crew) +"Tp" = ( +/obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/ship/crew/canteen) "TD" = ( @@ -2501,15 +2496,6 @@ /obj/structure/catwalk/over/plated_catwalk, /turf/open/floor/plating, /area/ship/cargo) -"Uk" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/structure/chair/stool/bar{ - dir = 4 - }, -/turf/open/floor/wood, -/area/ship/crew/canteen) "Um" = ( /obj/machinery/chem_master/condimaster, /obj/item/storage/box/beakers, @@ -2538,6 +2524,22 @@ }, /turf/open/floor/plasteel, /area/ship/cargo) +"Uy" = ( +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/structure/chair/stool/bar{ + dir = 4 + }, +/turf/open/floor/wood, +/area/ship/crew/canteen) +"UC" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/turf/open/floor/wood, +/area/ship/crew/canteen) "UI" = ( /obj/effect/turf_decal/corner/transparent/neutral{ dir = 1 @@ -2635,6 +2637,15 @@ /obj/effect/turf_decal/box, /turf/open/floor/plasteel/dark, /area/ship/crew/hydroponics) +"WA" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/structure/chair/sofa{ + dir = 4 + }, +/turf/open/floor/wood, +/area/ship/crew/canteen) "WH" = ( /obj/effect/turf_decal/corner/transparent/neutral{ dir = 1 @@ -2647,26 +2658,6 @@ }, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) -"WJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/light_switch{ - pixel_x = -25; - pixel_y = 25 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 2; - color = "#543C30" - }, -/turf/open/floor/wood/walnut, -/area/ship/crew) "WP" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plasteel, @@ -2733,6 +2724,15 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel/dark, /area/ship/crew) +"Yr" = ( +/obj/docking_port/stationary{ + width = 30; + height = 15; + dir = 8; + dwidth = 15 + }, +/turf/template_noop, +/area/template_noop) "YC" = ( /obj/machinery/door/airlock/external{ dir = 8 @@ -2743,10 +2743,23 @@ /obj/machinery/light_switch{ dir = 1; pixel_x = 25; - pixel_y = -25 + pixel_y = -20 }, /turf/open/floor/plasteel, /area/ship/cargo) +"YT" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood, +/area/ship/crew/canteen) "YZ" = ( /obj/machinery/door/poddoor{ id = "bridgelockdown"; @@ -2755,18 +2768,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/ship/bridge) -"Zd" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/structure/table/wood/fancy/black, -/obj/item/reagent_containers/food/condiment/saltshaker{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/reagent_containers/food/condiment/peppermill, -/turf/open/floor/wood, -/area/ship/crew/canteen) "Zm" = ( /obj/machinery/door/airlock{ dir = 4 @@ -2796,16 +2797,13 @@ /obj/machinery/light/directional/south, /turf/open/floor/plasteel/dark, /area/ship/crew/hydroponics) -"ZB" = ( -/obj/machinery/cryopod{ - dir = 1 - }, +"ZG" = ( +/obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/siding/wood{ - dir = 4; - color = "#543C30" + dir = 6 }, -/turf/open/floor/wood/walnut, -/area/ship/crew) +/turf/open/floor/wood, +/area/ship/crew/canteen) "ZQ" = ( /obj/machinery/light_switch{ dir = 1; @@ -2814,14 +2812,25 @@ }, /turf/open/floor/plasteel/mono, /area/ship/bridge) -"ZW" = ( -/obj/docking_port/stationary{ - width = 15; - height = 15; +"ZY" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/turf/template_noop, -/area/template_noop) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8; + color = "#543C30" + }, +/turf/open/floor/wood/walnut, +/area/ship/crew) (1,1,1) = {" vZ @@ -2829,7 +2838,7 @@ vZ vZ vZ vZ -ZW +Yr vZ vZ vZ @@ -3019,7 +3028,7 @@ Qm sU CP rt -sU +tC XQ sU sU @@ -3036,28 +3045,28 @@ vZ (11,1,1) = {" vZ cC -fl -TB -rY -Uk -yg -Rk -QQ -DM -Bq +UC +oX +uP +DC +Uy +ny +rk +WA +qB uR -kh -jL -CF -ZB -lY +JE +rz +xO +FD +fz JR vZ "} (12,1,1) = {" vZ xr -PY +dU qO Se Od @@ -3065,20 +3074,20 @@ Dj DD Da tT -zs +Bk uR -ef +wF XB Ei IV -Pi +hJ JR vZ "} (13,1,1) = {" vZ xr -Zd +pb FE Af UO @@ -3086,20 +3095,20 @@ xy ro hZ XU -tW +YT Yj -WJ +cZ dy AF ct -iA +qZ eS vZ "} (14,1,1) = {" vZ xr -Eb +sR my jj Bc @@ -3107,28 +3116,28 @@ di st Wf az -iR +Ed uR -tz -ai -kf -uN -pH +To +Ix +dr +ZY +RU eS vZ "} (15,1,1) = {" vZ xr -PY -rR -Ey -HT -HT -Bp -Bp -Dk -uC +dU +ev +HG +qE +qE +gq +gq +pg +ZG uR uR uR @@ -3141,9 +3150,9 @@ vZ (16,1,1) = {" vZ xr -Zd -rM -sT +pb +jA +Tp WH kS kS @@ -3162,9 +3171,9 @@ vZ (17,1,1) = {" vZ xr -Eb -rM -sT +sR +jA +Tp sp cy sn @@ -3183,9 +3192,9 @@ vZ (18,1,1) = {" vZ cC -wG -xC -mX +SM +vi +dP sp aV NM @@ -3337,7 +3346,7 @@ FA Sf Lj Qc -op +rC cA Lj ZQ diff --git a/_maps/shuttles/shiptest/independent_dwayne.dmm b/_maps/shuttles/shiptest/independent_dwayne.dmm index d532599831ec..99e8b9f1e0c5 100644 --- a/_maps/shuttles/shiptest/independent_dwayne.dmm +++ b/_maps/shuttles/shiptest/independent_dwayne.dmm @@ -425,6 +425,9 @@ /obj/effect/turf_decal/corner/opaque/blue{ dir = 4 }, +/obj/structure/closet/emcloset/wall{ + pixel_y = 28 + }, /turf/open/floor/plasteel/white{ dir = 1 }, @@ -886,49 +889,6 @@ "tq" = ( /turf/closed/wall/r_wall, /area/ship/engineering) -"tG" = ( -/obj/item/clothing/suit/hazardvest{ - desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; - name = "emergency lifejacket"; - pixel_x = -4; - pixel_y = -4 - }, -/obj/item/clothing/suit/hazardvest{ - desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; - name = "emergency lifejacket" - }, -/obj/item/clothing/suit/hazardvest{ - desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; - name = "emergency lifejacket"; - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/clothing/head/hardhat/mining{ - pixel_x = -4; - pixel_y = -4 - }, -/obj/item/clothing/head/hardhat/mining, -/obj/item/clothing/head/hardhat/mining{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/gps/mining, -/obj/item/gps/mining, -/obj/item/gps/mining, -/obj/item/clothing/glasses/meson/prescription, -/obj/item/clothing/glasses/meson, -/obj/item/clothing/glasses/meson, -/obj/item/t_scanner/adv_mining_scanner/lesser, -/obj/item/gun/energy/kinetic_accelerator, -/obj/item/pickaxe/silver, -/obj/item/pickaxe/silver, -/obj/item/storage/bag/ore, -/obj/item/storage/bag/ore, -/obj/structure/closet/wall{ - name = "equipment closet" - }, -/turf/closed/wall/r_wall, -/area/ship/cargo) "tX" = ( /obj/structure/ore_box, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -1154,10 +1114,6 @@ }, /turf/open/floor/plasteel/mono/dark, /area/ship/bridge) -"zn" = ( -/obj/structure/closet/emcloset/wall, -/turf/closed/wall, -/area/ship/medical) "zq" = ( /obj/structure/catwalk, /obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{ @@ -1509,6 +1465,47 @@ /turf/open/floor/plasteel/mono, /area/ship/medical) "IZ" = ( +/obj/item/clothing/suit/hazardvest{ + desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; + name = "emergency lifejacket"; + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/suit/hazardvest{ + desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; + name = "emergency lifejacket" + }, +/obj/item/clothing/suit/hazardvest{ + desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; + name = "emergency lifejacket"; + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/head/hardhat/mining{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/head/hardhat/mining, +/obj/item/clothing/head/hardhat/mining{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/clothing/glasses/meson/prescription, +/obj/item/clothing/glasses/meson, +/obj/item/clothing/glasses/meson, +/obj/item/t_scanner/adv_mining_scanner/lesser, +/obj/item/gun/energy/kinetic_accelerator, +/obj/item/pickaxe/silver, +/obj/item/pickaxe/silver, +/obj/item/storage/bag/ore, +/obj/item/storage/bag/ore, +/obj/structure/closet/wall{ + name = "equipment closet"; + pixel_y = 28 + }, /obj/effect/turf_decal/industrial/warning/corner{ dir = 1 }, @@ -2594,7 +2591,7 @@ FP nL kM YJ -tG +YJ IZ lv dK @@ -2654,7 +2651,7 @@ ei ei ei ei -zn +oC kb lv pt diff --git a/_maps/shuttles/shiptest/independent_litieguai.dmm b/_maps/shuttles/shiptest/independent_litieguai.dmm index 0b3d0c54d603..ad02632fc9c3 100644 --- a/_maps/shuttles/shiptest/independent_litieguai.dmm +++ b/_maps/shuttles/shiptest/independent_litieguai.dmm @@ -222,13 +222,6 @@ }, /turf/open/floor/plating, /area/ship/maintenance/port) -"fn" = ( -/obj/machinery/firealarm/directional/west, -/obj/machinery/airalarm/directional/south, -/obj/effect/turf_decal/industrial/hatch/red, -/obj/structure/closet/crate/freezer/surplus_limbs/organs, -/turf/open/floor/plasteel/tech/techmaint, -/area/ship/medical) "fp" = ( /turf/closed/wall/mineral/titanium, /area/ship/maintenance/port) @@ -327,24 +320,6 @@ /obj/effect/turf_decal/corner/opaque/white/mono, /turf/open/floor/plasteel/white, /area/ship/medical) -"ir" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/obj/machinery/firealarm/directional/west, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/industrial/warning, -/obj/machinery/button/door{ - dir = 4; - id = "traumaenginer"; - name = "Engine Shutter Control"; - pixel_x = -25; - pixel_y = -6 - }, -/turf/open/floor/plating, -/area/ship/maintenance/starboard) "iA" = ( /turf/closed/wall/mineral/titanium, /area/ship/crew) @@ -1389,24 +1364,6 @@ /obj/machinery/light/directional/north, /turf/open/floor/plasteel/white, /area/ship/medical) -"Gm" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/obj/machinery/firealarm/directional/east, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/industrial/warning, -/obj/machinery/button/door{ - dir = 8; - id = "traumaenginel"; - name = "Engine Shutter Control"; - pixel_x = 25; - pixel_y = -6 - }, -/turf/open/floor/plating, -/area/ship/maintenance/port) "Go" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -1691,6 +1648,26 @@ }, /turf/template_noop, /area/template_noop) +"Mx" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/obj/machinery/firealarm/directional/west{ + pixel_y = 6 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/industrial/warning, +/obj/machinery/button/door{ + dir = 4; + id = "traumaenginer"; + name = "Engine Shutter Control"; + pixel_x = -22; + pixel_y = -8 + }, +/turf/open/floor/plating, +/area/ship/maintenance/starboard) "MK" = ( /obj/effect/turf_decal/industrial/outline/red, /obj/structure/rack, @@ -1795,6 +1772,13 @@ }, /turf/open/floor/plating, /area/ship/maintenance/starboard) +"OA" = ( +/obj/machinery/firealarm/directional/west, +/obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/industrial/hatch/red, +/obj/structure/closet/crate/freezer/surplus_limbs/organs, +/turf/open/floor/plasteel/tech/techmaint, +/area/ship/medical) "OB" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -2444,6 +2428,26 @@ /obj/item/bedsheet/blue, /turf/open/floor/carpet/cyan, /area/ship/crew) +"XX" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/obj/machinery/firealarm/directional/east{ + pixel_y = 6 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/industrial/warning, +/obj/machinery/button/door{ + dir = 8; + id = "traumaenginel"; + name = "Engine Shutter Control"; + pixel_x = 22; + pixel_y = -7 + }, +/turf/open/floor/plating, +/area/ship/maintenance/port) "Yb" = ( /obj/structure/cable{ icon_state = "4-8" @@ -2637,7 +2641,7 @@ Lh vT IE CX -Gm +XX KD dR Jn @@ -2750,7 +2754,7 @@ Vu Po DU lj -fn +OA YM YM JA @@ -3057,7 +3061,7 @@ Ps yi nl Xb -ir +Mx Hq VM Dj diff --git a/_maps/shuttles/shiptest/independent_scav.dmm b/_maps/shuttles/shiptest/independent_scav.dmm index 61ffda4d8b18..880634f50427 100644 --- a/_maps/shuttles/shiptest/independent_scav.dmm +++ b/_maps/shuttles/shiptest/independent_scav.dmm @@ -832,7 +832,8 @@ /obj/docking_port/mobile{ can_move_docking_ports = 1; dir = 8; - launch_status = 0 + launch_status = 0; + preferred_direction = 4 }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, diff --git a/_maps/shuttles/shiptest/independent_shepherd.dmm b/_maps/shuttles/shiptest/independent_shepherd.dmm index 78ddbfcee909..a028ed54fd3f 100644 --- a/_maps/shuttles/shiptest/independent_shepherd.dmm +++ b/_maps/shuttles/shiptest/independent_shepherd.dmm @@ -811,7 +811,8 @@ dir = 1 }, /obj/machinery/door/airlock/grunge{ - name = "Chaplain's Quarters" + name = "Chaplain's Quarters"; + dir = 4 }, /obj/structure/cable{ icon_state = "4-8" diff --git a/_maps/shuttles/shiptest/independent_shetland.dmm b/_maps/shuttles/shiptest/independent_shetland.dmm index ce410cca9db4..f2b586cede24 100644 --- a/_maps/shuttles/shiptest/independent_shetland.dmm +++ b/_maps/shuttles/shiptest/independent_shetland.dmm @@ -3939,7 +3939,8 @@ height = 26; launch_status = 0; port_direction = 8; - width = 48 + width = 48; + preferred_direction = 4 }, /obj/effect/turf_decal/industrial/warning/fulltile, /turf/open/floor/plasteel/patterned/ridged, diff --git a/_maps/shuttles/shiptest/inteq_hound.dmm b/_maps/shuttles/shiptest/inteq_hound.dmm index 5dffd9c9a5df..9f198cc11041 100644 --- a/_maps/shuttles/shiptest/inteq_hound.dmm +++ b/_maps/shuttles/shiptest/inteq_hound.dmm @@ -139,6 +139,17 @@ "dB" = ( /turf/closed/wall/mineral/plastitanium, /area/ship/maintenance/starboard) +"dP" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/corner_techfloor_gray{ + dir = 6 + }, +/turf/open/floor/plating, +/area/ship/maintenance/port) "dV" = ( /turf/open/floor/engine/hull, /area/ship/maintenance/port) @@ -198,17 +209,6 @@ }, /turf/open/floor/plasteel/tech, /area/ship/storage/eva) -"fb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/corner_techfloor_gray/diagonal, -/turf/open/floor/plating, -/area/ship/maintenance/starboard) "fk" = ( /obj/structure/railing{ dir = 8 @@ -354,19 +354,18 @@ "ib" = ( /turf/template_noop, /area/template_noop) -"id" = ( -/obj/structure/railing, -/obj/effect/turf_decal/borderfloorblack{ - dir = 8 - }, -/obj/structure/rack, -/obj/item/pickaxe/mini, -/obj/item/pickaxe/drill/jackhammer/old, -/turf/open/floor/plasteel/patterned, -/area/ship/cargo) "ih" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/maintenance/port) +"iw" = ( +/obj/machinery/button/door{ + id = "hound_windows"; + name = "Window Lockdown"; + pixel_x = -6; + pixel_y = 25 + }, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/bridge) "jb" = ( /obj/structure/table, /obj/effect/turf_decal/corner/opaque/yellow, @@ -602,6 +601,16 @@ }, /turf/open/floor/carpet/orange, /area/ship/bridge) +"nL" = ( +/obj/structure/railing, +/obj/effect/turf_decal/borderfloorblack{ + dir = 8 + }, +/obj/structure/rack, +/obj/item/pickaxe/mini, +/obj/item/pickaxe/drill/jackhammer/old, +/turf/open/floor/plasteel/patterned, +/area/ship/cargo) "of" = ( /obj/machinery/door/airlock/command{ name = "Bridge"; @@ -633,18 +642,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/tech, /area/ship/maintenance/port) -"os" = ( -/obj/machinery/vending/coffee, -/obj/effect/turf_decal/corner/opaque/yellow{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/yellow, -/obj/effect/turf_decal/corner/opaque/brown{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/dark, -/area/ship/crew) "oL" = ( /obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, /obj/machinery/door/poddoor{ @@ -774,6 +771,17 @@ /obj/effect/turf_decal/number/zero, /turf/open/floor/plating, /area/ship/maintenance/port) +"rj" = ( +/obj/effect/turf_decal/corner/opaque/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 8 + }, +/obj/effect/landmark/start/assistant, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/plasteel/dark, +/area/ship/crew) "rF" = ( /obj/structure/cable{ icon_state = "0-4" @@ -971,6 +979,15 @@ }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) +"uY" = ( +/obj/structure/railing, +/obj/effect/turf_decal/borderfloorblack{ + dir = 4 + }, +/obj/structure/rack, +/obj/item/storage/toolbox/ammo/c9mm, +/turf/open/floor/plasteel/patterned, +/area/ship/cargo) "ve" = ( /obj/structure/closet/crate/bin, /obj/effect/turf_decal/corner/opaque/yellow, @@ -1186,6 +1203,21 @@ }, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) +"Ac" = ( +/obj/effect/turf_decal/borderfloorblack{ + dir = 8 + }, +/obj/structure/table, +/obj/item/storage/toolbox/mechanical{ + pixel_x = 1; + pixel_y = 8 + }, +/obj/item/storage/toolbox/electrical{ + pixel_x = -2; + pixel_y = 1 + }, +/turf/open/floor/plasteel/patterned, +/area/ship/cargo) "Aj" = ( /obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, /obj/machinery/door/poddoor{ @@ -1196,17 +1228,6 @@ "Ao" = ( /turf/closed/wall/mineral/plastitanium, /area/ship/maintenance/port) -"AP" = ( -/obj/effect/turf_decal/borderfloorblack{ - dir = 8 - }, -/obj/machinery/mineral/ore_redemption{ - dir = 4; - input_dir = 4; - output_dir = null - }, -/turf/open/floor/plasteel/patterned, -/area/ship/cargo) "AQ" = ( /obj/structure/railing/corner, /obj/structure/catwalk/over/plated_catwalk, @@ -1286,7 +1307,6 @@ /obj/machinery/modular_computer/console/preset/command{ dir = 8 }, -/obj/item/radio/intercom/wideband/directional/south, /obj/item/radio/intercom/directional/south, /obj/effect/turf_decal/corner/opaque/brown{ dir = 8 @@ -1304,6 +1324,13 @@ }, /turf/open/floor/engine/hull, /area/ship/maintenance/starboard) +"CV" = ( +/obj/effect/turf_decal/borderfloorblack{ + dir = 8 + }, +/obj/machinery/autolathe, +/turf/open/floor/plasteel/patterned, +/area/ship/cargo) "DB" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/carpet/orange, @@ -1331,6 +1358,17 @@ }, /turf/open/floor/plasteel/patterned/grid, /area/ship/crew) +"EC" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/corner_techfloor_gray/diagonal, +/turf/open/floor/plating, +/area/ship/maintenance/starboard) "EE" = ( /obj/structure/table, /obj/machinery/computer/cryopod/directional/east, @@ -1369,6 +1407,14 @@ }, /turf/open/floor/plasteel/dark, /area/ship/bridge) +"Gj" = ( +/obj/effect/turf_decal/borderfloorblack{ + dir = 4 + }, +/obj/machinery/cell_charger, +/obj/structure/table, +/turf/open/floor/plasteel/patterned, +/area/ship/cargo) "GB" = ( /obj/structure/sign/number/eight{ dir = 1 @@ -1407,13 +1453,21 @@ dir = 8 }, /area/ship/cargo) -"Hd" = ( -/obj/effect/turf_decal/borderfloorblack{ - dir = 4 +"GZ" = ( +/obj/machinery/vending/coffee, +/obj/effect/turf_decal/corner/opaque/yellow{ + dir = 1 }, -/obj/machinery/rnd/server, -/turf/open/floor/plasteel/patterned, -/area/ship/cargo) +/obj/effect/turf_decal/corner/opaque/yellow, +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/sign/poster/contraband/hacking_guide{ + pixel_x = -28 + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew) "Hr" = ( /obj/effect/turf_decal/corner/opaque/yellow, /obj/effect/turf_decal/corner/opaque/yellow{ @@ -1479,8 +1533,8 @@ /obj/machinery/button/door{ id = "hound_windows"; name = "Window Lockdown"; - pixel_x = -6; - pixel_y = 25 + pixel_x = -10; + pixel_y = 22 }, /obj/effect/turf_decal/corner/opaque/brown{ dir = 4 @@ -1490,6 +1544,10 @@ }, /obj/effect/turf_decal/steeldecal/steel_decals_central4, /obj/machinery/computer/cargo/express, +/obj/item/radio/intercom/wideband/directional/north{ + pixel_y = 25; + pixel_x = 6 + }, /turf/open/floor/plasteel/dark, /area/ship/bridge) "HZ" = ( @@ -1510,6 +1568,17 @@ }, /turf/open/floor/plasteel/patterned/grid, /area/ship/crew) +"Iu" = ( +/obj/effect/turf_decal/borderfloorblack{ + dir = 8 + }, +/obj/machinery/mineral/ore_redemption{ + dir = 4; + input_dir = 4; + output_dir = null + }, +/turf/open/floor/plasteel/patterned, +/area/ship/cargo) "Iw" = ( /obj/machinery/power/smes/shuttle/precharged{ dir = 4 @@ -1696,13 +1765,6 @@ }, /turf/open/floor/plasteel/dark, /area/ship/bridge) -"Ln" = ( -/obj/effect/turf_decal/borderfloorblack{ - dir = 8 - }, -/obj/machinery/autolathe, -/turf/open/floor/plasteel/patterned, -/area/ship/cargo) "Ls" = ( /obj/structure/bed, /obj/structure/curtain/bounty, @@ -1717,15 +1779,6 @@ }, /turf/open/floor/carpet/black, /area/ship/crew/dorm) -"LW" = ( -/obj/structure/railing, -/obj/effect/turf_decal/borderfloorblack{ - dir = 4 - }, -/obj/structure/rack, -/obj/item/storage/toolbox/ammo/c9mm, -/turf/open/floor/plasteel/patterned, -/area/ship/cargo) "Mj" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/carpet/black, @@ -1960,20 +2013,6 @@ /obj/item/trash/sosjerky, /turf/open/floor/plasteel/dark, /area/ship/crew) -"PO" = ( -/obj/structure/extinguisher_cabinet/directional/north, -/obj/effect/turf_decal/corner/opaque/yellow{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/brown{ - dir = 8 - }, -/obj/effect/landmark/start/assistant, -/obj/structure/sign/poster/contraband/hacking_guide{ - pixel_x = -28 - }, -/turf/open/floor/plasteel/dark, -/area/ship/crew) "Qn" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -2066,13 +2105,6 @@ }, /turf/open/floor/plasteel/tech, /area/ship/storage/eva) -"TE" = ( -/obj/effect/turf_decal/borderfloorblack{ - dir = 4 - }, -/obj/machinery/rnd/production/techfab/department/security, -/turf/open/floor/plasteel/patterned, -/area/ship/cargo) "TV" = ( /obj/structure/bed, /obj/structure/curtain/bounty, @@ -2084,14 +2116,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet/black, /area/ship/crew/dorm) -"TZ" = ( -/obj/effect/turf_decal/borderfloorblack{ - dir = 4 - }, -/obj/machinery/cell_charger, -/obj/structure/table, -/turf/open/floor/plasteel/patterned, -/area/ship/cargo) "Ub" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Starboard Engines" @@ -2279,6 +2303,13 @@ }, /turf/open/floor/plating, /area/ship/bridge) +"Xw" = ( +/obj/effect/turf_decal/borderfloorblack{ + dir = 4 + }, +/obj/machinery/rnd/production/techfab/department/security, +/turf/open/floor/plasteel/patterned, +/area/ship/cargo) "XH" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/corner/opaque/brown{ @@ -2306,21 +2337,6 @@ /obj/item/pen/fountain, /turf/open/floor/plasteel/dark, /area/ship/bridge) -"XK" = ( -/obj/effect/turf_decal/borderfloorblack{ - dir = 8 - }, -/obj/structure/table, -/obj/item/storage/toolbox/mechanical{ - pixel_x = 1; - pixel_y = 8 - }, -/obj/item/storage/toolbox/electrical{ - pixel_x = -2; - pixel_y = 1 - }, -/turf/open/floor/plasteel/patterned, -/area/ship/cargo) "Yj" = ( /obj/structure/sign/number/four{ dir = 1 @@ -2359,17 +2375,6 @@ }, /turf/open/floor/plasteel/tech/grid, /area/ship/crew/dorm) -"Zm" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/corner_techfloor_gray{ - dir = 6 - }, -/turf/open/floor/plating, -/area/ship/maintenance/port) "Zy" = ( /obj/structure/table/reinforced, /obj/item/storage/fancy/cigarettes/cigars{ @@ -2398,6 +2403,13 @@ }, /turf/open/floor/plating, /area/ship/maintenance/port) +"ZZ" = ( +/obj/effect/turf_decal/borderfloorblack{ + dir = 4 + }, +/obj/machinery/rnd/server, +/turf/open/floor/plasteel/patterned, +/area/ship/cargo) (1,1,1) = {" ib @@ -2504,7 +2516,7 @@ ih bZ rh Jb -Zm +dP eb MC SO @@ -2513,7 +2525,7 @@ NK eW uD Ub -fb +EC HS VC sw @@ -2567,10 +2579,10 @@ Ao ib Or jG -XK -Ln -AP -id +Ac +CV +Iu +nL dm Or ib @@ -2647,10 +2659,10 @@ ib ib Or BA -TZ -TE -Hd -LW +Gj +Xw +ZZ +uY GG Or ib @@ -2772,8 +2784,8 @@ vW DU Vo Pz -PO -os +rj +GZ zn ib ib @@ -2867,7 +2879,7 @@ pe HV KK BQ -pe +iw ib ib ib diff --git a/_maps/shuttles/shiptest/inteq_talos.dmm b/_maps/shuttles/shiptest/inteq_talos.dmm index bdbd1cb1e1dc..cf5890397960 100644 --- a/_maps/shuttles/shiptest/inteq_talos.dmm +++ b/_maps/shuttles/shiptest/inteq_talos.dmm @@ -40,6 +40,13 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plasteel/tech, /area/ship/engineering) +"an" = ( +/obj/machinery/telecomms/processor/preset_four{ + autolinkers = list("processor4","bus"); + network = "irmg_commnet" + }, +/turf/open/floor/circuit/telecomms/mainframe, +/area/ship/engineering/communications) "ao" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/engineering/communications) @@ -66,12 +73,41 @@ }, /turf/open/floor/plasteel/dark, /area/ship/security) +"at" = ( +/obj/effect/turf_decal/industrial/fire{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/engine) "au" = ( /obj/machinery/light/directional/east, /obj/effect/turf_decal/industrial/outline/yellow, /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plasteel/tech/grid, /area/ship/storage) +"aH" = ( +/obj/machinery/button/door{ + dir = 4; + id = "talos_thrusters_starboard"; + name = "Blast Door Control"; + pixel_x = -21; + pixel_y = -6 + }, +/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/simple/general/visible/layer4, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ + dir = 1 + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = 5 + }, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/engine) "aI" = ( /obj/structure/cable{ icon_state = "0-8" @@ -136,22 +172,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/airless, /area/ship/maintenance/starboard) -"ba" = ( -/obj/machinery/atmospherics/pipe/simple/dark/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/purple/hidden, -/obj/machinery/power/shieldwallgen/atmos/roundstart{ - dir = 4; - id = "talos_tank_burn" - }, -/obj/effect/turf_decal/industrial/fire/fulltile, -/obj/machinery/door/poddoor{ - id = "talos_tank_burn" - }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/open/floor/engine/hull/reinforced/interior, -/area/ship/engineering/engine) "bb" = ( /obj/effect/turf_decal/industrial/warning/fulltile, /obj/machinery/door/airlock/grunge{ @@ -172,40 +192,6 @@ }, /turf/open/floor/plasteel/tech, /area/ship/cargo) -"bi" = ( -/obj/item/clothing/glasses/hud/security/sunglasses/inteq, -/obj/item/clothing/mask/gas/sechailer/inteq, -/obj/item/clothing/gloves/tackler/combat/insulated, -/obj/item/clothing/shoes/combat, -/obj/item/storage/belt/military/assault, -/obj/item/storage/backpack/messenger/inteq, -/obj/item/clothing/under/syndicate/inteq/skirt, -/obj/item/clothing/under/syndicate/inteq, -/obj/structure/closet/secure_closet{ - anchored = 1; - can_be_unanchored = 1; - icon_state = "warden"; - name = "master at arms' locker"; - req_access_txt = "3" - }, -/obj/effect/turf_decal/corner/opaque/brown{ - dir = 8 - }, -/obj/effect/turf_decal/corner/opaque/yellow, -/obj/effect/decal/cleanable/dirt, -/obj/item/clothing/suit/armor/vest/bulletproof, -/obj/item/clothing/head/warden/drill{ - desc = "A special armored campaign hat with the IRMG insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection."; - name = "master at arms' campaign hat" - }, -/obj/item/megaphone/sec, -/obj/structure/sign/poster/contraband/eoehoma{ - pixel_y = -32 - }, -/obj/item/storage/belt/security/webbing/inteq/alt, -/obj/item/storage/belt/security/webbing/inteq, -/turf/open/floor/plasteel/dark, -/area/ship/security) "bx" = ( /obj/structure/cable{ icon_state = "2-8" @@ -245,6 +231,18 @@ }, /turf/open/floor/engine/hull/reinforced/interior, /area/ship/engineering/engine) +"bF" = ( +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/telecomms/server/presets/common{ + autolinkers = list("common","hub"); + freq_listening = list(1459); + network = "irmg_commnet" + }, +/turf/open/floor/circuit/telecomms/mainframe, +/area/ship/engineering/communications) "bI" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 @@ -348,6 +346,26 @@ /obj/machinery/space_heater, /turf/open/floor/plasteel/tech, /area/ship/engineering) +"cz" = ( +/obj/structure/cable{ + icon_state = "5-10" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/dark/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/light/directional/south, +/obj/structure/catwalk/over, +/turf/open/floor/plating, +/area/ship/engineering/engine) "cA" = ( /obj/effect/turf_decal/borderfloor{ dir = 1 @@ -367,6 +385,36 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/tech, /area/ship/engineering/engine) +"cC" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -19 + }, +/turf/open/floor/plasteel/tech, +/area/ship/crew/cryo) +"cD" = ( +/obj/structure/sink{ + dir = 1; + pixel_y = -12 + }, +/obj/structure/mirror{ + pixel_y = -32 + }, +/obj/effect/turf_decal/steeldecal/steel_decals10, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 20 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/turf/open/floor/plasteel/showroomfloor, +/area/ship/crew/toilet) "cF" = ( /obj/machinery/atmospherics/components/binary/pump/on/layer4{ dir = 1; @@ -385,17 +433,6 @@ }, /turf/open/floor/plasteel/tech, /area/ship/engineering/engine) -"cO" = ( -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 20 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/turf/open/floor/carpet/black, -/area/ship/crew/dorm) "cR" = ( /obj/machinery/light/directional/west, /obj/effect/turf_decal/corner/opaque/yellow{ @@ -493,17 +530,13 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/airless, /area/ship/cargo/starboard) -"dx" = ( -/obj/machinery/telecomms/server/presets/inteq{ - autolinkers = list("inteq","hub"); - freq_listening = list(1347); - network = "irmg_commnet" - }, +"dw" = ( +/obj/machinery/power/smes/engineering, /obj/structure/cable{ - icon_state = "1-4" + icon_state = "0-4" }, -/turf/open/floor/circuit/telecomms/mainframe, -/area/ship/engineering/communications) +/turf/open/floor/plating, +/area/ship/engineering) "dD" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable{ @@ -520,50 +553,6 @@ /obj/effect/landmark/start/head_of_security, /turf/open/floor/plasteel/dark, /area/ship/bridge) -"dM" = ( -/obj/structure/rack, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/official/ion_carbine{ - pixel_x = -32 - }, -/obj/item/ammo_box/magazine/m12g/small{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/ammo_box/magazine/m12g/small{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/ammo_box/magazine/m12g/small{ - pixel_x = -5 - }, -/obj/item/ammo_box/magazine/m12g/small{ - pixel_x = -5 - }, -/obj/item/ammo_box/magazine/co9mm{ - pixel_x = 5 - }, -/obj/item/ammo_box/magazine/co9mm{ - pixel_x = -5 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/security/armory) -"dY" = ( -/obj/effect/turf_decal/industrial/fire{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/tech, -/area/ship/engineering/engine) "dZ" = ( /obj/structure/cable{ icon_state = "4-8" @@ -747,19 +736,6 @@ }, /turf/open/floor/plasteel/showroomfloor, /area/ship/crew/toilet) -"fb" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input{ - dir = 8 - }, -/turf/open/floor/engine/vacuum, -/area/ship/engineering/engine) -"fd" = ( -/obj/machinery/telecomms/bus/preset_four{ - autolinkers = list("hub","processor4","bus"); - network = "irmg_commnet" - }, -/turf/open/floor/circuit/telecomms/mainframe, -/area/ship/engineering/communications) "ff" = ( /obj/structure/cable{ icon_state = "4-8" @@ -803,13 +779,6 @@ }, /turf/open/floor/plasteel/tech/grid, /area/ship/storage) -"fp" = ( -/obj/effect/turf_decal/box/corners{ - dir = 8 - }, -/obj/effect/landmark/start/medical_doctor, -/turf/open/floor/plasteel/patterned/cargo_one, -/area/ship/cargo) "fr" = ( /obj/item/cigbutt, /turf/open/floor/plating/airless, @@ -889,6 +858,16 @@ }, /turf/open/floor/plasteel/tech, /area/ship/security/armory) +"fY" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/plasteel/grimy, +/area/ship/crew) "ge" = ( /obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, /obj/machinery/door/poddoor/shutters{ @@ -990,6 +969,13 @@ }, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) +"gF" = ( +/obj/effect/turf_decal/box/corners{ + dir = 8 + }, +/obj/effect/landmark/start/medical_doctor, +/turf/open/floor/plasteel/patterned/cargo_one, +/area/ship/cargo) "gG" = ( /obj/structure/cable{ icon_state = "1-2" @@ -1001,20 +987,6 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/plasteel/tech, /area/ship/engineering/engine) -"gH" = ( -/obj/machinery/power/shieldwallgen/atmos/roundstart{ - dir = 8; - id = "talos_tank_burn" - }, -/obj/effect/turf_decal/industrial/fire/fulltile, -/obj/machinery/door/poddoor{ - id = "talos_tank_burn" - }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/open/floor/engine/hull/reinforced/interior, -/area/ship/engineering/engine) "gN" = ( /obj/effect/turf_decal/industrial/warning/fulltile, /obj/machinery/door/firedoor/border_only{ @@ -1068,11 +1040,24 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/plasteel/tech/grid, /area/ship/crew/cryo) -"gY" = ( +"gV" = ( +/obj/machinery/computer/apc_control{ + dir = 1 + }, +/obj/structure/cable, /obj/structure/cable{ - icon_state = "0-8" + icon_state = "1-4" }, -/obj/machinery/light/directional/east, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plating, +/area/ship/engineering) +"gY" = ( +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/light/directional/east, /obj/machinery/power/apc/auto_name/directional/north, /obj/effect/turf_decal/corner/opaque/yellow, /obj/effect/turf_decal/corner/opaque/yellow{ @@ -1205,24 +1190,22 @@ /obj/structure/catwalk/over, /turf/open/floor/plating, /area/ship/engineering) -"hT" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/hallway/central) -"hW" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +"hQ" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/drinkingglasses{ + pixel_x = -8; + pixel_y = 5 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/structure/catwalk/over, /obj/machinery/light_switch{ dir = 1; pixel_y = -19 }, -/turf/open/floor/plating, -/area/ship/engineering) +/obj/machinery/newscaster/directional/west, +/turf/open/floor/plasteel/grimy, +/area/ship/crew) +"hT" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/hallway/central) "ia" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -1265,26 +1248,6 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating/airless, /area/ship/maintenance/starboard) -"it" = ( -/obj/machinery/button/door{ - dir = 4; - id = "talos_thrusters_starboard"; - name = "Blast Door Control"; - pixel_x = -21; - pixel_y = -6 - }, -/obj/machinery/atmospherics/pipe/simple/general/visible, -/obj/machinery/atmospherics/pipe/simple/general/visible/layer4, -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ - dir = 1 - }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -20; - pixel_y = 5 - }, -/turf/open/floor/plasteel/tech, -/area/ship/engineering/engine) "iu" = ( /obj/machinery/door/airlock/hatch{ dir = 4 @@ -1314,25 +1277,6 @@ }, /turf/open/floor/plasteel/patterned, /area/ship/cargo) -"iz" = ( -/obj/structure/sink{ - dir = 1; - pixel_y = -12 - }, -/obj/structure/mirror{ - pixel_y = -32 - }, -/obj/effect/turf_decal/steeldecal/steel_decals10, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 20 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/turf/open/floor/plasteel/showroomfloor, -/area/ship/crew/toilet) "iA" = ( /obj/machinery/power/terminal{ dir = 8 @@ -1382,19 +1326,6 @@ }, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) -"iJ" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/catwalk/over, -/obj/machinery/firealarm/directional/west, -/turf/open/floor/plating, -/area/ship/engineering/engine) "iM" = ( /obj/effect/turf_decal/industrial/warning{ dir = 4 @@ -1466,6 +1397,15 @@ }, /turf/open/floor/carpet/orange, /area/ship/bridge) +"jd" = ( +/obj/docking_port/stationary{ + dir = 4; + dwidth = 15; + height = 15; + width = 30 + }, +/turf/template_noop, +/area/template_noop) "jf" = ( /obj/machinery/light/directional/north, /obj/structure/closet/secure_closet/engineering_welding{ @@ -1562,6 +1502,16 @@ }, /turf/open/floor/plasteel/tech, /area/ship/crew/cryo) +"jS" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/effect/turf_decal/number/five, +/turf/open/floor/plasteel/dark, +/area/ship/engineering) "jT" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -1683,13 +1633,6 @@ "kD" = ( /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) -"kE" = ( -/obj/machinery/telecomms/processor/preset_four{ - autolinkers = list("processor4","bus"); - network = "irmg_commnet" - }, -/turf/open/floor/circuit/telecomms/mainframe, -/area/ship/engineering/communications) "kJ" = ( /obj/structure/cable{ icon_state = "4-8" @@ -1697,11 +1640,30 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/airless, /area/ship/maintenance/port) -"kQ" = ( -/obj/machinery/power/terminal, -/obj/structure/cable/yellow, +"kM" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/corner/opaque/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 4 + }, +/obj/structure/chair/comfy/black, +/obj/machinery/light_switch{ + pixel_y = 22 + }, /turf/open/floor/plasteel/dark, -/area/ship/engineering) +/area/ship/security) +"kU" = ( +/obj/machinery/door/poddoor{ + id = "talos_tank_burn" + }, +/obj/effect/turf_decal/industrial/fire/fulltile, +/obj/effect/decal/cleanable/oil/slippery, +/turf/open/floor/engine/hull/reinforced/interior, +/area/ship/engineering/engine) "kW" = ( /obj/structure/cable{ icon_state = "4-8" @@ -1737,6 +1699,17 @@ }, /turf/open/floor/engine/hull/reinforced/interior, /area/ship/engineering/engine) +"ls" = ( +/obj/machinery/telecomms/server/presets/inteq{ + autolinkers = list("inteq","hub"); + freq_listening = list(1347); + network = "irmg_commnet" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/circuit/telecomms/mainframe, +/area/ship/engineering/communications) "lt" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, @@ -1860,6 +1833,18 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) +"lS" = ( +/obj/effect/turf_decal/industrial/fire{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/engine) "mh" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/dust, @@ -1878,6 +1863,40 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) +"ml" = ( +/obj/item/clothing/glasses/hud/security/sunglasses/inteq, +/obj/item/clothing/mask/gas/sechailer/inteq, +/obj/item/clothing/gloves/tackler/combat/insulated, +/obj/item/clothing/shoes/combat, +/obj/item/storage/belt/military/assault, +/obj/item/storage/backpack/messenger/inteq, +/obj/item/clothing/under/syndicate/inteq/skirt, +/obj/item/clothing/under/syndicate/inteq, +/obj/structure/closet/secure_closet{ + anchored = 1; + can_be_unanchored = 1; + icon_state = "warden"; + name = "master at arms' locker"; + req_access_txt = "3" + }, +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/yellow, +/obj/effect/decal/cleanable/dirt, +/obj/item/clothing/suit/armor/vest/bulletproof, +/obj/item/clothing/head/warden/drill{ + desc = "A special armored campaign hat with the IRMG insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection."; + name = "master at arms' campaign hat" + }, +/obj/item/megaphone/sec, +/obj/structure/sign/poster/contraband/eoehoma{ + pixel_y = -32 + }, +/obj/item/storage/belt/security/webbing/inteq/alt, +/obj/item/storage/belt/security/webbing/inteq, +/turf/open/floor/plasteel/dark, +/area/ship/security) "ms" = ( /obj/machinery/light/directional/west, /obj/machinery/power/smes/engineering, @@ -1939,38 +1958,6 @@ }, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) -"mD" = ( -/obj/effect/turf_decal/corner/opaque/yellow{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/brown{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/computer/helm/viewscreen/directional/west, -/turf/open/floor/plasteel/dark, -/area/ship/crew/canteen) -"mG" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/catwalk/over, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/dark/hidden/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plating, -/area/ship/engineering/engine) "mI" = ( /obj/effect/turf_decal/industrial/warning/fulltile, /obj/machinery/door/airlock/maintenance_hatch{ @@ -2068,24 +2055,6 @@ "mX" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/bridge) -"nc" = ( -/obj/effect/turf_decal/siding/thinplating/dark, -/obj/effect/turf_decal/trimline/opaque/yellow/line, -/obj/machinery/light/directional/south, -/obj/structure/closet/secure_closet{ - anchored = 1; - can_be_unanchored = 1; - icon_state = "sec"; - name = "equipment locker"; - req_access_txt = "1" - }, -/obj/item/clothing/mask/gas/sechailer/inteq, -/obj/item/storage/belt/security/webbing/inteq, -/obj/item/clothing/glasses/hud/security/sunglasses/inteq, -/obj/item/storage/box/handcuffs, -/obj/item/storage/belt/security/webbing/inteq/alt, -/turf/open/floor/plasteel/tech/grid, -/area/ship/security/armory) "ne" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 @@ -2177,23 +2146,6 @@ /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) -"nK" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8; - filter_types = list("n2","co2","bz","water_vapor","miasma","freon","pluox","tritium","n20","no2","nob"); - id_tag = null - }, -/obj/machinery/atmospherics/pipe/simple/purple/hidden{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/dark/hidden/layer1{ - dir = 10 - }, -/turf/open/floor/engine/vacuum, -/area/ship/engineering/engine) "nS" = ( /obj/effect/turf_decal/corner/opaque/yellow{ dir = 1 @@ -2272,33 +2224,20 @@ }, /turf/open/floor/plating/airless, /area/ship/external/dark) -"oh" = ( -/obj/machinery/button/shieldwallgen{ - id = "talos_tank_burn"; - pixel_x = -6; - pixel_y = 20; - req_access_txt = "56" +"oi" = ( +/obj/item/storage/firstaid/medical{ + pixel_x = -5 }, -/obj/machinery/button/door{ - id = "talos_tank_burn"; - name = "Access Door Control"; - pixel_x = 4; - pixel_y = 21; - req_access = null; - req_access_txt = "56" - }, -/obj/effect/turf_decal/industrial/fire{ - dir = 1 +/obj/item/storage/firstaid/regular{ + pixel_x = 5 }, -/turf/open/floor/plasteel/tech, -/area/ship/engineering/engine) -"oj" = ( -/obj/machinery/air_sensor/atmos/incinerator_tank, -/obj/machinery/atmospherics/pipe/simple/purple/hidden{ - dir = 4 +/obj/machinery/camera/autoname, +/obj/machinery/status_display/shuttle{ + pixel_y = 32 }, -/turf/open/floor/engine/vacuum, -/area/ship/engineering/engine) +/obj/structure/table, +/turf/open/floor/plasteel/patterned/cargo_one, +/area/ship/cargo) "om" = ( /obj/structure/cable{ icon_state = "1-2" @@ -2327,6 +2266,19 @@ }, /turf/open/floor/plasteel/grimy, /area/ship/crew) +"oo" = ( +/obj/structure/chair/stool{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating/dark, +/obj/effect/turf_decal/trimline/opaque/yellow/line, +/obj/effect/decal/cleanable/dirt, +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = -28 + }, +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/plasteel/tech, +/area/ship/security/armory) "os" = ( /obj/machinery/computer/cargo/express{ dir = 8 @@ -2381,20 +2333,6 @@ }, /turf/open/floor/carpet/black, /area/ship/crew/dorm) -"oC" = ( -/obj/item/storage/firstaid/medical{ - pixel_x = -5 - }, -/obj/item/storage/firstaid/regular{ - pixel_x = 5 - }, -/obj/machinery/camera/autoname, -/obj/machinery/status_display/shuttle{ - pixel_y = 32 - }, -/obj/structure/table, -/turf/open/floor/plasteel/patterned/cargo_one, -/area/ship/cargo) "oD" = ( /obj/structure/cable{ icon_state = "1-2" @@ -2402,17 +2340,6 @@ /obj/item/trash/popcorn, /turf/open/floor/plating/airless, /area/ship/maintenance/starboard) -"oE" = ( -/obj/effect/turf_decal/corner/opaque/yellow, -/obj/effect/turf_decal/corner/opaque/brown{ - dir = 4 - }, -/obj/structure/noticeboard{ - dir = 8; - pixel_x = 25 - }, -/turf/open/floor/plasteel/dark, -/area/ship/crew/canteen) "oG" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -2437,6 +2364,15 @@ }, /turf/open/floor/plating/airless, /area/ship/maintenance/starboard) +"oT" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/light_switch{ + pixel_y = 22 + }, +/turf/open/floor/carpet/orange, +/area/ship/bridge) "oU" = ( /obj/machinery/atmospherics/pipe/simple{ dir = 8 @@ -2467,15 +2403,6 @@ }, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) -"oX" = ( -/obj/machinery/light/directional/south, -/obj/machinery/telecomms/hub{ - autolinkers = list("hub","bus","relay","messaging","inteq","common","broadcasterB","receiverB"); - id = "IRMG Communications Hub"; - network = "irmg_commnet" - }, -/turf/open/floor/circuit/telecomms/mainframe, -/area/ship/engineering/communications) "oY" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/airless, @@ -2567,6 +2494,19 @@ "pA" = ( /turf/open/floor/plasteel/dark, /area/ship/hallway/port) +"pD" = ( +/obj/effect/turf_decal/corner/opaque/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/computer/helm/viewscreen/directional/west, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) "pG" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/cobweb, @@ -2698,19 +2638,34 @@ /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating/airless, /area/ship/cargo/port) -"qq" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/obj/structure/cable/yellow{ +"qr" = ( +/obj/structure/cable{ icon_state = "1-2" }, -/obj/item/analyzer{ - pixel_x = 6; - pixel_y = 4 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/computer/atmos_control/tank/air_tank{ + dir = 8 }, -/turf/open/floor/plasteel/dark, -/area/ship/engineering) +/obj/machinery/button/door{ + dir = 8; + id = "talos_tank_air"; + name = "Access Door Control"; + pixel_x = 21; + pixel_y = -6; + req_access_txt = "24" + }, +/obj/machinery/button/shieldwallgen{ + dir = 8; + id = "talos_tank_air"; + pixel_x = 19; + pixel_y = 4; + req_access_txt = "24" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/engine) "qs" = ( /obj/structure/catwalk/over/plated_catwalk, /obj/structure/railing, @@ -2787,33 +2742,17 @@ }, /turf/open/floor/plasteel/tech, /area/ship/engineering/engine) -"qV" = ( -/obj/effect/turf_decal/industrial/fire{ - dir = 4 - }, -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor/shutters{ - id = "talos_engine_shutter" - }, -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor/shutters{ - id = "talos_engine_shutter" - }, -/turf/open/floor/plating, -/area/ship/engineering/engine) -"ra" = ( -/obj/machinery/telecomms/broadcaster/preset_right{ - autolinkers = list("broadcasterB","hub"); - network = "irmg_commnet" - }, -/obj/structure/window/reinforced/survival_pod{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "1-2" +"qW" = ( +/obj/effect/turf_decal/trimline/opaque/yellow/line, +/obj/effect/turf_decal/siding/thinplating, +/obj/structure/noticeboard/captain{ + desc = "Important notices from the Vanguard."; + dir = 1; + name = "Vanguard's Notice Board"; + pixel_y = -25 }, -/turf/open/floor/circuit/telecomms/mainframe, -/area/ship/engineering/communications) +/turf/open/floor/plasteel/patterned/grid, +/area/ship/hallway/port) "rc" = ( /obj/structure/cable{ icon_state = "4-8" @@ -2907,6 +2846,28 @@ }, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) +"rV" = ( +/obj/machinery/button/door{ + dir = 4; + id = "talos_engine_shutter"; + name = "Shutter Control"; + pixel_x = -21; + pixel_y = -2 + }, +/obj/machinery/button/door{ + dir = 4; + id = "talos_engine_vent"; + name = "External Vent Control"; + pixel_x = -21; + pixel_y = 10 + }, +/obj/machinery/atmospherics/pipe/simple/purple/visible, +/obj/machinery/computer/atmos_control/incinerator{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/dark/hidden/layer1, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/engine) "sa" = ( /obj/effect/turf_decal/box/corners, /obj/structure/cable{ @@ -2914,19 +2875,6 @@ }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) -"sb" = ( -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/official/safety_internals{ - pixel_y = 32 - }, -/obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/inteq, -/obj/item/clothing/head/helmet/space/inteq, -/turf/open/floor/plasteel/tech/grid, -/area/ship/maintenance/port) "sc" = ( /obj/structure/table, /obj/item/paper_bin, @@ -3074,6 +3022,38 @@ }, /turf/open/floor/plasteel/dark, /area/ship/hallway/port) +"sM" = ( +/obj/structure/rack, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/official/ion_carbine{ + pixel_x = -32 + }, +/obj/item/ammo_box/magazine/m12g/small{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/ammo_box/magazine/m12g/small{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/ammo_box/magazine/m12g/small{ + pixel_x = -5 + }, +/obj/item/ammo_box/magazine/m12g/small{ + pixel_x = -5 + }, +/obj/item/ammo_box/magazine/co9mm{ + pixel_x = 5 + }, +/obj/item/ammo_box/magazine/co9mm{ + pixel_x = -5 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/security/armory) "sN" = ( /obj/effect/turf_decal/industrial/warning{ dir = 8 @@ -3088,6 +3068,23 @@ }, /turf/open/floor/engine/hull/reinforced, /area/ship/cargo) +"sT" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/landmark/start/assistant, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) "sV" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/storage) @@ -3165,19 +3162,6 @@ }, /turf/open/floor/plating/airless, /area/ship/maintenance/port) -"th" = ( -/obj/structure/chair/stool{ - dir = 1 - }, -/obj/effect/turf_decal/siding/thinplating/dark, -/obj/effect/turf_decal/trimline/opaque/yellow/line, -/obj/effect/decal/cleanable/dirt, -/obj/structure/reagent_dispensers/peppertank{ - pixel_y = -28 - }, -/obj/structure/extinguisher_cabinet/directional/east, -/turf/open/floor/plasteel/tech, -/area/ship/security/armory) "ti" = ( /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plating/airless, @@ -3225,19 +3209,6 @@ /obj/structure/sign/number/one, /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/maintenance/starboard) -"tt" = ( -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/official/safety_internals{ - pixel_y = 32 - }, -/obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/inteq, -/obj/item/clothing/head/helmet/space/inteq, -/turf/open/floor/plasteel/tech/grid, -/area/ship/maintenance/starboard) "tu" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 @@ -3251,17 +3222,6 @@ /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/plasteel/dark, /area/ship/engineering/communications) -"tw" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/catwalk/over, -/turf/open/floor/plating, -/area/ship/engineering/engine) "tA" = ( /turf/closed/wall/mineral/plastitanium, /area/ship/engineering) @@ -3287,23 +3247,6 @@ /obj/structure/catwalk/over, /turf/open/floor/plating, /area/ship/engineering) -"tH" = ( -/obj/machinery/power/terminal, -/obj/structure/table, -/obj/item/assembly/timer{ - pixel_x = 6; - pixel_y = -3 - }, -/obj/item/screwdriver{ - pixel_x = -2; - pixel_y = 1 - }, -/obj/item/assembly/igniter{ - pixel_y = 6 - }, -/obj/structure/cable/yellow, -/turf/open/floor/plasteel/dark, -/area/ship/engineering) "tK" = ( /obj/effect/turf_decal/industrial/warning/fulltile, /obj/machinery/door/airlock/maintenance_hatch{ @@ -3337,15 +3280,6 @@ /obj/item/radio/intercom/directional/west, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) -"tV" = ( -/obj/docking_port/stationary{ - dir = 4; - dwidth = 4; - height = 15; - width = 6 - }, -/turf/template_noop, -/area/template_noop) "ua" = ( /obj/effect/turf_decal/industrial/traffic, /obj/structure/cable{ @@ -3394,6 +3328,25 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/grimy, /area/ship/crew) +"ug" = ( +/obj/structure/rack, +/obj/effect/turf_decal/siding/thinplating/dark, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/retro/lasergun_new{ + pixel_x = -32 + }, +/obj/item/gun/ballistic/shotgun/bulldog/inteq{ + pixel_x = -8; + pixel_y = 8; + spawnwithmagazine = 0 + }, +/obj/item/gun/ballistic/shotgun/bulldog/inteq{ + pixel_x = -12; + spawnwithmagazine = 0 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/security/armory) "ul" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -3422,26 +3375,6 @@ }, /turf/open/floor/plasteel/patterned, /area/ship/cargo) -"uq" = ( -/obj/machinery/button/door{ - dir = 4; - id = "talos_thrusters_port"; - name = "Blast Door Control"; - pixel_x = -21; - pixel_y = 3 - }, -/obj/structure/closet/secure_closet/engineering_electrical{ - req_access = null; - req_access_txt = "11"; - req_one_access = null - }, -/obj/effect/turf_decal/techfloor{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, -/obj/effect/turf_decal/siding/thinplating/dark, -/turf/open/floor/plasteel/tech/grid, -/area/ship/engineering) "ur" = ( /obj/structure/table, /obj/item/toy/cards/deck/syndicate{ @@ -3460,36 +3393,6 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) -"uw" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/yellow{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/brown{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/landmark/start/assistant, -/obj/machinery/firealarm/directional/west, -/turf/open/floor/plasteel/dark, -/area/ship/crew/canteen) -"uA" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/number/zero, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/dark, -/area/ship/engineering) "uC" = ( /obj/machinery/atmospherics/components/unary/shuttle/heater{ dir = 4 @@ -3525,28 +3428,6 @@ "uI" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/maintenance/starboard) -"uN" = ( -/obj/machinery/button/door{ - dir = 4; - id = "talos_engine_shutter"; - name = "Shutter Control"; - pixel_x = -21; - pixel_y = -2 - }, -/obj/machinery/button/door{ - dir = 4; - id = "talos_engine_vent"; - name = "External Vent Control"; - pixel_x = -21; - pixel_y = 10 - }, -/obj/machinery/atmospherics/pipe/simple/purple/visible, -/obj/machinery/computer/atmos_control/incinerator{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/dark/hidden/layer1, -/turf/open/floor/plasteel/tech, -/area/ship/engineering/engine) "uO" = ( /obj/effect/turf_decal/box/corners{ dir = 1 @@ -3554,23 +3435,23 @@ /obj/machinery/iv_drip, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) -"vc" = ( -/obj/effect/turf_decal/trimline/opaque/yellow/line, -/obj/effect/turf_decal/siding/thinplating, -/obj/structure/noticeboard/captain{ - desc = "Important notices from the Vanguard."; - dir = 1; - name = "Vanguard's Notice Board"; - pixel_y = -25 - }, -/turf/open/floor/plasteel/patterned/grid, -/area/ship/hallway/port) "vi" = ( /obj/structure/sign/number/eight{ dir = 1 }, /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/maintenance/port) +"vn" = ( +/obj/effect/turf_decal/corner/opaque/yellow, +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 4 + }, +/obj/structure/noticeboard{ + dir = 8; + pixel_x = 25 + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) "vo" = ( /obj/structure/cable{ icon_state = "1-2" @@ -3589,6 +3470,20 @@ "vp" = ( /turf/closed/wall/mineral/plastitanium, /area/ship/engineering/communications) +"vv" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/catwalk/over, +/turf/open/floor/plating, +/area/ship/engineering/engine) "vE" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/external/dark) @@ -3732,14 +3627,6 @@ /obj/structure/weightmachine/stacklifter, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) -"wq" = ( -/obj/machinery/door/poddoor{ - id = "talos_tank_burn" - }, -/obj/effect/turf_decal/industrial/fire/fulltile, -/obj/effect/decal/cleanable/oil/slippery, -/turf/open/floor/engine/hull/reinforced/interior, -/area/ship/engineering/engine) "wu" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 @@ -3830,20 +3717,6 @@ }, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/port) -"wG" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/catwalk/over, -/turf/open/floor/plating, -/area/ship/engineering/engine) "wQ" = ( /obj/effect/turf_decal/industrial/traffic, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -3855,13 +3728,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/plating/airless, /area/ship/maintenance/port) -"wV" = ( -/obj/machinery/power/smes/engineering, -/obj/structure/cable{ - icon_state = "0-8" - }, -/turf/open/floor/plating, -/area/ship/engineering) "wY" = ( /obj/machinery/light/directional/east, /obj/effect/turf_decal/trimline/opaque/yellow/line{ @@ -3935,25 +3801,31 @@ dir = 4 }, /area/ship/cargo) -"xg" = ( -/obj/structure/cable{ - icon_state = "5-10" +"xj" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/crew/cryo) +"xl" = ( +/obj/machinery/telecomms/bus/preset_four{ + autolinkers = list("hub","processor4","bus"); + network = "irmg_commnet" }, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/turf/open/floor/circuit/telecomms/mainframe, +/area/ship/engineering/communications) +"xn" = ( +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/structure/catwalk/over, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/structure/catwalk/over, +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -19 }, /turf/open/floor/plating, -/area/ship/engineering/engine) -"xj" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/crew/cryo) +/area/ship/engineering) "xo" = ( /obj/structure/railing{ dir = 4 @@ -3968,16 +3840,17 @@ /obj/structure/tank_dispenser, /turf/open/floor/plasteel/dark, /area/ship/engineering) -"xA" = ( -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/machinery/telecomms/server/presets/common{ - autolinkers = list("common","hub"); - freq_listening = list(1459); +"xz" = ( +/obj/machinery/telecomms/broadcaster/preset_right{ + autolinkers = list("broadcasterB","hub"); network = "irmg_commnet" }, +/obj/structure/window/reinforced/survival_pod{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/circuit/telecomms/mainframe, /area/ship/engineering/communications) "xB" = ( @@ -4032,17 +3905,6 @@ }, /turf/open/floor/plasteel/tech, /area/ship/engineering/engine) -"xP" = ( -/obj/machinery/light/directional/east, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/layer_manifold/visible, -/turf/open/floor/plasteel/tech, -/area/ship/engineering/engine) "xT" = ( /obj/structure/cable{ icon_state = "2-4" @@ -4080,6 +3942,21 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/black, /area/ship/crew/dorm) +"yc" = ( +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -19 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/structure/cable/yellow, +/obj/machinery/power/terminal, +/turf/open/floor/plasteel/dark, +/area/ship/engineering/communications) "yj" = ( /obj/effect/turf_decal/industrial/warning{ dir = 4 @@ -4189,40 +4066,12 @@ }, /turf/open/floor/plating/airless, /area/ship/cargo/starboard) -"yQ" = ( +"yS" = ( /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/computer/atmos_control/tank/air_tank{ - dir = 8 - }, -/obj/machinery/button/door{ - dir = 8; - id = "talos_tank_air"; - name = "Access Door Control"; - pixel_x = 21; - pixel_y = -6; - req_access_txt = "24" - }, -/obj/machinery/button/shieldwallgen{ - dir = 8; - id = "talos_tank_air"; - pixel_x = 19; - pixel_y = 4; - req_access_txt = "24" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/turf/open/floor/plasteel/tech, -/area/ship/engineering/engine) -"yS" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "1-4" +/obj/structure/cable{ + icon_state = "1-4" }, /obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{ dir = 1 @@ -4299,11 +4148,46 @@ }, /turf/open/floor/plasteel/dark, /area/ship/engineering/communications) +"zu" = ( +/obj/effect/turf_decal/box/corners{ + dir = 4 + }, +/obj/machinery/button/door{ + dir = 8; + id = "talos_cargo"; + name = "Cargo Door Control"; + pixel_x = 21; + pixel_y = 8 + }, +/obj/machinery/button/shieldwallgen{ + dir = 8; + id = "talos_cargo"; + pixel_x = 19; + pixel_y = -2 + }, +/obj/structure/weightmachine/weightlifter, +/obj/machinery/light/directional/north, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/patterned/cargo_one, +/area/ship/cargo) "zw" = ( /obj/effect/turf_decal/industrial/warning/fulltile, /obj/machinery/door/airlock/external, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) +"zz" = ( +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -19 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/opaque/yellow/line{ + dir = 10 + }, +/turf/open/floor/plasteel/dark, +/area/ship/storage) "zB" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/closet/crate/trashcart, @@ -4433,19 +4317,6 @@ /obj/item/soap, /turf/open/floor/plasteel/showroomfloor, /area/ship/crew/toilet) -"Ao" = ( -/obj/machinery/computer/apc_control{ - dir = 1 - }, -/obj/structure/cable, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/open/floor/plating, -/area/ship/engineering) "Ap" = ( /turf/closed/wall/mineral/plastitanium, /area/ship/cargo/port) @@ -4482,6 +4353,15 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plasteel/dark, /area/ship/hallway/port) +"AB" = ( +/obj/docking_port/stationary{ + dir = 4; + dwidth = 4; + height = 15; + width = 6 + }, +/turf/template_noop, +/area/template_noop) "AC" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 @@ -4569,6 +4449,16 @@ }, /turf/open/floor/plating, /area/ship/engineering) +"AZ" = ( +/obj/effect/landmark/start/station_engineer, +/obj/structure/chair/office{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering) "Ba" = ( /obj/structure/chair{ dir = 8 @@ -4590,9 +4480,29 @@ /obj/item/instrument/guitar, /turf/open/floor/plasteel/grimy, /area/ship/crew) +"Bm" = ( +/obj/machinery/power/smes/engineering, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/ship/engineering) "Bv" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/crew) +"Bz" = ( +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/official/safety_internals{ + pixel_y = 32 + }, +/obj/machinery/suit_storage_unit/inherit, +/obj/item/clothing/suit/space/inteq, +/obj/item/clothing/head/helmet/space/inteq, +/turf/open/floor/plasteel/tech/grid, +/area/ship/maintenance/port) "BJ" = ( /obj/structure/cable{ icon_state = "4-8" @@ -4627,6 +4537,21 @@ }, /turf/open/floor/plating/airless, /area/ship/cargo/port) +"BS" = ( +/obj/effect/turf_decal/box/corners{ + dir = 1 + }, +/obj/machinery/mineral/ore_redemption{ + dir = 4; + input_dir = 4; + output_dir = 0 + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -19 + }, +/turf/open/floor/plasteel/patterned/cargo_one, +/area/ship/cargo) "BY" = ( /obj/structure/cable{ icon_state = "1-2" @@ -4642,23 +4567,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) -"Ce" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/table/reinforced, -/obj/item/folder/syndicate{ - desc = "A slick black folder stamped 'Property of Inteq Risk Management Group.'"; - name = "folder" - }, -/obj/item/stamp/law{ - name = "master at arms' rubber stamp" - }, -/obj/item/table_bell{ - pixel_x = -15 - }, -/turf/open/floor/plasteel/dark, -/area/ship/security) "Cp" = ( /obj/machinery/vending/cola/random, /obj/structure/sign/poster/contraband/inteq{ @@ -4680,6 +4588,15 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/ship/engineering) +"Cu" = ( +/obj/structure/catwalk/over/plated_catwalk, +/obj/structure/railing, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/computer/cryopod/directional/north, +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew/cryo) "Cy" = ( /obj/machinery/cryopod{ dir = 8 @@ -4696,17 +4613,6 @@ "CF" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/cargo) -"CI" = ( -/obj/effect/turf_decal/corner/opaque/yellow, -/obj/effect/turf_decal/corner/opaque/brown{ - dir = 4 - }, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 20 - }, -/turf/open/floor/plasteel/dark, -/area/ship/crew/canteen) "CJ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/dust, @@ -4846,17 +4752,6 @@ }, /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/maintenance/port) -"DA" = ( -/obj/effect/turf_decal/techfloor{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/radio/intercom/directional/east, -/obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/inteq, -/obj/item/clothing/head/helmet/space/inteq, -/turf/open/floor/plasteel/tech/grid, -/area/ship/hallway/central) "DC" = ( /obj/effect/turf_decal/box/corners, /obj/structure/closet/crate{ @@ -4878,43 +4773,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) -"DJ" = ( -/obj/structure/cable{ - icon_state = "2-5" - }, -/obj/structure/cable{ - icon_state = "5-8" - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/obj/machinery/camera/autoname{ - dir = 8 - }, -/obj/machinery/computer/atmos_control/tank/mix_tank{ - dir = 8 - }, -/obj/machinery/button/shieldwallgen{ - dir = 8; - id = "talos_tank_fuel"; - pixel_x = 19; - pixel_y = 4; - req_access_txt = "24" - }, -/obj/machinery/button/door{ - color = "red"; - dir = 8; - id = "talos_tank_fuel"; - name = "Access Door Control (DANGER) (EXTREMELY DANGEROUS) (DO NOT PRESS)"; - pixel_x = 21; - pixel_y = -6; - req_access_txt = "24" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/open/floor/plasteel/tech, -/area/ship/engineering/engine) "DO" = ( /turf/closed/wall/mineral/plastitanium, /area/ship/maintenance/starboard) @@ -4971,25 +4829,6 @@ }, /turf/open/floor/plating/airless, /area/ship/maintenance/port) -"Ey" = ( -/obj/effect/turf_decal/box/corners, -/obj/machinery/button/shieldwallgen{ - dir = 8; - id = "talos_cargo"; - pixel_x = 19; - pixel_y = 8 - }, -/obj/machinery/button/door{ - dir = 8; - id = "talos_cargo"; - name = "Cargo Door Control"; - pixel_x = 21; - pixel_y = -2 - }, -/obj/machinery/light/directional/south, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/patterned/cargo_one, -/area/ship/cargo) "EC" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 8 @@ -5113,6 +4952,19 @@ /obj/effect/turf_decal/industrial/warning, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) +"Fu" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/item/analyzer{ + pixel_x = 6; + pixel_y = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering) "Fx" = ( /obj/structure/chair{ dir = 8 @@ -5175,6 +5027,14 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/tech/grid, /area/ship/maintenance/starboard) +"FV" = ( +/obj/structure/catwalk/over/plated_catwalk, +/obj/structure/railing, +/obj/structure/noticeboard{ + pixel_y = 25 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew/cryo) "Ga" = ( /obj/structure/cable{ icon_state = "4-8" @@ -5224,6 +5084,12 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/plating/airless, /area/ship/cargo/starboard) +"Gr" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input{ + dir = 8 + }, +/turf/open/floor/engine/vacuum, +/area/ship/engineering/engine) "Gt" = ( /obj/effect/turf_decal/siding/thinplating/dark, /obj/effect/turf_decal/trimline/opaque/yellow/line{ @@ -5243,6 +5109,19 @@ /obj/item/clothing/gloves/combat, /turf/open/floor/plasteel/tech/grid, /area/ship/security/armory) +"Gu" = ( +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/official/safety_internals{ + pixel_y = 32 + }, +/obj/machinery/suit_storage_unit/inherit, +/obj/item/clothing/suit/space/inteq, +/obj/item/clothing/head/helmet/space/inteq, +/turf/open/floor/plasteel/tech/grid, +/area/ship/maintenance/starboard) "Gv" = ( /obj/effect/turf_decal/industrial/traffic{ dir = 1 @@ -5252,12 +5131,32 @@ }, /turf/open/floor/plasteel/patterned, /area/ship/cargo) -"GG" = ( -/obj/machinery/light/small/directional/west, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +"Gx" = ( +/obj/effect/turf_decal/corner/opaque/yellow, +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 4 + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 20 + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/canteen) +"Gz" = ( +/obj/machinery/light/directional/south, +/obj/machinery/telecomms/hub{ + autolinkers = list("hub","bus","relay","messaging","inteq","common","broadcasterB","receiverB"); + id = "IRMG Communications Hub"; + network = "irmg_commnet" + }, +/turf/open/floor/circuit/telecomms/mainframe, +/area/ship/engineering/communications) +"GG" = ( +/obj/machinery/light/small/directional/west, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, /turf/open/floor/carpet/black, @@ -5311,6 +5210,17 @@ }, /turf/open/floor/plating/airless, /area/ship/cargo/port) +"He" = ( +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/radio/intercom/directional/east, +/obj/machinery/suit_storage_unit/inherit, +/obj/item/clothing/suit/space/inteq, +/obj/item/clothing/head/helmet/space/inteq, +/turf/open/floor/plasteel/tech/grid, +/area/ship/hallway/central) "Hh" = ( /obj/effect/turf_decal/corner/opaque/yellow{ dir = 1 @@ -5412,6 +5322,37 @@ /obj/structure/catwalk/over, /turf/open/floor/plating, /area/ship/engineering/engine) +"Ir" = ( +/obj/machinery/computer/security{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 8 + }, +/obj/machinery/button/door{ + dir = 4; + id = "talos_armory"; + name = "Door Control"; + normaldoorcontrol = 1; + pixel_x = -21; + pixel_y = -6; + req_access_txt = "3" + }, +/obj/machinery/button/door{ + dir = 4; + id = "talos_armory"; + name = "Door Bolt Control"; + normaldoorcontrol = 1; + pixel_x = -21; + pixel_y = 6; + req_access_txt = "3"; + specialfunctions = 4 + }, +/turf/open/floor/plasteel/dark, +/area/ship/security) "Iv" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 @@ -5498,10 +5439,64 @@ /obj/effect/turf_decal/siding/thinplating, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/port) +"Je" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8; + filter_types = list("n2","co2","bz","water_vapor","miasma","freon","pluox","tritium","n20","no2","nob"); + id_tag = null + }, +/obj/machinery/atmospherics/pipe/simple/purple/hidden{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/dark/hidden/layer1{ + dir = 10 + }, +/turf/open/floor/engine/vacuum, +/area/ship/engineering/engine) "Jk" = ( /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating/airless, /area/ship/cargo/starboard) +"Jo" = ( +/obj/structure/cable{ + icon_state = "2-5" + }, +/obj/structure/cable{ + icon_state = "5-8" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/machinery/camera/autoname{ + dir = 8 + }, +/obj/machinery/computer/atmos_control/tank/mix_tank{ + dir = 8 + }, +/obj/machinery/button/shieldwallgen{ + dir = 8; + id = "talos_tank_fuel"; + pixel_x = 19; + pixel_y = 4; + req_access_txt = "24" + }, +/obj/machinery/button/door{ + color = "red"; + dir = 8; + id = "talos_tank_fuel"; + name = "Access Door Control (DANGER) (EXTREMELY DANGEROUS) (DO NOT PRESS)"; + pixel_x = 21; + pixel_y = -6; + req_access_txt = "24" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/engine) "Jq" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -5529,18 +5524,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/port) -"JF" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/rack, -/obj/effect/turf_decal/siding/thinplating/dark, -/obj/effect/decal/cleanable/dirt, -/obj/item/gun/ballistic/automatic/pistol/commander/inteq{ - pixel_y = 5 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/security/armory) "JI" = ( /obj/effect/turf_decal/industrial/warning/fulltile, /obj/effect/decal/cleanable/dirt/dust, @@ -5599,22 +5582,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) -"Kc" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/corner/opaque/yellow{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/brown{ - dir = 4 - }, -/obj/structure/chair/comfy/black, -/obj/machinery/light_switch{ - pixel_y = 22 - }, -/turf/open/floor/plasteel/dark, -/area/ship/security) "Kd" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 @@ -5639,23 +5606,6 @@ "Kf" = ( /turf/open/floor/plasteel/dark, /area/ship/storage) -"Kh" = ( -/obj/structure/catwalk/over/plated_catwalk, -/obj/structure/railing, -/obj/structure/noticeboard{ - pixel_y = 25 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/crew/cryo) -"Kr" = ( -/obj/structure/catwalk/over/plated_catwalk, -/obj/structure/railing, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/computer/cryopod/directional/north, -/turf/open/floor/plasteel/tech/grid, -/area/ship/crew/cryo) "Ks" = ( /obj/structure/cable{ icon_state = "4-8" @@ -5778,21 +5728,46 @@ }, /turf/open/floor/plating, /area/ship/bridge) +"Lm" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/table/reinforced, +/obj/item/folder/syndicate{ + desc = "A slick black folder stamped 'Property of Inteq Risk Management Group.'"; + name = "folder" + }, +/obj/item/stamp/law{ + name = "master at arms' rubber stamp" + }, +/obj/item/table_bell{ + pixel_x = -15 + }, +/turf/open/floor/plasteel/dark, +/area/ship/security) +"Lo" = ( +/obj/machinery/power/terminal, +/obj/structure/table, +/obj/item/assembly/timer{ + pixel_x = 6; + pixel_y = -3 + }, +/obj/item/screwdriver{ + pixel_x = -2; + pixel_y = 1 + }, +/obj/item/assembly/igniter{ + pixel_y = 6 + }, +/obj/structure/cable/yellow, +/turf/open/floor/plasteel/dark, +/area/ship/engineering) "Lu" = ( /obj/machinery/atmospherics/components/binary/circulator/cold{ dir = 1 }, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering/engine) -"LD" = ( -/obj/effect/turf_decal/industrial/fire{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/tech, -/area/ship/engineering/engine) "LF" = ( /obj/machinery/door/airlock/maintenance_hatch{ welded = 1 @@ -5875,6 +5850,31 @@ }, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) +"LV" = ( +/obj/machinery/telecomms/receiver/preset_right{ + autolinkers = list("receiverB","hub"); + freq_listening = list(1347,1359); + network = "irmg_commnet" + }, +/obj/structure/window/reinforced/survival_pod{ + dir = 1 + }, +/turf/open/floor/circuit/telecomms/mainframe, +/area/ship/engineering/communications) +"Ma" = ( +/obj/effect/turf_decal/industrial/fire{ + dir = 4 + }, +/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, +/obj/machinery/door/poddoor/shutters{ + id = "talos_engine_shutter" + }, +/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, +/obj/machinery/door/poddoor/shutters{ + id = "talos_engine_shutter" + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) "Mf" = ( /obj/structure/chair{ dir = 4 @@ -5900,16 +5900,6 @@ }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) -"Mj" = ( -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/extinguisher_cabinet/directional/north, -/obj/structure/extinguisher_cabinet/directional/east, -/turf/open/floor/plasteel/grimy, -/area/ship/crew) "Ml" = ( /obj/structure/cable{ icon_state = "1-4" @@ -5937,29 +5927,6 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/plasteel/tech, /area/ship/maintenance/starboard) -"Mo" = ( -/obj/machinery/light_switch{ - dir = 1; - pixel_y = -19 - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 10 - }, -/obj/effect/turf_decal/trimline/opaque/yellow/line{ - dir = 10 - }, -/turf/open/floor/plasteel/dark, -/area/ship/storage) -"Mr" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/effect/turf_decal/number/five, -/turf/open/floor/plasteel/dark, -/area/ship/engineering) "Mx" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 @@ -6039,12 +6006,23 @@ /obj/structure/ore_box, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) -"Nd" = ( -/obj/machinery/light/directional/west, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/turf/open/floor/plasteel/grimy, +"MX" = ( +/obj/machinery/light/directional/east, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/layer_manifold/visible, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/engine) +"Nd" = ( +/obj/machinery/light/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/plasteel/grimy, /area/ship/crew) "Nf" = ( /obj/structure/cable{ @@ -6062,46 +6040,49 @@ /obj/machinery/portable_atmospherics/canister/toxins, /turf/open/floor/plating/airless, /area/ship/cargo/starboard) +"Nj" = ( +/obj/effect/turf_decal/box/corners, +/obj/machinery/button/shieldwallgen{ + dir = 8; + id = "talos_cargo"; + pixel_x = 19; + pixel_y = 8 + }, +/obj/machinery/button/door{ + dir = 8; + id = "talos_cargo"; + name = "Cargo Door Control"; + pixel_x = 21; + pixel_y = -2 + }, +/obj/machinery/light/directional/south, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/patterned/cargo_one, +/area/ship/cargo) "Nk" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/opaque/yellow/warning, /turf/open/floor/engine/hull/reinforced, /area/ship/external/dark) -"Nr" = ( -/obj/item/clothing/glasses/hud/security/sunglasses/inteq, -/obj/item/clothing/mask/gas/sechailer/inteq, -/obj/item/clothing/gloves/tackler/combat/insulated, -/obj/item/clothing/shoes/combat, -/obj/item/storage/belt/military/assault, -/obj/item/storage/backpack/messenger/inteq, -/obj/item/megaphone/command, -/obj/item/clothing/under/syndicate/inteq/skirt, -/obj/item/clothing/under/syndicate/inteq, -/obj/item/clothing/suit/armor/hos/inteq, -/obj/item/clothing/head/beret/sec/hos/inteq, -/obj/item/areaeditor/shuttle, -/obj/item/shield/riot/tele, -/obj/structure/closet/secure_closet{ - anchored = 1; - can_be_unanchored = 1; - icon_state = "cap"; - name = "vanguard's locker"; - req_access_txt = "20" +"NC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 }, -/obj/effect/turf_decal/corner/opaque/brown{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 }, -/obj/effect/turf_decal/corner/opaque/yellow{ - dir = 1 +/obj/machinery/advanced_airlock_controller{ + pixel_y = -21 }, -/obj/machinery/light/directional/west, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/effect/turf_decal/siding/thinplating/dark{ dir = 4 }, -/obj/item/storage/belt/security/webbing/inteq/alt, -/obj/item/storage/belt/security/webbing/inteq, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) +/obj/effect/turf_decal/trimline/opaque/yellow/warning{ + dir = 4 + }, +/turf/open/floor/plasteel/tech, +/area/ship/hallway/central) "NF" = ( /obj/structure/cable{ icon_state = "4-8" @@ -6109,28 +6090,6 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating/airless, /area/ship/maintenance/port) -"NJ" = ( -/obj/effect/turf_decal/box/corners{ - dir = 4 - }, -/obj/machinery/button/door{ - dir = 8; - id = "talos_cargo"; - name = "Cargo Door Control"; - pixel_x = 21; - pixel_y = 8 - }, -/obj/machinery/button/shieldwallgen{ - dir = 8; - id = "talos_cargo"; - pixel_x = 19; - pixel_y = -2 - }, -/obj/structure/weightmachine/weightlifter, -/obj/machinery/light/directional/north, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/patterned/cargo_one, -/area/ship/cargo) "NK" = ( /turf/open/floor/engine/air, /area/ship/engineering/engine) @@ -6176,16 +6135,6 @@ }, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) -"Ob" = ( -/obj/effect/turf_decal/techfloor{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/inteq, -/obj/item/clothing/head/helmet/space/inteq, -/turf/open/floor/plasteel/tech/grid, -/area/ship/hallway/central) "Oc" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plasteel/patterned/cargo_one, @@ -6211,21 +6160,6 @@ /obj/machinery/light/directional/north, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) -"Oz" = ( -/obj/effect/turf_decal/box/corners{ - dir = 1 - }, -/obj/machinery/mineral/ore_redemption{ - dir = 4; - input_dir = 4; - output_dir = 0 - }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -19 - }, -/turf/open/floor/plasteel/patterned/cargo_one, -/area/ship/cargo) "OD" = ( /obj/effect/turf_decal/box/corners{ dir = 4 @@ -6262,6 +6196,29 @@ }, /turf/open/floor/plasteel/dark, /area/ship/security) +"ON" = ( +/obj/structure/table/reinforced, +/obj/machinery/photocopier/faxmachine/longrange, +/obj/machinery/button/door{ + id = "talos_bridge"; + name = "Bridge Shutters"; + pixel_x = 6; + pixel_y = 23 + }, +/obj/machinery/button/door{ + id = "talos_windows"; + name = "Window Lockdown"; + pixel_x = -6; + pixel_y = 23 + }, +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/yellow{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) "OP" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/dust, @@ -6273,6 +6230,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/airless, /area/ship/external/dark) +"Pk" = ( +/obj/machinery/door/poddoor/shutters{ + dir = 4; + id = "talos_engine_shutter" + }, +/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/engineering/engine) "Pm" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1; @@ -6286,6 +6251,13 @@ "Pp" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/cargo/port) +"Pr" = ( +/obj/machinery/air_sensor/atmos/incinerator_tank, +/obj/machinery/atmospherics/pipe/simple/purple/hidden{ + dir = 4 + }, +/turf/open/floor/engine/vacuum, +/area/ship/engineering/engine) "Ps" = ( /obj/machinery/airalarm/directional/south, /turf/open/floor/carpet/black, @@ -6298,6 +6270,10 @@ /obj/structure/closet/crate, /turf/open/floor/plating/airless, /area/ship/maintenance/starboard) +"Pw" = ( +/obj/machinery/porta_turret/ship/weak, +/turf/closed/wall/mineral/plastitanium, +/area/ship/bridge) "Py" = ( /obj/structure/cable{ icon_state = "1-2" @@ -6334,6 +6310,19 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) +"PL" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/catwalk/over, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/plating, +/area/ship/engineering/engine) "PN" = ( /obj/structure/cable{ icon_state = "4-8" @@ -6360,6 +6349,18 @@ }, /turf/open/floor/engine/hull/reinforced, /area/ship/external/dark) +"PY" = ( +/obj/structure/table/reinforced, +/obj/item/flashlight/lamp, +/obj/effect/turf_decal/corner/opaque/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/plasteel/dark, +/area/ship/security) "Qa" = ( /obj/machinery/door/window/northleft{ dir = 4; @@ -6371,26 +6372,6 @@ /obj/effect/turf_decal/siding/thinplating/dark, /turf/open/floor/plasteel/tech, /area/ship/security/armory) -"Qe" = ( -/obj/structure/cable{ - icon_state = "5-10" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/dark/hidden/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/catwalk/over, -/obj/machinery/light/directional/south, -/turf/open/floor/plating, -/area/ship/engineering/engine) "Qg" = ( /obj/effect/turf_decal/industrial/warning{ dir = 8 @@ -6475,21 +6456,6 @@ }, /turf/open/floor/engine/air, /area/ship/engineering/engine) -"QO" = ( -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -19 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/structure/cable/yellow, -/obj/machinery/power/terminal, -/turf/open/floor/plasteel/dark, -/area/ship/engineering/communications) "QR" = ( /obj/effect/turf_decal/corner/opaque/yellow, /obj/effect/turf_decal/corner/opaque/brown{ @@ -6536,6 +6502,20 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/airless, /area/ship/cargo/starboard) +"QZ" = ( +/obj/machinery/power/shieldwallgen/atmos/roundstart{ + dir = 8; + id = "talos_tank_burn" + }, +/obj/effect/turf_decal/industrial/fire/fulltile, +/obj/machinery/door/poddoor{ + id = "talos_tank_burn" + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/engine/hull/reinforced/interior, +/area/ship/engineering/engine) "Rc" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 5 @@ -6545,29 +6525,6 @@ }, /turf/open/floor/plasteel/dark, /area/ship/storage) -"Re" = ( -/obj/structure/table/reinforced, -/obj/machinery/photocopier/faxmachine/longrange, -/obj/machinery/button/door{ - id = "talos_bridge"; - name = "Bridge Shutters"; - pixel_x = 6; - pixel_y = 23 - }, -/obj/machinery/button/door{ - id = "talos_windows"; - name = "Window Lockdown"; - pixel_x = -6; - pixel_y = 23 - }, -/obj/effect/turf_decal/corner/opaque/brown{ - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/yellow{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) "Rg" = ( /obj/structure/cable{ icon_state = "4-8" @@ -6587,19 +6544,6 @@ /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating/airless, /area/ship/cargo/port) -"Rj" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/drinkingglasses{ - pixel_x = -8; - pixel_y = 5 - }, -/obj/machinery/light_switch{ - dir = 1; - pixel_y = -19 - }, -/obj/machinery/newscaster/directional/west, -/turf/open/floor/plasteel/grimy, -/area/ship/crew) "Rp" = ( /obj/structure/cable{ icon_state = "4-8" @@ -6629,6 +6573,49 @@ }, /turf/open/floor/plating, /area/ship/engineering) +"RC" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/catwalk/over, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/dark/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/ship/engineering/engine) +"RF" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/number/zero, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/dark, +/area/ship/engineering) +"RL" = ( +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 20 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/turf/open/floor/carpet/black, +/area/ship/crew/dorm) "RT" = ( /turf/open/floor/plating/airless, /area/ship/maintenance/port) @@ -6639,6 +6626,12 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/ship/cargo/port) +"RW" = ( +/obj/machinery/turretid/lethal{ + pixel_y = 32 + }, +/turf/open/floor/carpet/orange, +/area/ship/bridge) "RY" = ( /obj/effect/turf_decal/industrial/warning/fulltile, /obj/machinery/door/airlock/hatch{ @@ -6733,6 +6726,22 @@ }, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) +"SD" = ( +/obj/structure/cable{ + icon_state = "5-10" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/catwalk/over, +/turf/open/floor/plating, +/area/ship/engineering/engine) "SH" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, @@ -6837,29 +6846,26 @@ /obj/effect/landmark/start/medical_doctor, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) -"Tu" = ( -/obj/structure/rack, -/obj/effect/turf_decal/siding/thinplating/dark, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/retro/lasergun_new{ - pixel_x = -32 - }, -/obj/item/gun/ballistic/shotgun/bulldog/inteq{ - pixel_x = -8; - pixel_y = 8; - spawnwithmagazine = 0 - }, -/obj/item/gun/ballistic/shotgun/bulldog/inteq{ - pixel_x = -12; - spawnwithmagazine = 0 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/security/armory) "TA" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plasteel/grimy, /area/ship/crew) +"TC" = ( +/obj/machinery/power/terminal, +/obj/structure/cable/yellow, +/turf/open/floor/plasteel/dark, +/area/ship/engineering) +"TD" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/catwalk/over, +/turf/open/floor/plating, +/area/ship/engineering/engine) "TE" = ( /obj/structure/cable{ icon_state = "1-8" @@ -6916,29 +6922,6 @@ /obj/effect/decal/cleanable/vomit/old, /turf/open/floor/plating/airless, /area/ship/maintenance/starboard) -"TR" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible, -/obj/effect/turf_decal/industrial/fire{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/sign/warning{ - pixel_x = -25; - pixel_y = 9 - }, -/obj/structure/sign/warning/fire{ - pixel_x = -22; - pixel_y = -4 - }, -/obj/machinery/atmospherics/components/binary/pump/layer2{ - icon_state = "pump_map-1"; - name = "burn chamber exhaust pump"; - piping_layer = 1 - }, -/turf/open/floor/plasteel/tech, -/area/ship/engineering/engine) "TS" = ( /obj/structure/cable{ icon_state = "4-8" @@ -7025,10 +7008,6 @@ }, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) -"Uk" = ( -/obj/machinery/porta_turret/ship/weak, -/turf/closed/wall/mineral/plastitanium, -/area/ship/bridge) "Ul" = ( /obj/effect/turf_decal/box/corners{ dir = 1 @@ -7083,6 +7062,26 @@ "UD" = ( /turf/closed/wall/mineral/plastitanium, /area/ship/maintenance/port) +"UG" = ( +/obj/machinery/button/door{ + dir = 4; + id = "talos_thrusters_port"; + name = "Blast Door Control"; + pixel_x = -21; + pixel_y = 3 + }, +/obj/structure/closet/secure_closet/engineering_electrical{ + req_access = null; + req_access_txt = "11"; + req_one_access = null + }, +/obj/effect/turf_decal/techfloor{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, +/obj/effect/turf_decal/siding/thinplating/dark, +/turf/open/floor/plasteel/tech/grid, +/area/ship/engineering) "UM" = ( /obj/machinery/power/terminal{ dir = 8 @@ -7117,25 +7116,25 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating/airless, /area/ship/maintenance/port) -"UX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +"Ve" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 }, -/obj/machinery/advanced_airlock_controller{ - pixel_y = -32 +/obj/effect/turf_decal/trimline/opaque/yellow/line{ + dir = 1 }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 4 +/obj/machinery/light/directional/north, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 20 }, -/obj/effect/turf_decal/trimline/opaque/yellow/warning{ - dir = 4 +/obj/machinery/suit_storage_unit/inherit{ + req_access_txt = "1" }, -/turf/open/floor/plasteel/tech, -/area/ship/hallway/central) +/obj/item/clothing/suit/space/hardsuit/security/independent/inteq, +/obj/item/tank/jetpack/oxygen, +/turf/open/floor/plasteel/tech/grid, +/area/ship/security/armory) "Vg" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 @@ -7204,6 +7203,26 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) +"VL" = ( +/obj/machinery/button/shieldwallgen{ + id = "talos_tank_burn"; + pixel_x = -6; + pixel_y = 20; + req_access_txt = "56" + }, +/obj/machinery/button/door{ + id = "talos_tank_burn"; + name = "Access Door Control"; + pixel_x = 4; + pixel_y = 21; + req_access = null; + req_access_txt = "56" + }, +/obj/effect/turf_decal/industrial/fire{ + dir = 1 + }, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/engine) "VO" = ( /obj/effect/turf_decal/corner/opaque/yellow, /obj/effect/turf_decal/corner/opaque/brown{ @@ -7276,22 +7295,23 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/plasteel/tech, /area/ship/maintenance/port) +"Wp" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/rack, +/obj/effect/turf_decal/siding/thinplating/dark, +/obj/effect/decal/cleanable/dirt, +/obj/item/gun/ballistic/automatic/pistol/commander/inteq{ + pixel_y = 5 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/security/armory) "Wr" = ( /obj/machinery/light/small/directional/north, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet, /area/ship/maintenance/starboard) -"Wu" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light_switch{ - dir = 1; - pixel_y = -19 - }, -/turf/open/floor/plasteel/tech, -/area/ship/crew/cryo) "Wz" = ( /obj/machinery/computer/helm{ dir = 8 @@ -7362,23 +7382,6 @@ }, /turf/open/floor/carpet/orange, /area/ship/bridge) -"Xc" = ( -/obj/docking_port/stationary{ - dir = 4; - dwidth = 15; - height = 15; - width = 30 - }, -/turf/template_noop, -/area/template_noop) -"Xf" = ( -/obj/machinery/door/poddoor/shutters{ - dir = 4; - id = "talos_engine_shutter" - }, -/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/engineering/engine) "Xg" = ( /turf/open/floor/carpet/black, /area/ship/crew/dorm) @@ -7400,17 +7403,16 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) -"Xu" = ( -/obj/machinery/telecomms/receiver/preset_right{ - autolinkers = list("receiverB","hub"); - freq_listening = list(1347,1359); - network = "irmg_commnet" - }, -/obj/structure/window/reinforced/survival_pod{ - dir = 1 +"Xs" = ( +/obj/effect/turf_decal/techfloor{ + dir = 4 }, -/turf/open/floor/circuit/telecomms/mainframe, -/area/ship/engineering/communications) +/obj/effect/decal/cleanable/dirt, +/obj/machinery/suit_storage_unit/inherit, +/obj/item/clothing/suit/space/inteq, +/obj/item/clothing/head/helmet/space/inteq, +/turf/open/floor/plasteel/tech/grid, +/area/ship/hallway/central) "XA" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/mix_output{ dir = 8 @@ -7427,6 +7429,24 @@ "XJ" = ( /turf/open/floor/engine/hull/reinforced, /area/ship/external/dark) +"XV" = ( +/obj/effect/turf_decal/siding/thinplating/dark, +/obj/effect/turf_decal/trimline/opaque/yellow/line, +/obj/machinery/light/directional/south, +/obj/structure/closet/secure_closet{ + anchored = 1; + can_be_unanchored = 1; + icon_state = "sec"; + name = "equipment locker"; + req_access_txt = "1" + }, +/obj/item/clothing/mask/gas/sechailer/inteq, +/obj/item/storage/belt/security/webbing/inteq, +/obj/item/clothing/glasses/hud/security/sunglasses/inteq, +/obj/item/storage/box/handcuffs, +/obj/item/storage/belt/security/webbing/inteq/alt, +/turf/open/floor/plasteel/tech/grid, +/area/ship/security/armory) "Ya" = ( /obj/effect/turf_decal/industrial/traffic, /obj/structure/cable{ @@ -7434,75 +7454,22 @@ }, /turf/open/floor/plasteel/patterned, /area/ship/cargo) -"Yd" = ( -/obj/machinery/power/smes/engineering, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/floor/plating, -/area/ship/engineering) -"Yf" = ( -/obj/structure/table/reinforced, -/obj/item/flashlight/lamp, -/obj/effect/turf_decal/corner/opaque/yellow{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/brown{ - dir = 8 - }, -/obj/machinery/light/directional/west, -/turf/open/floor/plasteel/dark, -/area/ship/security) -"Yj" = ( -/obj/machinery/computer/security{ - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/yellow{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/brown{ - dir = 8 - }, -/obj/machinery/button/door{ - dir = 4; - id = "talos_armory"; - name = "Door Control"; - normaldoorcontrol = 1; - pixel_x = -21; - pixel_y = -6; - req_access_txt = "3" - }, -/obj/machinery/button/door{ +"Yp" = ( +/obj/machinery/atmospherics/pipe/simple/dark/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/purple/hidden, +/obj/machinery/power/shieldwallgen/atmos/roundstart{ dir = 4; - id = "talos_armory"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - pixel_x = -21; - pixel_y = 6; - req_access_txt = "3"; - specialfunctions = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ship/security) -"Yn" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/opaque/yellow/line{ - dir = 1 + id = "talos_tank_burn" }, -/obj/machinery/light/directional/north, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 20 +/obj/effect/turf_decal/industrial/fire/fulltile, +/obj/machinery/door/poddoor{ + id = "talos_tank_burn" }, -/obj/machinery/suit_storage_unit/inherit{ - req_access_txt = "1" +/obj/structure/cable{ + icon_state = "0-2" }, -/obj/item/clothing/suit/space/hardsuit/security/independent/inteq, -/obj/item/tank/jetpack/oxygen, -/turf/open/floor/plasteel/tech/grid, -/area/ship/security/armory) +/turf/open/floor/engine/hull/reinforced/interior, +/area/ship/engineering/engine) "Yq" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/dust, @@ -7525,11 +7492,40 @@ }, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) -"Yw" = ( -/obj/machinery/turretid/lethal{ - pixel_y = 32 +"Yz" = ( +/obj/item/clothing/glasses/hud/security/sunglasses/inteq, +/obj/item/clothing/mask/gas/sechailer/inteq, +/obj/item/clothing/gloves/tackler/combat/insulated, +/obj/item/clothing/shoes/combat, +/obj/item/storage/belt/military/assault, +/obj/item/storage/backpack/messenger/inteq, +/obj/item/megaphone/command, +/obj/item/clothing/under/syndicate/inteq/skirt, +/obj/item/clothing/under/syndicate/inteq, +/obj/item/clothing/suit/armor/hos/inteq, +/obj/item/clothing/head/beret/sec/hos/inteq, +/obj/item/areaeditor/shuttle, +/obj/item/shield/riot/tele, +/obj/structure/closet/secure_closet{ + anchored = 1; + can_be_unanchored = 1; + icon_state = "cap"; + name = "vanguard's locker"; + req_access_txt = "20" }, -/turf/open/floor/carpet/orange, +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 8 + }, +/obj/effect/turf_decal/corner/opaque/yellow{ + dir = 1 + }, +/obj/machinery/light/directional/west, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/obj/item/storage/belt/security/webbing/inteq/alt, +/obj/item/storage/belt/security/webbing/inteq, +/turf/open/floor/plasteel/dark, /area/ship/bridge) "YC" = ( /obj/structure/table, @@ -7540,15 +7536,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/airless, /area/ship/maintenance/starboard) -"YR" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/light_switch{ - pixel_y = 22 - }, -/turf/open/floor/carpet/orange, -/area/ship/bridge) "YU" = ( /obj/effect/turf_decal/industrial/warning/fulltile, /obj/structure/cable{ @@ -7692,6 +7679,29 @@ }, /turf/open/floor/plasteel/showroomfloor, /area/ship/crew/toilet) +"ZE" = ( +/obj/machinery/atmospherics/pipe/simple/purple/visible, +/obj/effect/turf_decal/industrial/fire{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/sign/warning{ + pixel_x = -25; + pixel_y = 9 + }, +/obj/structure/sign/warning/fire{ + pixel_x = -22; + pixel_y = -4 + }, +/obj/machinery/atmospherics/components/binary/pump/layer2{ + icon_state = "pump_map-1"; + name = "burn chamber exhaust pump"; + piping_layer = 1 + }, +/turf/open/floor/plasteel/tech, +/area/ship/engineering/engine) "ZJ" = ( /obj/machinery/power/shuttle/engine/electric{ dir = 4 @@ -7701,16 +7711,6 @@ }, /turf/open/floor/plating, /area/ship/engineering/engine) -"ZS" = ( -/obj/effect/landmark/start/station_engineer, -/obj/structure/chair/office{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/dark, -/area/ship/engineering) "ZU" = ( /obj/machinery/light/directional/west, /obj/machinery/computer/rdconsole/core{ @@ -7809,7 +7809,7 @@ sw sw ia bM -uq +UG UM lO tb @@ -7826,7 +7826,7 @@ Qt dl pm iA -it +aH WH Pm sw @@ -7847,14 +7847,14 @@ jf ak Uc hO -qq -tH -Yd +Fu +Lo +dw ge -nK -ba -TR -uN +Je +Yp +ZE +rV SZ Bb WL @@ -7871,7 +7871,7 @@ sw "} (5,1,1) = {" sw -Uk +Pw sV sV sV @@ -7881,13 +7881,13 @@ sV AO cj ek -Mr -ZS -Ao +jS +AZ +gV ge -oj -wq -LD +Pr +kU +at Ai Io jT @@ -7900,7 +7900,7 @@ ao ao ao ao -Uk +Pw sw "} (6,1,1) = {" @@ -7915,25 +7915,25 @@ sV HB MS yL -uA -kQ -wV -qV -fb -gH -dY -mG -DJ +RF +TC +Bm +Ma +Gr +QZ +lS +RC +Jo Qu su -yQ +qr vX em jH -QO +yc ms -ra -dx +xz +ls ao vp "} @@ -7944,7 +7944,7 @@ mz EC My LT -Mo +zz sV Sj Qq @@ -7953,10 +7953,10 @@ ud xo pU pU -Xf +Pk pU -oh -Qe +VL +cz pU JU bA @@ -7968,7 +7968,7 @@ tu ap ag Oi -fd +xl ao "} (8,1,1) = {" @@ -7986,10 +7986,10 @@ GY Cs tG cA -iJ -tw -wG -xg +PL +TD +vv +SD LJ rk hl @@ -8002,7 +8002,7 @@ qc wx cT Oi -oX +Gz ao "} (9,1,1) = {" @@ -8020,7 +8020,7 @@ iE Xn gP qh -xP +MX gG Fo Dg @@ -8036,7 +8036,7 @@ zt vM wb Oi -kE +an ao "} (10,1,1) = {" @@ -8052,7 +8052,7 @@ sW sW sW zK -hW +xn xI xI xI @@ -8068,14 +8068,14 @@ NK ao yr tO -Xu -xA +LV +bF ao vp "} (11,1,1) = {" sw -Uk +Pw sV sV sW @@ -8091,8 +8091,8 @@ xI Yt IJ Ug -mD -uw +pD +sT Mf NN xI @@ -8104,7 +8104,7 @@ sc jW ao ao -Uk +Pw MV "} (12,1,1) = {" @@ -8148,7 +8148,7 @@ sw sw sW mL -cO +RL ow WC GR @@ -8219,7 +8219,7 @@ Um Nd dZ Vj -Rj +hQ Bv hG kW @@ -8259,15 +8259,15 @@ iN yo xI hc -oE -CI +vn +Gx wy NY yz vT xI rc -iz +cD hT wD ot @@ -8338,7 +8338,7 @@ Ui Fp Gm zo -UX +NC hT sw og @@ -8371,8 +8371,8 @@ xD xc mi ce -Ob -DA +Xs +He hT sw sw @@ -8385,7 +8385,7 @@ sw sw JT Bv -Mj +fY zV rj mX @@ -8424,22 +8424,22 @@ aM Bv mX no -Nr +Yz pf mX uv lB xf KF -Oz +BS bX hT sq Rg Hq -dM +sM bI -Tu +ug Hq sw sw @@ -8457,7 +8457,7 @@ lC Ks IT mX -YR +oT Hp jw Lc @@ -8473,7 +8473,7 @@ Rg Hq TK Qa -JF +Wp Hq sw sw @@ -8496,7 +8496,7 @@ zh jc Lc uO -fp +gF nY ua MW @@ -8525,11 +8525,11 @@ lC ae bU mX -Yw +RW WR Tj mX -oC +oi nh iy qB @@ -8541,7 +8541,7 @@ Kz Hq ey Kd -nc +XV Hq sw sw @@ -8557,9 +8557,9 @@ sw sw lC wE -vc +qW mX -Re +ON qM cf Lc @@ -8631,19 +8631,19 @@ lQ Wz os mX -NJ +zu sa up Ya OD -Ey +Nj hT iN Rg Hq -Yn +Ve AC -th +oo Hq sw sw @@ -8711,8 +8711,8 @@ Rg mK cR rJ -Yf -Yj +PY +Ir xT Wf sw @@ -8729,9 +8729,9 @@ AA wc Jz xj -Kh +FV CK -Wu +cC xj yl XJ @@ -8745,7 +8745,7 @@ Rg oV Hh pk -Ce +Lm eN Dd mK @@ -8797,7 +8797,7 @@ lt Ga ta xj -Kr +Cu dk yj xj @@ -8811,11 +8811,11 @@ hT oW fg mK -Kc +kM Jq MK vP -bi +ml mK sw sw @@ -8825,7 +8825,7 @@ sw sw sw sw -Uk +Pw yp jj Gl @@ -8838,7 +8838,7 @@ xj sw sw sw -tV +AB sw sw uI @@ -8850,7 +8850,7 @@ as QR WG mK -Uk +Pw sw sw sw @@ -8861,7 +8861,7 @@ sw sw sw yp -sb +Bz lM yp yp @@ -8876,7 +8876,7 @@ sw sw sw uI -tt +Gu Uq uI uI @@ -9440,7 +9440,7 @@ sw sw sw sw -Uk +Pw Pp fN Pp @@ -9459,7 +9459,7 @@ Gq If YZ fK -Uk +Pw sw sw sw @@ -9545,7 +9545,7 @@ sw sw sw sw -Xc +jd sw sw sw diff --git a/_maps/shuttles/shiptest/nanotrasen_osprey.dmm b/_maps/shuttles/shiptest/nanotrasen_osprey.dmm index 3ca31351d1d5..7d9be9ebbdb2 100644 --- a/_maps/shuttles/shiptest/nanotrasen_osprey.dmm +++ b/_maps/shuttles/shiptest/nanotrasen_osprey.dmm @@ -6084,7 +6084,6 @@ /obj/effect/turf_decal/corner/transparent/neutral{ dir = 4 }, -/obj/machinery/light/dim/directional/north, /turf/open/floor/plasteel, /area/ship/hallway/central) "NH" = ( @@ -6291,7 +6290,7 @@ sortTypes = list(7,8,15,29,30); tag = "Command" }, -/obj/structure/extinguisher_cabinet/directional/north, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/plasteel, /area/ship/hallway/central) "Pa" = ( diff --git a/_maps/shuttles/shiptest/nanotrasen_skipper.dmm b/_maps/shuttles/shiptest/nanotrasen_skipper.dmm index a6e6242199dd..d86fcc6cfae9 100644 --- a/_maps/shuttles/shiptest/nanotrasen_skipper.dmm +++ b/_maps/shuttles/shiptest/nanotrasen_skipper.dmm @@ -61,12 +61,11 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/light/directional/south, /obj/machinery/button/door{ dir = 1; id = "coolingshutdown"; name = "Shutdown Cooling"; - pixel_y = -25 + pixel_y = -22 }, /obj/machinery/atmospherics/components/binary/pump{ dir = 4 @@ -2560,6 +2559,16 @@ }, /turf/open/floor/plating, /area/ship/cargo) +"uM" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4 + }, +/obj/machinery/light_switch{ + pixel_y = 21; + pixel_x = 7 + }, +/turf/open/floor/plating, +/area/ship/engineering) "uQ" = ( /obj/effect/turf_decal/corner/opaque/yellow/border{ dir = 4 @@ -3694,6 +3703,15 @@ }, /turf/open/floor/plasteel/tech/techmaint, /area/ship/medical) +"Gh" = ( +/obj/effect/turf_decal/industrial/warning, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/cyan/visible, +/obj/machinery/light/directional/south, +/turf/open/floor/engine, +/area/ship/engineering/engine) "Gi" = ( /obj/structure/cable{ icon_state = "1-2" @@ -4241,6 +4259,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 8 }, +/obj/machinery/light/broken/directional/north, /turf/open/floor/engine, /area/ship/engineering/engine) "Lz" = ( @@ -5088,11 +5107,6 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 25; - pixel_y = 25 - }, /obj/structure/catwalk/over, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering) @@ -5300,7 +5314,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/light/broken/directional/north, /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable{ icon_state = "0-4" @@ -5984,7 +5997,7 @@ MV sK AG Jm -yG +uM yG we sD @@ -6143,7 +6156,7 @@ Lv Yj fD MP -mA +Gh IV fg fz diff --git a/_maps/shuttles/shiptest/syndicate_aegis.dmm b/_maps/shuttles/shiptest/syndicate_aegis.dmm index c5bdfc5c30ef..57f01d107537 100644 --- a/_maps/shuttles/shiptest/syndicate_aegis.dmm +++ b/_maps/shuttles/shiptest/syndicate_aegis.dmm @@ -786,7 +786,8 @@ "fY" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/hatch{ - name = "Bathroom" + name = "Bathroom"; + dir = 4 }, /obj/effect/turf_decal/techfloor/hole/right, /obj/effect/turf_decal/techfloor/hole, @@ -2717,6 +2718,7 @@ }, /obj/item/clothing/under/rank/civilian/janitor/custodian/skirt, /obj/item/clothing/under/rank/civilian/janitor/custodian, +/obj/machinery/light/small/directional/south, /turf/open/floor/carpet/red, /area/ship/crew/janitor) "zM" = ( @@ -2936,6 +2938,7 @@ "CG" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/machinery/light/small/directional/west, /turf/open/floor/plasteel/tech, /area/ship/crew/janitor) "CM" = ( @@ -4291,7 +4294,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 }, -/obj/machinery/light/small/directional/south, /obj/item/radio/intercom/directional/south, /turf/open/floor/plasteel/tech, /area/ship/crew/janitor) @@ -4962,10 +4964,6 @@ /area/ship/engineering) "WC" = ( /obj/structure/chair/sofa/left, -/obj/item/radio/intercom/directional/north{ - pixel_x = 4; - pixel_y = 24 - }, /obj/machinery/light_switch{ pixel_x = -10; pixel_y = 26 @@ -4973,6 +4971,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/item/radio/intercom/directional/north{ + pixel_y = 31; + pixel_x = 5 + }, /turf/open/floor/carpet/red, /area/ship/crew/canteen) "WE" = ( @@ -5257,7 +5259,7 @@ id = "cargo_ageis"; name = "cargobay doors"; pixel_x = 6; - pixel_y = 27 + pixel_y = 22 }, /obj/effect/decal/cleanable/glass, /obj/effect/turf_decal/corner_techfloor_grid/diagonal, @@ -5265,7 +5267,7 @@ /obj/machinery/button/shieldwallgen{ id = "aegis_holo"; pixel_x = -6; - pixel_y = 26 + pixel_y = 21 }, /obj/structure/cable/yellow{ icon_state = "2-8" @@ -6471,3 +6473,37 @@ wk wk wk "} +(33,1,1) = {" +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +"} diff --git a/_maps/shuttles/shiptest/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/shiptest/syndicate_cybersun_kansatsu.dmm index 7503a97e4b2a..7fd8d6168389 100644 --- a/_maps/shuttles/shiptest/syndicate_cybersun_kansatsu.dmm +++ b/_maps/shuttles/shiptest/syndicate_cybersun_kansatsu.dmm @@ -1745,7 +1745,7 @@ /obj/item/storage/belt/utility/full, /obj/item/clothing/glasses/welding, /obj/item/clothing/glasses/welding, -/obj/structure/extinguisher_cabinet/directional/north, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/plating, /area/ship/engineering) "UZ" = ( diff --git a/_maps/shuttles/shiptest/syndicate_gorlex_hyena.dmm b/_maps/shuttles/shiptest/syndicate_gorlex_hyena.dmm index 169d03c58cf0..1ffd98ce8669 100644 --- a/_maps/shuttles/shiptest/syndicate_gorlex_hyena.dmm +++ b/_maps/shuttles/shiptest/syndicate_gorlex_hyena.dmm @@ -239,6 +239,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/dark, /area/ship/crew) +"ej" = ( +/obj/machinery/porta_turret/ship/ballistic, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/crew/dorm) "el" = ( /obj/effect/turf_decal/industrial/outline, /obj/machinery/suit_storage_unit/inherit/industrial{ @@ -259,6 +263,10 @@ }, /turf/open/floor/plasteel/tech/grid, /area/ship/maintenance/port) +"fr" = ( +/obj/machinery/porta_turret/ship/ballistic, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/maintenance/starboard) "fv" = ( /obj/structure/closet/secure_closet{ anchored = 1; @@ -503,10 +511,6 @@ }, /turf/open/floor/plasteel/mono/dark, /area/ship/cargo) -"iG" = ( -/obj/machinery/porta_turret/ship/ballistic, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/maintenance/starboard) "iI" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/trimline/opaque/red/filled/warning, @@ -680,10 +684,6 @@ /obj/effect/landmark/start/captain, /turf/open/floor/carpet/black, /area/ship/bridge) -"mm" = ( -/obj/machinery/porta_turret/ship/ballistic, -/turf/closed/wall/mineral/plastitanium, -/area/ship/bridge) "mL" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/maintenance/fore) @@ -703,10 +703,6 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/carpet/black, /area/ship/bridge) -"nu" = ( -/obj/machinery/porta_turret/ship/ballistic, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/crew/dorm) "nx" = ( /obj/machinery/button/door{ id = "wreckerarmory"; @@ -1056,21 +1052,6 @@ }, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) -"sH" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/turretid/lethal{ - pixel_y = -24 - }, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) "sR" = ( /obj/machinery/door/airlock/grunge{ dir = 8; @@ -1236,10 +1217,6 @@ }, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) -"uP" = ( -/obj/machinery/porta_turret/ship/ballistic, -/turf/closed/wall/mineral/plastitanium, -/area/ship/maintenance/fore) "vi" = ( /obj/structure/table, /obj/item/toy/cards/deck/syndicate{ @@ -1325,6 +1302,21 @@ /obj/effect/turf_decal/industrial/outline, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) +"wO" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/turretid/lethal{ + pixel_y = -24 + }, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) "wP" = ( /obj/effect/turf_decal/industrial/outline, /turf/open/floor/plasteel/mono/dark, @@ -1509,27 +1501,6 @@ }, /turf/open/floor/plasteel/tech/grid, /area/ship/maintenance/port) -"zY" = ( -/obj/effect/turf_decal/industrial/outline, -/obj/structure/closet/secure_closet{ - anchored = 1; - icon_state = "mining"; - name = "wrecker's locker"; - req_access = list(48) - }, -/obj/item/clothing/shoes/workboots/mining, -/obj/item/clothing/under/syndicate/gorlex, -/obj/item/clothing/gloves/explorer, -/obj/item/clothing/accessory/armband/cargo, -/obj/item/storage/belt/mining, -/obj/item/clothing/glasses/meson, -/obj/item/clothing/glasses/welding, -/obj/item/clothing/head/hardhat/orange, -/obj/item/clothing/head/soft/grey, -/obj/machinery/firealarm/directional/south, -/obj/machinery/light/small/directional/north, -/turf/open/floor/plasteel/tech/grid, -/area/ship/storage) "zZ" = ( /obj/structure/cable{ icon_state = "0-4" @@ -1685,6 +1656,10 @@ }, /turf/open/floor/mineral/plastitanium, /area/ship/crew/dorm) +"CP" = ( +/obj/machinery/porta_turret/ship/ballistic, +/turf/closed/wall/mineral/plastitanium, +/area/ship/maintenance/fore) "CW" = ( /turf/closed/wall/mineral/plastitanium, /area/ship/maintenance/starboard) @@ -1837,6 +1812,10 @@ }, /turf/template_noop, /area/template_noop) +"FL" = ( +/obj/machinery/porta_turret/ship/ballistic, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/storage) "FQ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/dust, @@ -1854,6 +1833,27 @@ /obj/effect/turf_decal/industrial/warning/fulltile, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) +"Gt" = ( +/obj/effect/turf_decal/industrial/outline, +/obj/structure/closet/secure_closet{ + anchored = 1; + icon_state = "mining"; + name = "wrecker's locker"; + req_access = list(48) + }, +/obj/item/clothing/shoes/workboots/mining, +/obj/item/clothing/under/syndicate/gorlex, +/obj/item/clothing/gloves/explorer, +/obj/item/clothing/accessory/armband/cargo, +/obj/item/storage/belt/mining, +/obj/item/clothing/glasses/meson, +/obj/item/clothing/glasses/welding, +/obj/item/clothing/head/hardhat/orange, +/obj/item/clothing/head/soft/grey, +/obj/machinery/light/small/directional/north, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/plasteel/tech/grid, +/area/ship/storage) "Gw" = ( /obj/machinery/atmospherics/components/unary/tank/air{ dir = 1; @@ -2033,10 +2033,6 @@ "JL" = ( /turf/closed/wall/mineral/plastitanium, /area/ship/maintenance/port) -"JO" = ( -/obj/machinery/porta_turret/ship/ballistic, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/maintenance/port) "JP" = ( /obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, /turf/open/floor/plating, @@ -2235,13 +2231,6 @@ /obj/effect/turf_decal/industrial/fire, /turf/open/floor/plasteel/tech, /area/ship/maintenance/port) -"Ln" = ( -/obj/structure/closet/emcloset/wall{ - pixel_y = 28 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/mono/dark, -/area/ship/cargo) "Lv" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -2626,10 +2615,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/ship/storage) -"Rn" = ( -/obj/machinery/porta_turret/ship/ballistic, -/turf/closed/wall/mineral/plastitanium, -/area/ship/hallway/central) "Ru" = ( /obj/structure/sign/warning/vacuum/external, /turf/closed/wall/mineral/plastitanium/nodiagonal, @@ -2734,6 +2719,10 @@ }, /turf/open/floor/plasteel/tech/techmaint, /area/ship/maintenance/port) +"SY" = ( +/obj/machinery/porta_turret/ship/ballistic, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/maintenance/port) "Tg" = ( /obj/effect/turf_decal/industrial/warning{ dir = 4 @@ -2755,6 +2744,13 @@ }, /turf/open/floor/plating, /area/ship/maintenance/starboard) +"TE" = ( +/obj/structure/closet/emcloset/wall{ + pixel_y = 28 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/mono/dark, +/area/ship/cargo) "TR" = ( /obj/structure/curtain/cloth/fancy{ name = "blood-red curtains" @@ -2882,13 +2878,13 @@ }, /turf/open/floor/plating, /area/ship/maintenance/fore) +"VE" = ( +/obj/machinery/porta_turret/ship/ballistic, +/turf/closed/wall/mineral/plastitanium, +/area/ship/bridge) "VG" = ( /turf/open/floor/engine/hull, /area/ship/external) -"VH" = ( -/obj/machinery/porta_turret/ship/ballistic, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/storage) "VQ" = ( /obj/effect/turf_decal/industrial/outline, /obj/structure/sign/poster/contraband/random{ @@ -3027,6 +3023,10 @@ }, /turf/open/floor/plasteel/tech, /area/ship/crew) +"WT" = ( +/obj/machinery/porta_turret/ship/ballistic, +/turf/closed/wall/mineral/plastitanium, +/area/ship/hallway/central) "Xj" = ( /obj/effect/turf_decal/borderfloor{ dir = 4 @@ -3263,7 +3263,7 @@ sE "} (2,1,1) = {" nn -JO +SY ir PL SP @@ -3280,7 +3280,7 @@ sE dr kr iQ -iG +fr "} (3,1,1) = {" nn @@ -3313,7 +3313,7 @@ iT iT iT jt -VH +FL jI cH jI @@ -3396,7 +3396,7 @@ uq La Gw iT -zY +Gt qO xx rF @@ -3530,13 +3530,13 @@ UX GV GV GV -nu +ej nn Zb "} (15,1,1) = {" nn -Rn +WT cs cs MO @@ -3687,9 +3687,9 @@ En no KA WN -sH +wO Ap -Ln +TE hT PT FQ @@ -3788,13 +3788,13 @@ mL "} (27,1,1) = {" nn -mm +VE Ap Jv uO VC Ap -mm +VE nn nn nn @@ -3826,5 +3826,5 @@ nn nn nn oO -uP +CP "}