diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index b249d6106029a..90c3d558498d1 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -8173,7 +8173,7 @@ use_power = 0 }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "aLU" = ( /obj/machinery/chem_master/condimaster{ desc = "Looks like a knock-off chem-master. Perhaps useful for separating liquids when mixing drinks precisely. Also dispenses condiments."; @@ -9295,7 +9295,7 @@ "aQB" = ( /obj/structure/sign/warning/secure_area/directional/east, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "aQC" = ( /obj/structure/chair/comfy{ color = "#596479" @@ -22127,7 +22127,7 @@ start_active = 1 }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "bIc" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -22224,7 +22224,7 @@ start_active = 1 }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "bIr" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -22540,7 +22540,7 @@ start_active = 1 }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "bJq" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -22577,7 +22577,7 @@ start_active = 1 }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "bJw" = ( /obj/machinery/camera/directional/north{ c_tag = "MiniSat External South"; @@ -22585,7 +22585,7 @@ start_active = 1 }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "bJx" = ( /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/blue{ @@ -22770,7 +22770,7 @@ dir = 6 }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "bKt" = ( /obj/structure/table, /obj/item/stock_parts/micro_laser, @@ -23022,7 +23022,7 @@ dir = 4 }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "bLo" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 5 @@ -23035,7 +23035,7 @@ dir = 10 }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "bLq" = ( /turf/closed/indestructible/riveted{ desc = "A wall impregnated with Fixium, able to withstand massive explosions with ease"; @@ -23084,7 +23084,7 @@ "bLw" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "bLx" = ( /obj/structure/table, /obj/item/stock_parts/subspace/transmitter, @@ -49420,6 +49420,11 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/fore) +"oDt" = ( +/obj/structure/lattice/catwalk, +/obj/item/stack/cable_coil, +/turf/open/space/basic, +/area/station/solars/port/fore) "oDF" = ( /obj/machinery/light/directional/south, /turf/open/floor/plating, @@ -59434,9 +59439,10 @@ /turf/open/floor/iron/white, /area/station/medical/cryo) "vPR" = ( +/obj/structure/lattice, /obj/item/stack/cable_coil, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "vQK" = ( /obj/structure/closet/secure_closet/engineering_chief, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -62135,6 +62141,12 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/iron, /area/station/hallway/primary/port) +"xLo" = ( +/obj/structure/cable, +/obj/structure/lattice/catwalk, +/obj/item/stack/cable_coil, +/turf/open/space/basic, +/area/station/solars/starboard/fore) "xLr" = ( /turf/open/floor/wood, /area/station/hallway/secondary/service) @@ -77490,7 +77502,7 @@ xzh xzh xzh xzh -vPR +xzh xzh xzh xzh @@ -78091,7 +78103,7 @@ xzh xzh xzh bJc -sUX +vPR atY atY atY @@ -79290,7 +79302,7 @@ ufm ufm ufm ufm -ufm +oDt ufm ufm ufm @@ -79633,7 +79645,7 @@ xzh xzh xzh bJc -vPR +xzh atY atY atY @@ -103185,7 +103197,7 @@ xzh bJc xzh age -aee +xLo age xzh age @@ -111265,7 +111277,7 @@ bJc xzh sUX xzh -vPR +xzh xzh xzh xzh @@ -111523,7 +111535,7 @@ xzh aud jSK aud -sUX +vPR aud jSK aud diff --git a/_maps/map_files/LimaStation/LimaStation.dmm b/_maps/map_files/LimaStation/LimaStation.dmm index e7769f2694949..1a11ec4d4f18b 100644 --- a/_maps/map_files/LimaStation/LimaStation.dmm +++ b/_maps/map_files/LimaStation/LimaStation.dmm @@ -3286,7 +3286,7 @@ network = list("minisat") }, /turf/open/space/openspace, -/area/space) +/area/space/nearstation) "bst" = ( /obj/machinery/firealarm/directional/south, /turf/open/floor/iron, @@ -4583,7 +4583,7 @@ dir = 4 }, /turf/open/space/openspace, -/area/space) +/area/space/nearstation) "bPS" = ( /turf/open/floor/iron/dark/smooth_large, /area/station/ai_monitored/security/armory) @@ -9185,7 +9185,7 @@ "dHq" = ( /obj/structure/sign/warning/electric_shock/directional/south, /turf/open/space/openspace, -/area/space) +/area/space/nearstation) "dHF" = ( /obj/machinery/airalarm/directional/west, /turf/open/openspace, @@ -9321,13 +9321,6 @@ /obj/effect/turf_decal/siding/white, /turf/open/floor/carpet/cyan, /area/station/hallway/primary/starboard) -"dKg" = ( -/obj/item/flashlight/lamp/green{ - pixel_x = -3; - pixel_y = 8 - }, -/turf/open/space/basic, -/area/space) "dKo" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -9955,7 +9948,7 @@ network = list("minisat") }, /turf/open/space/openspace, -/area/space) +/area/space/nearstation) "dZj" = ( /obj/structure/table/wood, /obj/machinery/requests_console{ @@ -19185,7 +19178,7 @@ network = list("minisat") }, /turf/open/space/openspace, -/area/space) +/area/space/nearstation) "htc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -22859,7 +22852,7 @@ start_active = 1 }, /turf/open/space/openspace, -/area/space) +/area/space/nearstation) "iPV" = ( /obj/machinery/light/small/directional/north, /obj/structure/cable, @@ -26797,7 +26790,7 @@ network = list("minisat") }, /turf/open/space/openspace, -/area/space) +/area/space/nearstation) "klc" = ( /obj/structure/table/glass, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -29511,7 +29504,7 @@ }, /obj/structure/sign/warning/electric_shock/directional/south, /turf/open/space/openspace, -/area/space) +/area/space/nearstation) "ljn" = ( /obj/machinery/door/airlock/hydroponics{ name = "Hydroponics Access" @@ -31189,7 +31182,7 @@ network = list("ss13","prison") }, /turf/open/space/openspace, -/area/space) +/area/space/nearstation) "lNY" = ( /obj/structure/chair/stool, /turf/open/floor/iron/grimy, @@ -40144,7 +40137,7 @@ pixel_y = -30 }, /turf/open/space/openspace, -/area/space) +/area/space/nearstation) "pby" = ( /obj/structure/table, /obj/machinery/cell_charger{ @@ -42710,8 +42703,11 @@ /turf/open/floor/plating, /area/station/service/kitchen/abandoned) "pYZ" = ( -/turf/closed/wall, -/area/space) +/obj/item/toy/plush/lizard_plushie/space{ + name = "Hides-On-Station" + }, +/turf/open/space/openspace, +/area/space/nearstation) "pZh" = ( /obj/machinery/button/door{ id = "xenobio6"; @@ -43556,7 +43552,7 @@ network = list("ss13","prison") }, /turf/open/space/openspace, -/area/space) +/area/space/nearstation) "qoJ" = ( /obj/structure/closet/crate, /obj/effect/spawner/random/maintenance/two, @@ -47494,7 +47490,7 @@ "rLf" = ( /obj/structure/sign/warning/electric_shock/directional/north, /turf/open/space/openspace, -/area/space) +/area/space/nearstation) "rLg" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -49808,7 +49804,7 @@ dir = 4 }, /turf/open/space/openspace, -/area/space) +/area/space/nearstation) "sBA" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -54106,7 +54102,7 @@ network = list("ss13","prison") }, /turf/open/space/openspace, -/area/space) +/area/space/nearstation) "udL" = ( /obj/structure/cable, /obj/effect/mapping_helpers/airlock/access/any/security/armory, @@ -55149,9 +55145,6 @@ /obj/structure/cable, /turf/open/floor/iron/sepia, /area/station/service/chapel) -"uyH" = ( -/turf/open/floor/plating, -/area/space) "uyQ" = ( /obj/machinery/hydroponics/constructable, /obj/machinery/light/directional/east, @@ -62553,7 +62546,7 @@ }, /obj/structure/sign/warning/electric_shock/directional/east, /turf/open/space/openspace, -/area/space) +/area/space/nearstation) "xtd" = ( /obj/machinery/light/directional/west, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -79677,7 +79670,7 @@ ymg ymg ymg ymg -dKg +ymg ymg ymg ymg @@ -91926,18 +91919,18 @@ pai pai aYp pAf -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi iIH uaw aRR @@ -92176,25 +92169,25 @@ cNx fDp iIH iIH -uyH -uyH +pbi +pbi pbi pai pan oMB pAf -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi iIH fDp jXw @@ -92432,26 +92425,26 @@ abc owa iIH iIH -uyH -uyH -uyH +pbi +pbi +pbi pbi pbi pbi pbi pAf -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi iIH fKP jXw @@ -92688,27 +92681,27 @@ iIH uaw owa iIH -uyH -uyH -uyH -uyH pbi -uyH +pbi +pbi +pbi +pbi +pbi pbi pbi pAf -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi iIH iIH eJJ @@ -92945,27 +92938,27 @@ kwo owa ezZ iIH -uyH -uyH -uyH -uyH pbi -uyH -uyH pbi -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi iIH fDp jXw @@ -93202,27 +93195,27 @@ iGx fDp ctw fZY -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi iIH fDp rbW @@ -93459,27 +93452,27 @@ iIH iIH fZY iIH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi iIH viA hlk @@ -93716,27 +93709,27 @@ lxb iIH fDp iIH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi iIH uaw jXw @@ -93973,27 +93966,27 @@ rRi iIH owa iIH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi iIH kOk mLJ @@ -94243,14 +94236,14 @@ iIH iIH iIH iIH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi iIH foi ptl @@ -94500,14 +94493,14 @@ kyH wPR fDp iIH -uyH -uyH -uyH -uyH -uyH -uyH -uyH -uyH +pbi +pbi +pbi +pbi +pbi +pbi +pbi +pbi iIH myC vsz @@ -94757,9 +94750,9 @@ iIH jXg iIH iIH -pYZ -pYZ -pYZ +pAf +pAf +pAf jLf jLf xKy @@ -164144,7 +164137,7 @@ bXk uOm kCy ufw -xzK +pYZ ufw okU rAj diff --git a/_maps/map_files/biodome/biodome.dmm b/_maps/map_files/biodome/biodome.dmm index b818c9b45281c..c278473c78151 100644 --- a/_maps/map_files/biodome/biodome.dmm +++ b/_maps/map_files/biodome/biodome.dmm @@ -461,9 +461,6 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/station/engineering/atmos/mix) -"ahZ" = ( -/turf/closed/mineral/random/stationside/asteroid/porus, -/area/space) "aip" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -4581,7 +4578,7 @@ "bDy" = ( /obj/structure/closet/crate/grave, /turf/open/misc/asteroid/airless, -/area/space) +/area/station/asteroid) "bDH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, @@ -12721,10 +12718,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/port/greater) -"ewL" = ( -/obj/structure/sign/warning/pods/directional/north, -/turf/open/space/openspace, -/area/space) "ewM" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -15888,7 +15881,7 @@ network = list("aicore") }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "fzJ" = ( /obj/effect/turf_decal/siding/wood/end{ dir = 8 @@ -16558,11 +16551,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/commons/dorms) -"fME" = ( -/obj/item/food/grown/moonflower, -/obj/structure/flora/bush/flowers_yw, -/turf/open/misc/asteroid/airless, -/area/space) "fMF" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -16606,7 +16594,7 @@ network = list("aicore") }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "fNp" = ( /mob/living/basic/goat{ desc = "Not known for their pleasant disposition. This one seems a bit more hardy to the cold."; @@ -19293,10 +19281,6 @@ }, /turf/open/floor/stone, /area/station/hallway/primary/starboard) -"gHu" = ( -/obj/structure/lattice, -/turf/open/space/openspace, -/area/space) "gHE" = ( /obj/structure/disposalpipe/trunk/multiz{ dir = 4 @@ -27730,7 +27714,7 @@ network = list("ss13","minisat") }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "jNH" = ( /obj/structure/sink/kitchen{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; @@ -28061,7 +28045,7 @@ network = list("minisat") }, /turf/open/space/openspace, -/area/space) +/area/space/nearstation) "jUq" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -29275,9 +29259,6 @@ /obj/effect/turf_decal/trimline/green/filled/warning, /turf/open/floor/carpet/royalblack, /area/station/service/library/lounge) -"kmS" = ( -/turf/open/misc/asteroid/airless, -/area/space) "kmT" = ( /obj/structure/cable/multilayer/connected, /obj/effect/turf_decal/stripes/corner{ @@ -30509,10 +30490,6 @@ }, /turf/open/floor/iron, /area/station/cargo/miningdock) -"kIh" = ( -/obj/structure/lattice/catwalk, -/turf/open/space/basic, -/area/space) "kIj" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/left/directional/west{ @@ -32948,11 +32925,8 @@ /turf/open/floor/iron, /area/station/commons/storage/emergency/starboard) "lxq" = ( -/obj/machinery/camera/directional/west{ - c_tag = "AI Minisat - Chamber Port" - }, /turf/open/space/openspace, -/area/space) +/area/space/nearstation) "lxF" = ( /obj/machinery/light/directional/west, /turf/open/floor/engine, @@ -42889,10 +42863,6 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/primary/aft) -"oNb" = ( -/obj/structure/lattice/catwalk, -/turf/open/space/openspace, -/area/space) "oNc" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/access/all/engineering/external, @@ -48034,7 +48004,7 @@ network = list("aicore") }, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "qFl" = ( /turf/open/misc/beach/coast{ dir = 10 @@ -54299,11 +54269,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/command/bridge) -"sLW" = ( -/obj/structure/lattice/catwalk, -/obj/structure/marker_beacon/olive, -/turf/open/space/openspace, -/area/space) "sLX" = ( /obj/structure/table/wood, /obj/item/folder/blue, @@ -55624,10 +55589,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"tjq" = ( -/obj/structure/lattice, -/turf/open/space/basic, -/area/space) "tjr" = ( /obj/machinery/gulag_teleporter, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -56672,7 +56633,7 @@ /obj/item/grown/novaflower, /obj/structure/flora/bush/flowers_yw, /turf/open/misc/asteroid/airless, -/area/space) +/area/station/asteroid) "tBO" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/iron, @@ -59202,7 +59163,7 @@ "uzJ" = ( /obj/effect/spawner/random/structure/billboard, /turf/open/space/openspace, -/area/space) +/area/space/nearstation) "uzQ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -60148,9 +60109,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron, /area/station/engineering/engine_smes) -"uRb" = ( -/turf/open/floor/iron/herringbone, -/area/space) "uRn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/yellow/opposingcorners, @@ -65909,7 +65867,7 @@ /obj/effect/spawner/random/structure/billboard/nanotrasen, /obj/structure/lattice, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "wNL" = ( /obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/cyclelink_helper, @@ -101042,7 +101000,7 @@ lOH wJn lOH hNy -kmS +rRv hNy hNy hNy @@ -101299,7 +101257,7 @@ wNI wmc jIl lEZ -kmS +rRv hNy hNy hNy @@ -101556,7 +101514,7 @@ uZk gTu lOH tQT -kmS +rRv hNy hNy hNy @@ -101813,8 +101771,8 @@ eKb wpW lOH tQT -kmS -kmS +rRv +rRv hNy hNy cCZ @@ -102070,11 +102028,11 @@ nfx keU lOH tQT -kmS +rRv hNy hNy hNy -kmS +rRv cCZ cCZ cCZ @@ -102327,10 +102285,10 @@ hYS iOb lOH tQT -kmS -kmS -kmS -kmS +rRv +rRv +rRv +rRv cCZ cCZ cCZ @@ -111569,10 +111527,10 @@ cCZ cCZ cCZ cCZ -tjq +vtU cCZ cCZ -tjq +vtU cCZ cCZ hNy @@ -112587,7 +112545,7 @@ cCZ cCZ cCZ cCZ -tjq +vtU cCZ cCZ cCZ @@ -112844,7 +112802,7 @@ cCZ cCZ cCZ cCZ -tjq +vtU cCZ cCZ cCZ @@ -113101,7 +113059,7 @@ hNy cCZ cCZ cCZ -tjq +vtU cCZ cCZ cCZ @@ -113358,7 +113316,7 @@ hNy hNy cCZ cCZ -tjq +vtU cCZ tju tju @@ -144141,15 +144099,15 @@ dUQ dUQ dUQ dUQ -gHu -gHu -gHu -gHu -gHu -gHu -gHu -gHu -gHu +dUQ +dUQ +dUQ +dUQ +dUQ +dUQ +dUQ +dUQ +dUQ dUQ dUQ dUQ @@ -144397,17 +144355,17 @@ qlI qlI qlI qlI -kIh -oNb -sLW -oNb -oNb -sLW -oNb -oNb -sLW -oNb -oNb +jLg +fxf +lSs +fxf +fxf +lSs +fxf +fxf +lSs +fxf +fxf qlI qlI qlI @@ -147475,7 +147433,7 @@ qlI hHc hHc hHc -ewL +hHc hHc qlI fDn @@ -152046,7 +152004,7 @@ hHc hHc hHc hHc -lxq +hHc hHc hHc hHc @@ -158106,7 +158064,7 @@ ukp hHc kQJ hHc -uRb +hHc hHc hHc hHc @@ -168125,7 +168083,7 @@ wov hHc hHc hHc -ahZ +hNy hHc hHc hHc @@ -173917,7 +173875,7 @@ hHc hHc hHc hHc -hHc +lxq pae cLA bzj @@ -174174,7 +174132,7 @@ hHc hHc hHc hHc -hHc +lxq pae jGD bzj @@ -176876,7 +176834,7 @@ hNy hNy hNy rRv -kmS +rRv hHc hHc hHc @@ -186079,9 +186037,9 @@ hHc hHc hHc hHc -ahZ -ahZ -ahZ +hNy +hNy +hNy hHc hHc hHc @@ -186336,10 +186294,10 @@ hHc hHc hHc hHc -ahZ -ahZ -ahZ -ahZ +hNy +hNy +hNy +hNy hHc hHc hHc @@ -186593,10 +186551,10 @@ hHc hHc hHc hHc -ahZ -ahZ -ahZ -ahZ +hNy +hNy +hNy +hNy hHc hHc hHc @@ -186636,7 +186594,7 @@ rRv rRv lgw rRv -gHu +rRv hHc hHc hHc @@ -186851,9 +186809,9 @@ hHc hHc hHc hHc -ahZ -ahZ -ahZ +hNy +hNy +hNy hHc hHc hHc @@ -187108,8 +187066,8 @@ hHc hHc hHc hHc -ahZ -ahZ +hNy +hNy hHc hHc hHc @@ -188135,7 +188093,7 @@ hHc hHc hHc bDy -fME +iyl tBl hNy hNy @@ -188390,7 +188348,7 @@ hHc hHc hHc hHc -fME +iyl bDy hNy hNy @@ -188647,7 +188605,7 @@ hHc hHc hHc hHc -fME +iyl hNy hNy hNy diff --git a/_maps/map_files/moonstation/moonstation.dmm b/_maps/map_files/moonstation/moonstation.dmm index 15810834fb4c8..89b5ad1c354db 100644 --- a/_maps/map_files/moonstation/moonstation.dmm +++ b/_maps/map_files/moonstation/moonstation.dmm @@ -48,8 +48,9 @@ /area/station/security/corrections_officer) "aaZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/effect/spawner/random/maintenance, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "abb" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -186,6 +187,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/sign/poster/random/directional/south, /turf/open/floor/catwalk_floor, /area/station/maintenance/aft) "adz" = ( @@ -196,11 +198,21 @@ /turf/open/floor/iron/dark, /area/station/security/brig) "adB" = ( -/obj/machinery/modular_computer/preset/civilian{ +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/structure/disposalpipe/trunk{ dir = 1 }, +/obj/machinery/light_switch/directional/south, +/obj/machinery/airalarm/directional/east, +/obj/machinery/light/warm/directional/south, /turf/open/floor/iron/dark, -/area/station/engineering/break_room) +/area/station/command/heads_quarters/ce) "adN" = ( /obj/structure/rack, /obj/item/clothing/glasses/meson, @@ -455,7 +467,7 @@ "ahb" = ( /obj/structure/chair/sofa/middle/brown, /turf/open/floor/carpet/orange, -/area/station/engineering/lobby) +/area/station/engineering/break_room) "ahh" = ( /obj/effect/spawner/random/burgerstation/atmos, /obj/effect/decal/cleanable/cobweb, @@ -476,6 +488,15 @@ }, /turf/open/floor/plating, /area/station/cargo/sorting) +"ahy" = ( +/obj/effect/decal/cleanable/dirt/dust, +/mob/living/basic/statue/mannequin/suspicious{ + dir = 1; + name = "mannequin"; + desc = "Who left this here?" + }, +/turf/open/floor/plating, +/area/station/construction) "ahB" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -549,7 +570,7 @@ pixel_y = -40 }, /obj/effect/turf_decal/tile/purple/half/contrasted, -/turf/open/floor/iron/dark/corner, +/turf/open/floor/iron/checker, /area/station/hallway/secondary/exit) "aiD" = ( /obj/machinery/airalarm/directional/west, @@ -724,8 +745,17 @@ /turf/open/floor/iron/grimy, /area/station/service/library) "akt" = ( -/turf/open/floor/iron/dark, -/area/station/engineering/break_room) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/ce) "akv" = ( /obj/structure/stone_tile/surrounding_tile{ dir = 8 @@ -740,17 +770,9 @@ /obj/structure/stone_tile/surrounding_tile, /turf/open/lava/smooth/lava_land_surface, /area/ruin/unpowered/ash_walkers) -"akw" = ( -/obj/structure/chair/office{ - dir = 3 - }, -/obj/effect/landmark/start/telecomms_specialist, -/turf/open/floor/iron/grimy, -/area/station/tcommsat/computer) "akB" = ( /obj/structure/table/wood, /obj/effect/spawner/random/decoration/ornament, -/obj/effect/spawner/random/entertainment/plushie, /obj/structure/cable, /obj/machinery/newscaster/directional/south, /obj/machinery/light/small/directional/south, @@ -768,6 +790,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/sorting/mail/flip, /obj/effect/mapping_helpers/mail_sorting/science/genetics, +/obj/structure/sign/poster/random/directional/west, /turf/open/floor/plating, /area/station/maintenance/aft) "akP" = ( @@ -868,8 +891,11 @@ /turf/open/floor/iron, /area/station/cargo/lobby) "amq" = ( -/turf/open/floor/plating, -/area/station/maintenance/aft) +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ + dir = 8 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/tcommsat/computer) "amt" = ( /turf/open/floor/fakeice/slippery, /area/station/science/xenobiology) @@ -999,12 +1025,18 @@ /turf/open/floor/plating, /area/station/service/abandoned_gambling_den) "aoF" = ( -/obj/structure/sign/departments/exam_room/directional/north, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/plating, -/area/station/maintenance/aft) +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/machinery/button/door/directional/south{ + id = "abandoned_medbay_shutters"; + name = "Abandoned Medbay Shutters Control" + }, +/obj/machinery/chem_master, +/obj/effect/mapping_helpers/broken_machine, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/white/corner{ + dir = 8 + }, +/area/station/medical/abandoned) "aoP" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/machinery/firealarm/directional/west, @@ -1207,16 +1239,11 @@ /turf/open/floor/engine, /area/station/medical/morgue) "arH" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/dark/corner{ +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ dir = 1 }, -/area/station/hallway/primary/starboard) +/turf/open/floor/iron/checker, +/area/station/hallway/primary/central/fore) "arL" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=hall9"; @@ -1258,10 +1285,8 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, /obj/effect/turf_decal/delivery, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/port/aft) "asp" = ( @@ -1296,12 +1321,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/effect/spawner/random/maintenance, -/obj/effect/turf_decal/delivery, -/obj/structure/disposalpipe/junction/flip{ - dir = 1 - }, -/turf/open/floor/plating, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/maintenance, +/turf/open/floor/catwalk_floor, /area/station/maintenance/department/engine) "asM" = ( /obj/machinery/door/airlock/maintenance, @@ -1402,6 +1424,7 @@ dir = 8 }, /obj/effect/landmark/start/scientist, +/obj/effect/turf_decal/tile/purple/diagonal_centre, /turf/open/floor/iron/white, /area/station/science/xenobiology) "atR" = ( @@ -1587,6 +1610,7 @@ /obj/machinery/door/airlock/maintenance_hatch, /obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/any/supply/bit_den, +/obj/machinery/door/firedoor, /turf/open/floor/plating, /area/station/cargo/bitrunning/den) "awh" = ( @@ -1643,9 +1667,13 @@ /turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "awT" = ( -/obj/machinery/holopad, -/turf/open/floor/iron/dark, -/area/station/engineering/break_room) +/obj/effect/spawner/random/maintenance, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "awZ" = ( /obj/effect/turf_decal/tile/purple/half/contrasted, /obj/item/wrench, @@ -1782,7 +1810,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark/corner, +/turf/open/floor/iron/checker, /area/station/hallway/primary/central/fore) "azR" = ( /obj/structure/cable, @@ -1907,11 +1935,11 @@ /turf/open/floor/iron/dark, /area/station/security/brig) "aBy" = ( -/obj/effect/turf_decal/siding/dark_green/corner{ - dir = 1 +/obj/effect/spawner/random/structure/chair_maintenance{ + dir = 4 }, -/turf/open/floor/circuit/green/telecomms/mainframe, -/area/station/tcommsat/server) +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "aBA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -2057,7 +2085,7 @@ dir = 9 }, /turf/open/floor/engine, -/area/station/construction) +/area/station/maintenance/department/engine) "aDB" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ dir = 1 @@ -2432,9 +2460,11 @@ /obj/effect/turf_decal/box/corners{ dir = 8 }, -/obj/effect/turf_decal/caution/stand_clear, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/effect/turf_decal/caution/stand_clear{ + dir = 1 + }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "aHn" = ( @@ -2694,7 +2724,7 @@ }, /obj/effect/turf_decal/delivery, /turf/open/floor/iron, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "aKN" = ( /obj/structure/rack, /obj/effect/spawner/costume/butler, @@ -2776,16 +2806,8 @@ /area/station/maintenance/aft) "aLJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/holopad, /turf/open/floor/wood, -/area/station/engineering/lobby) -"aLK" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, /area/station/engineering/break_room) "aLL" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, @@ -2856,7 +2878,6 @@ dir = 1 }, /obj/machinery/airalarm/directional/north, -/obj/structure/cargo_shelf, /turf/open/floor/iron, /area/station/cargo/storage) "aMX" = ( @@ -2905,7 +2926,7 @@ "aNp" = ( /obj/effect/decal/cleanable/greenglow/filled, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/starboard/aft) "aNx" = ( /obj/structure/fake_stairs/wood/directional/south, /obj/structure/railing{ @@ -2963,10 +2984,17 @@ /turf/open/floor/iron/white, /area/station/science/research) "aOw" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/holopad, +/obj/effect/mapping_helpers/airlock/access/all/engineering/ce, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/obj/effect/landmark/navigate_destination/autoname, +/obj/machinery/door/airlock/ce/glass, +/obj/effect/mapping_helpers/airlock/autoname, /turf/open/floor/iron, -/area/station/engineering/power_station) +/area/station/command/heads_quarters/ce) "aOy" = ( /obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 4 @@ -3133,12 +3161,15 @@ /turf/open/floor/plating, /area/station/maintenance/central) "aQh" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/firedoor, +/obj/structure/table, +/obj/item/paper_bin, +/obj/item/pen, +/obj/machinery/airalarm/directional/west, +/obj/effect/spawner/random/medical/surgery_tool, +/obj/effect/spawner/random/medical/surgery_tool, +/obj/machinery/light/small/directional/west, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/medical/abandoned) "aQl" = ( /obj/structure/transit_tube/crossing, /obj/machinery/light/small/directional/west, @@ -3146,12 +3177,14 @@ /turf/open/floor/plating, /area/station/hallway/primary/starboard) "aQr" = ( -/obj/machinery/airalarm/directional/east, -/obj/effect/turf_decal/stripes/line{ +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/engine, -/area/station/engineering/gravity_generator) +/turf/open/floor/catwalk_floor, +/area/station/maintenance/department/engine) "aQD" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -3204,11 +3237,10 @@ /turf/open/floor/iron/dark/telecomms, /area/station/ai_monitored/turret_protected/ai) "aRl" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/engine, -/area/station/engineering/gravity_generator) +/obj/structure/rack/shelf, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/department/engine) "aRq" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ @@ -3343,6 +3375,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/plastic, /area/station/commons/public_xenoarch) "aSZ" = ( @@ -3557,6 +3590,7 @@ /obj/machinery/computer/camera_advanced/xenobio{ dir = 8 }, +/obj/effect/turf_decal/tile/purple/diagonal_centre, /turf/open/floor/iron/white, /area/station/science/xenobiology) "aVW" = ( @@ -3663,7 +3697,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/iron/dark, /area/station/engineering/main) "aXZ" = ( /obj/structure/stone_tile/surrounding_tile, @@ -3735,6 +3769,14 @@ }, /turf/open/floor/iron, /area/station/cargo/warehouse) +"aYX" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/hallway) "aZn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -3831,6 +3873,12 @@ /obj/effect/spawner/random/bureaucracy/pen, /turf/open/floor/iron/grimy, /area/station/service/library) +"bao" = ( +/obj/structure/bookcase/random, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/sign/poster/random/directional/east, +/turf/open/floor/iron/grimy, +/area/station/service/library/abandoned) "bar" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -3935,7 +3983,7 @@ /obj/effect/turf_decal/stripes/line, /obj/item/radio/intercom/directional/south, /turf/open/floor/engine, -/area/station/construction) +/area/station/maintenance/department/engine) "bby" = ( /obj/effect/turf_decal/sand/plating/volcanic, /turf/open/floor/plating/lavaland_atmos, @@ -4089,7 +4137,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/machinery/camera/autoname/directional/east, -/turf/open/floor/iron/dark/corner, +/turf/open/floor/iron/checker, /area/station/hallway/primary/central/fore) "bex" = ( /obj/machinery/conveyor{ @@ -4218,6 +4266,7 @@ dir = 4 }, /obj/effect/mapping_helpers/broken_floor, +/obj/structure/sign/poster/random/directional/west, /turf/open/floor/iron/dark, /area/station/maintenance/port/aft) "bhp" = ( @@ -4433,11 +4482,10 @@ /turf/open/floor/wood/large, /area/station/commons/lounge) "bku" = ( -/obj/machinery/light/no_nightlight/directional/north, /obj/machinery/light_switch/directional/north, /obj/machinery/vending/coffee, /turf/open/floor/wood, -/area/station/engineering/lobby) +/area/station/engineering/break_room) "bkv" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -4770,6 +4818,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, +/obj/structure/cable/layer3, /turf/open/floor/catwalk_floor/iron_dark, /area/station/engineering/main) "bpi" = ( @@ -5165,10 +5214,10 @@ /turf/open/floor/iron/dark/smooth_large, /area/station/common/wrestling/arena) "bxf" = ( -/obj/structure/cable, /obj/effect/turf_decal/siding/dark{ dir = 1 }, +/obj/structure/cable, /turf/open/floor/plating, /area/station/engineering/supermatter/emitter) "bxp" = ( @@ -5249,7 +5298,7 @@ /obj/effect/mapping_helpers/broken_floor, /obj/machinery/light/small/directional/west, /turf/open/floor/wood, -/area/station/maintenance/console_room) +/area/moonstation/surface/unexplored) "byn" = ( /obj/structure/fluff/tram_rail/electric/anchor, /turf/open/misc/moonstation_sand, @@ -5371,12 +5420,12 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) "bAu" = ( -/obj/effect/landmark/start/station_engineer, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 +/obj/machinery/holopad, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) +/turf/open/floor/carpet/orange, +/area/station/command/heads_quarters/ce) "bAy" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -5417,6 +5466,9 @@ "bAX" = ( /obj/effect/mapping_helpers/broken_floor, /obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/random/structure/chair_maintenance{ + dir = 8 + }, /turf/open/floor/plating, /area/station/maintenance/port/aft) "bAZ" = ( @@ -5447,7 +5499,7 @@ }, /obj/item/radio/intercom/directional/east, /turf/open/floor/carpet/orange, -/area/station/engineering/lobby) +/area/station/engineering/break_room) "bBo" = ( /obj/machinery/firealarm/directional/south, /turf/open/floor/glass/reinforced/scrape_below, @@ -5616,12 +5668,11 @@ /turf/open/floor/wood, /area/station/medical/break_room) "bDy" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/siding/dark{ dir = 1 }, /obj/machinery/airalarm/directional/east, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/checker, /area/station/engineering/storage/tech) "bDE" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ @@ -5632,10 +5683,11 @@ /turf/open/floor/iron/dark/corner, /area/station/engineering/atmos/asteroid) "bDN" = ( -/obj/machinery/suit_storage_unit/engine, -/obj/effect/turf_decal/siding/yellow, -/turf/open/floor/engine, -/area/station/engineering/storage/eva) +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/construction) "bDU" = ( /turf/closed/wall/r_wall/rust, /area/station/maintenance/starboard/aft) @@ -5677,7 +5729,7 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/wood, -/area/station/engineering/lobby) +/area/station/engineering/break_room) "bEx" = ( /obj/structure/table/wood, /obj/item/paper_bin, @@ -5907,9 +5959,14 @@ /turf/open/floor/engine/n2, /area/station/engineering/atmos) "bIn" = ( -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/engine, -/area/station/engineering/gravity_generator) +/obj/structure/cable, +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/engineering/engine_smes) "bIp" = ( /obj/effect/spawner/random/structure/steam_vent, /turf/open/floor/plating, @@ -5950,13 +6007,14 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "bJB" = ( -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/machinery/airalarm/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/turf/open/floor/catwalk_floor, -/area/station/tcommsat/computer) +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "bJH" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -6054,9 +6112,7 @@ /area/station/maintenance/port/aft) "bKL" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/engineering/hallway) "bKP" = ( @@ -6103,6 +6159,16 @@ /obj/structure/training_machine, /turf/open/floor/engine, /area/station/science/auxlab) +"bLy" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/poster/random/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "bLB" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 @@ -6112,12 +6178,9 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "bLI" = ( -/obj/machinery/light/no_nightlight/directional/south, -/obj/structure/chair/sofa/left/brown{ - dir = 1 - }, +/obj/item/kirbyplants/random, /turf/open/floor/carpet/orange, -/area/station/engineering/lobby) +/area/station/engineering/break_room) "bLJ" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -6158,6 +6221,7 @@ /obj/effect/turf_decal/stripes/line, /obj/item/radio/intercom/directional/south, /obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/effect/spawner/random/burgerstation/power, /turf/open/floor/iron/dark, /area/station/engineering/main) "bMF" = ( @@ -6314,7 +6378,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/firedoor, /obj/effect/landmark/navigate_destination/autoname, -/turf/open/floor/iron, +/turf/open/floor/iron/checker, /area/station/engineering/storage/tech) "bPo" = ( /turf/closed/wall, @@ -6442,7 +6506,6 @@ /turf/open/floor/iron/dark, /area/station/maintenance/night_club) "bQG" = ( -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/engine, @@ -6478,14 +6541,14 @@ /turf/open/floor/iron/checker, /area/station/cargo/blacksmith) "bRC" = ( -/obj/structure/cable, /obj/machinery/door/airlock/engineering/glass{ name = "Emitter Room" }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /obj/machinery/door/firedoor, -/turf/open/floor/plating, +/obj/structure/cable, +/turf/open/floor/iron/dark, /area/station/engineering/supermatter/emitter) "bRG" = ( /obj/structure/cable, @@ -6495,7 +6558,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/starboard/aft) "bRH" = ( /obj/item/clothing/glasses/science, /obj/structure/table/glass, @@ -6545,14 +6608,17 @@ /turf/open/floor/engine, /area/station/engineering/supermatter/waste) "bSc" = ( -/obj/structure/table/glass/plasmaglass, -/obj/item/paper/monitorkey, -/obj/item/stamp/head/ce, -/obj/item/spess_knife{ - pixel_y = 3; - pixel_x = -10 +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/all/engineering/ce, +/obj/machinery/door/airlock/maintenance_hatch, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/glass/reinforced/plasma, +/obj/machinery/door/firedoor, +/turf/open/floor/plating, /area/station/command/heads_quarters/ce) "bSf" = ( /obj/structure/window/reinforced/spawner/directional/south, @@ -6640,6 +6706,7 @@ dir = 4 }, /obj/machinery/camera/autoname/engineering/directional/east, +/obj/item/radio/intercom/directional/east, /turf/open/floor/iron, /area/station/engineering/break_room) "bTt" = ( @@ -6755,12 +6822,18 @@ }, /area/station/hallway/primary/aft) "bVu" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 +/obj/machinery/button/door/directional/north{ + id = "Secure Storage"; + name = "Engineering Secure Storage"; + req_access = list("engine_equip") }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, -/area/station/engineering/storage/eva) +/area/station/engineering/main) "bVF" = ( /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ dir = 8 @@ -6843,7 +6916,7 @@ /obj/structure/disposalpipe/segment, /obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, /turf/open/floor/plating, -/area/station/maintenance/port/aft) +/area/station/cargo/blacksmith) "bWY" = ( /obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/o2{ dir = 1 @@ -6873,11 +6946,9 @@ /turf/closed/wall/mineral/wood, /area/station/maintenance/port) "bXC" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/light/warm/directional/south, -/obj/structure/closet/secure_closet/engineering_electrical, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) +/obj/effect/spawner/random/burgerstation/blocking, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "bXH" = ( /obj/machinery/airalarm/directional/west, /obj/machinery/camera/autoname/directional/north{ @@ -7038,7 +7109,7 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /obj/machinery/door/firedoor, /turf/open/floor/plating, -/area/station/engineering/supermatter/waste) +/area/station/maintenance/department/engine) "bZr" = ( /obj/structure/stone_tile/slab, /turf/open/misc/asteroid/basalt/lava_land_surface, @@ -7066,14 +7137,11 @@ /turf/open/floor/iron/dark, /area/station/common/night_club) "bZR" = ( -/obj/structure/disposalpipe/junction/flip{ - dir = 1 - }, -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, -/area/station/engineering/storage) +/area/station/tcommsat/computer) "bZZ" = ( /obj/machinery/door/airlock/external{ name = "External Airlock" @@ -7140,11 +7208,14 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/central/fore) "caS" = ( -/obj/effect/turf_decal/box/corners{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 5 }, -/turf/open/floor/engine, -/area/station/engineering/gravity_generator) +/turf/open/floor/catwalk_floor, +/area/station/maintenance/department/engine) "caT" = ( /obj/structure/railing/wrestling{ dir = 8 @@ -7173,6 +7244,13 @@ target_pressure = 3000 }, /turf/open/floor/catwalk_floor, +/area/station/maintenance/department/engine) +"cbg" = ( +/obj/effect/spawner/random/trash/hobo_squat, +/obj/item/assembly/mousetrap/armed{ + dir = 4 + }, +/turf/open/floor/plating, /area/station/maintenance/aft) "cbi" = ( /obj/effect/decal/cleanable/dirt, @@ -7224,11 +7302,12 @@ /turf/open/floor/iron/white, /area/station/science/xenobiology) "cbT" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/engineering/hallway) +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/construction) "cca" = ( /obj/effect/mapping_helpers/airlock/access/all/command/captain, /obj/machinery/door/airlock/hatch{ @@ -7251,7 +7330,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "cdh" = ( /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 @@ -7495,8 +7574,14 @@ /turf/open/floor/catwalk_floor, /area/station/maintenance/department/engine) "cgg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/iron/dark, -/area/station/engineering/gravity_generator) +/area/station/engineering/storage/eva) "cgw" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 @@ -7510,10 +7595,9 @@ /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/cable, /obj/effect/landmark/event_spawn, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/checker, /area/station/engineering/storage/tech) "cgB" = ( /obj/structure/stone_tile/block, @@ -7674,7 +7758,7 @@ /obj/structure/disposalpipe/junction{ dir = 1 }, -/turf/open/floor/iron, +/turf/open/floor/iron/checker, /area/station/hallway/primary/port) "ciM" = ( /obj/effect/turf_decal/tile/blue/half/contrasted, @@ -7710,6 +7794,11 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/dark, /area/station/security/execution/education) +"cjf" = ( +/obj/structure/cable, +/obj/machinery/power/floodlight, +/turf/open/floor/plating, +/area/station/construction) "cjg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -7850,9 +7939,14 @@ /turf/open/floor/plating, /area/station/service/chapel) "cku" = ( -/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/plating, -/area/station/construction) +/area/station/maintenance/port/aft) "ckx" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -7860,12 +7954,9 @@ /turf/open/floor/iron/large, /area/station/cargo/lobby) "ckB" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, -/obj/effect/landmark/event_spawn, -/obj/structure/disposalpipe/segment, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/tcommsat/computer) +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/construction) "ckQ" = ( /obj/machinery/turretid{ name = "AI Chamber turret control"; @@ -7913,13 +8004,10 @@ /turf/open/floor/iron, /area/station/terminal/lobby) "clb" = ( -/obj/structure/rack/shelf, -/obj/effect/spawner/random/techstorage/tcomms_all, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/iron/dark, -/area/station/engineering/storage/tcomms) +/obj/effect/spawner/random/trash/grille_or_waste, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "cle" = ( /obj/machinery/shower/directional/south, /obj/effect/turf_decal/trimline/dark/filled/warning, @@ -8074,6 +8162,7 @@ /obj/structure/cable, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable/layer3, /turf/open/floor/plating, /area/station/engineering/supermatter/room) "cnT" = ( @@ -8101,12 +8190,14 @@ /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/service/kitchen/coldroom) "cop" = ( -/obj/structure/cable, +/obj/effect/turf_decal/tile/green/half/contrasted, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/firedoor, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/checker, +/area/station/hallway/primary/central/fore) "cou" = ( /turf/closed/wall/rust, /area/station/terminal/interlink) @@ -8316,10 +8407,8 @@ /area/station/medical/surgery) "csp" = ( /obj/structure/extinguisher_cabinet/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/siding/dark, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/checker, /area/station/engineering/storage/tech) "csz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, @@ -8431,7 +8520,7 @@ /area/station/security/prison/shower) "cuB" = ( /obj/structure/rack, -/obj/item/grenade/clusterbuster/metalfoam, +/obj/item/storage/box/smart_metal_foam, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) "cuW" = ( @@ -8440,13 +8529,14 @@ /turf/open/floor/plating, /area/station/commons/vacant_room) "cve" = ( -/obj/machinery/suit_storage_unit/engine, -/obj/effect/turf_decal/siding/yellow{ - dir = 1 - }, -/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/turf/open/floor/engine, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/engineering/storage/eva) "cvg" = ( /obj/effect/spawner/random/trash/janitor_supplies, @@ -8481,7 +8571,9 @@ name = "Cell ???"; req_access = null }, -/obj/structure/chair/stool/bar/directional/east, +/obj/effect/spawner/random/structure/chair_maintenance{ + dir = 4 + }, /turf/open/floor/plating, /area/station/maintenance/abandon_holding_cell) "cwm" = ( @@ -8597,6 +8689,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plating, /area/station/maintenance/port/aft) "cyf" = ( @@ -8672,11 +8767,16 @@ /turf/open/floor/iron/white, /area/station/medical/storage) "czh" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp, -/obj/machinery/newscaster/directional/north, -/turf/open/floor/iron/grimy, -/area/station/tcommsat/computer) +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/checker, +/area/station/hallway/primary/central/aft) "czq" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 @@ -8724,7 +8824,7 @@ }, /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/catwalk_floor, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "cAp" = ( /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron/white, @@ -8740,13 +8840,11 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "cAz" = ( -/obj/machinery/light_switch/directional/east, -/obj/machinery/portable_atmospherics/canister/nitrogen, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/tcommsat/computer) +/obj/structure/rack/shelf, +/obj/effect/spawner/random/techstorage/tcomms_all, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/engineering/storage/tcomms) "cAJ" = ( /obj/item/reagent_containers/cup/glass/coffee{ pixel_x = -3; @@ -8920,10 +9018,11 @@ /turf/open/floor/engine, /area/station/medical/morgue) "cDg" = ( -/obj/machinery/firealarm/directional/south, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron, -/area/station/engineering/power_station) +/obj/structure/closet/wardrobe/engineering_yellow, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/machinery/light/warm/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/storage) "cDk" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -8978,9 +9077,9 @@ /turf/open/floor/plating, /area/station/maintenance/department/prison) "cEO" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted, -/turf/open/floor/iron/dark, -/area/station/engineering/storage/eva) +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/engineering/engine_smes) "cET" = ( /obj/structure/table/glass, /obj/effect/spawner/random/medical/medkit_rare, @@ -9115,7 +9214,7 @@ "cHr" = ( /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, -/area/station/construction) +/area/station/maintenance/department/engine) "cHs" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -9212,15 +9311,25 @@ /obj/effect/turf_decal/sand/plating/volcanic, /turf/open/floor/plating/lavaland_atmos, /area/lavaland/underground) -"cIB" = ( -/obj/effect/turf_decal/siding/dark, -/obj/machinery/computer/message_monitor{ +"cIA" = ( +/obj/machinery/door/airlock/external/glass{ + name = "External Public Airlock" + }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/item/radio/intercom/directional/east, -/obj/item/paper/monitorkey, -/turf/open/floor/iron/grimy, -/area/station/tcommsat/computer) +/turf/open/floor/plating, +/area/station/construction) +"cIB" = ( +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/light/warm/directional/south, +/turf/open/floor/iron, +/area/station/command/heads_quarters/ce) "cIE" = ( /obj/effect/turf_decal/tile/bar/half/contrasted{ dir = 4 @@ -9326,8 +9435,11 @@ /turf/open/floor/iron, /area/station/engineering/atmos/hallway) "cKq" = ( -/obj/effect/mapping_helpers/broken_floor, -/obj/effect/spawner/random/burgerstation/odd, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/closet/toolcloset, /turf/open/floor/plating, /area/station/maintenance/department/engine) "cKs" = ( @@ -9360,6 +9472,10 @@ "cKI" = ( /turf/open/floor/iron/grimy, /area/station/terminal/lobby) +"cKJ" = ( +/obj/effect/spawner/random/trash/graffiti, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) "cLg" = ( /obj/item/grenade/chem_grenade/smart_metal_foam{ pixel_y = 4 @@ -9455,10 +9571,12 @@ /turf/open/floor/iron/dark, /area/station/cargo/drone_bay) "cMo" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/dark, -/area/station/tcommsat/computer) +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/plating, +/area/station/construction) "cMs" = ( /obj/machinery/door/poddoor/shutters{ dir = 1; @@ -9509,7 +9627,7 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "cNa" = ( -/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/trash/graffiti, /turf/open/floor/plating, /area/station/maintenance/evac_maintenance) "cNi" = ( @@ -9567,9 +9685,14 @@ /turf/open/floor/catwalk_floor/flat_white, /area/station/medical/virology) "cNO" = ( -/mob/living/basic/pet/bumbles, -/turf/open/floor/glass/reinforced/scrape_below, -/area/station/service/hydroponics) +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/engine) "cNR" = ( /obj/structure/stone_tile/block/cracked{ dir = 4 @@ -9669,7 +9792,7 @@ /obj/structure/railing{ dir = 1 }, -/turf/open/chasm/moonstation, +/turf/open/openspace/moonstation, /area/moonstation/surface) "cPY" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -9684,15 +9807,15 @@ /turf/open/floor/engine, /area/station/engineering/supermatter/room) "cQp" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/obj/machinery/camera/autoname/engineering/directional/north, -/obj/structure/noticeboard/ce{ - pixel_y = 32 +/obj/item/radio/intercom/directional/west, +/obj/machinery/computer/telecomms/monitor{ + dir = 4; + network = "tcommsat" }, -/turf/open/floor/iron, -/area/station/engineering/hallway) +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/turf/open/floor/iron/grimy, +/area/station/tcommsat/computer) "cQs" = ( /obj/effect/spawner/random/trash/mess, /obj/structure/sign/warning/secure_area/directional/north, @@ -9751,6 +9874,9 @@ /obj/machinery/light/warm/directional/south, /obj/effect/turf_decal/tile/brown/half/contrasted, /obj/structure/sign/poster/official/random/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron, /area/station/cargo/lobby) "cRb" = ( @@ -9778,8 +9904,6 @@ /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 }, -/obj/item/radio/intercom/directional/north, -/obj/structure/cargo_shelf, /turf/open/floor/iron, /area/station/cargo/storage) "cRq" = ( @@ -9787,6 +9911,7 @@ /obj/structure/closet/secure_closet/security, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/camera/autoname/security/directional/south, /turf/open/floor/iron/dark, /area/station/security/checkpoint/arrivals) "cRt" = ( @@ -9796,12 +9921,12 @@ /obj/machinery/power/emitter{ dir = 1 }, -/obj/structure/cable, /obj/item/paper{ default_raw_text = "An air cooled setup on a desert moon sounds fucking awful, but hey it works (as long as you only use one emitter)."; name = "Oh god where is the cooling?"; pixel_y = 2 }, +/obj/structure/cable, /turf/open/floor/plating, /area/station/engineering/supermatter/emitter) "cRu" = ( @@ -10051,9 +10176,6 @@ /turf/open/floor/engine, /area/station/science/auxlab) "cUl" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 6 - }, /obj/structure/disposalpipe/trunk, /obj/machinery/disposal/bin, /turf/open/floor/wood/tile, @@ -10257,9 +10379,7 @@ /turf/open/floor/plating, /area/station/maintenance/aft) "cWK" = ( -/obj/machinery/light/warm/directional/east, -/obj/structure/tank_dispenser, -/obj/effect/turf_decal/delivery, +/obj/effect/spawner/random/burgerstation/liquid, /turf/open/floor/iron/dark, /area/station/engineering/main) "cWP" = ( @@ -10487,7 +10607,7 @@ /obj/effect/spawner/random/burgerstation/loot, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, -/area/station/construction) +/area/station/maintenance/department/engine) "dae" = ( /obj/structure/railing{ dir = 8 @@ -10535,9 +10655,7 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, +/turf/open/floor/iron/checker, /area/station/hallway/primary/starboard) "dba" = ( /obj/effect/turf_decal/tile/blue/half/contrasted, @@ -10596,7 +10714,7 @@ "dcn" = ( /obj/machinery/light/small/directional/west, /turf/open/floor/plating, -/area/station/construction) +/area/station/maintenance/department/engine) "dcq" = ( /obj/structure/extinguisher_cabinet/directional/west, /obj/effect/turf_decal/stripes/white/line, @@ -10660,6 +10778,11 @@ }, /turf/open/floor/wood, /area/station/service/library) +"ddj" = ( +/obj/structure/ladder, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/construction) "ddk" = ( /obj/machinery/door/airlock/external/glass{ name = "External Public Airlock" @@ -10724,9 +10847,7 @@ dir = 4 }, /obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, +/obj/structure/disposalpipe/trunk, /turf/open/floor/engine, /area/station/engineering/main) "dej" = ( @@ -10773,11 +10894,18 @@ }, /area/station/service/chapel) "deR" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ +/obj/machinery/camera/autoname/engineering/directional/west, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/carpet/orange, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron, /area/station/command/heads_quarters/ce) "deS" = ( /obj/machinery/meter, @@ -10900,7 +11028,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "dfV" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -10909,7 +11037,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/station/construction) +/area/station/maintenance/department/engine) "dfW" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/structure/disposalpipe/segment{ @@ -11106,12 +11234,14 @@ /turf/open/floor/glass/reinforced/scrape_below, /area/station/service/library/artgallery) "dik" = ( -/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/engineering/glass, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/engineering/main) +/turf/open/floor/plating, +/area/station/engineering/storage/tcomms) "dis" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 @@ -11154,18 +11284,13 @@ /turf/open/floor/plating, /area/station/command/heads_quarters/hos) "diP" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/obj/structure/closet/secure_closet/engineering_personal, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, -/obj/effect/turf_decal/box/corners{ +/obj/machinery/portable_atmospherics/canister/nitrogen, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 }, -/obj/effect/turf_decal/box/corners, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) +/obj/machinery/airalarm/directional/east, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/tcommsat/computer) "djc" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/machinery/portable_atmospherics/canister/air, @@ -11176,9 +11301,9 @@ /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 8 }, -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/main) "djh" = ( @@ -11401,9 +11526,9 @@ /turf/open/floor/catwalk_floor, /area/station/engineering/asteroid_lobby) "dlQ" = ( -/obj/machinery/holopad, -/turf/open/floor/engine, -/area/station/engineering/main) +/obj/structure/falsewall, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "dlY" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -11472,11 +11597,15 @@ /turf/open/floor/carpet/royalblack, /area/station/service/chapel/office) "dmx" = ( -/obj/structure/showcase/fakeid{ - dir = 1 +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 }, +/obj/structure/sign/departments/telecomms/directional/south, /turf/open/floor/plating, -/area/station/maintenance/console_room) +/area/station/maintenance/port/aft) "dmy" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/south, @@ -11522,7 +11651,7 @@ /obj/effect/spawner/random/burgerstation/atmos, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, -/area/station/construction) +/area/station/maintenance/department/engine) "dny" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 1 @@ -11543,13 +11672,15 @@ /turf/open/floor/iron/dark, /area/station/security/warden) "dnP" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 8 - }, -/obj/item/kirbyplants/random, -/obj/structure/window/reinforced/spawner/directional/east, +/obj/effect/mapping_helpers/airlock/access/all/engineering/engine_equipment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/door/airlock/engineering/glass, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/landmark/navigate_destination/autoname, /turf/open/floor/iron/dark, -/area/station/engineering/gravity_generator) +/area/station/engineering/storage/eva) "dnQ" = ( /obj/structure/chair/office/tactical{ dir = 8 @@ -11911,8 +12042,11 @@ /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "dtY" = ( -/turf/open/floor/iron, -/area/station/engineering/power_station) +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/checker, +/area/station/hallway/primary/aft) "dtZ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -12138,6 +12272,9 @@ /area/station/science/genetics) "dxH" = ( /obj/effect/turf_decal/tile/brown, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/iron, /area/station/cargo/lobby) "dxM" = ( @@ -12340,6 +12477,7 @@ dir = 8 }, /obj/effect/decal/cleanable/greenglow/filled, +/obj/structure/sign/poster/random/directional/north, /turf/open/floor/plating, /area/station/maintenance/aft) "dAc" = ( @@ -12484,9 +12622,7 @@ /obj/effect/turf_decal/tile/holiday/rainbow/half/contrasted{ dir = 8 }, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, +/turf/open/floor/iron/checker, /area/station/hallway/secondary/exit) "dCv" = ( /obj/structure/sign/poster/random/directional/east, @@ -12538,11 +12674,10 @@ /turf/open/floor/iron/dark, /area/station/science/genetics) "dCX" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/tcommsat/computer) +/obj/machinery/power/port_gen/pacman, +/obj/machinery/light/warm/directional/east, +/turf/open/floor/engine, +/area/station/engineering/main) "dDg" = ( /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 1 @@ -12581,7 +12716,9 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/turf/open/floor/iron, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, /area/station/cargo/miningdock) "dDD" = ( /obj/effect/turf_decal/siding/dark{ @@ -12594,8 +12731,6 @@ /obj/effect/turf_decal/siding/dark{ dir = 8 }, -/obj/structure/closet/radiation, -/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/engine, /area/station/engineering/main) "dDS" = ( @@ -12615,14 +12750,13 @@ /turf/open/floor/iron/dark, /area/station/security/checkpoint/arrivals) "dEb" = ( -/obj/structure/chair, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/customs) +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor, +/turf/open/floor/plating, +/area/station/maintenance/evac_maintenance) "dEd" = ( /obj/machinery/light/floor, /turf/open/floor/carpet/blue, @@ -12672,12 +12806,12 @@ }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/engine, -/area/station/construction) +/area/station/maintenance/department/engine) "dEv" = ( /obj/structure/cable, /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, -/area/station/maintenance/console_room) +/area/moonstation/surface/unexplored) "dEM" = ( /obj/effect/turf_decal/tile/holiday/rainbow/half/contrasted{ dir = 1 @@ -13065,12 +13199,11 @@ /area/station/maintenance/central) "dKz" = ( /obj/machinery/firealarm/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/siding/dark{ dir = 4 }, /obj/machinery/camera/autoname/directional/south, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/checker, /area/station/engineering/storage/tech) "dKC" = ( /obj/structure/girder, @@ -13096,6 +13229,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/effect/turf_decal/caution{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/emitter) "dKN" = ( @@ -13120,7 +13256,7 @@ /turf/open/floor/wood, /area/station/service/abandoned_gambling_den) "dKZ" = ( -/turf/open/chasm/moonstation, +/turf/open/openspace/moonstation, /area/moonstation/underground) "dLf" = ( /obj/machinery/atmospherics/pipe/layer_manifold/supply/visible, @@ -13174,11 +13310,15 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/central/aft) "dMh" = ( +/obj/structure/cable, +/obj/effect/spawner/random/burgerstation/power, +/obj/machinery/power/apc/auto_name/directional/west, /obj/effect/turf_decal/stripes/line{ - dir = 1 + dir = 8 }, -/turf/open/floor/iron/dark, -/area/station/engineering/main) +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/construction) "dMn" = ( /obj/machinery/button/door/directional/south{ id = "dorms4"; @@ -13214,6 +13354,7 @@ dir = 8 }, /obj/machinery/airalarm/directional/west, +/obj/structure/cable, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "dMA" = ( @@ -13305,7 +13446,7 @@ dir = 4 }, /turf/open/floor/engine, -/area/station/construction) +/area/station/maintenance/department/engine) "dOf" = ( /obj/effect/turf_decal/siding/yellow{ dir = 8 @@ -13391,9 +13532,7 @@ dir = 8 }, /obj/effect/mapping_helpers/mail_sorting/science/research, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, +/turf/open/floor/iron/checker, /area/station/hallway/secondary/exit) "dQL" = ( /obj/machinery/atmospherics/components/tank/air, @@ -13580,8 +13719,8 @@ /turf/open/floor/circuit/green, /area/station/ai_monitored/turret_protected/ai_upload) "dTj" = ( -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/emitter) "dTo" = ( @@ -13660,7 +13799,7 @@ /obj/structure/window/reinforced/spawner/directional/south, /obj/machinery/atmospherics/pipe/layer_manifold/pink/visible, /turf/open/floor/catwalk_floor, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "dTX" = ( /obj/structure/railing{ dir = 6 @@ -13915,13 +14054,13 @@ /turf/open/floor/iron/white, /area/station/science/ordnance/storage) "dXU" = ( -/obj/machinery/firealarm/directional/north, -/obj/structure/table, -/obj/item/stack/sheet/rglass/fifty, -/obj/item/stack/sheet/glass/fifty, -/obj/item/lightreplacer, -/turf/open/floor/iron/dark, -/area/station/engineering/main) +/obj/structure/cable, +/obj/machinery/door/airlock/engineering/glass, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/structure/cable/layer3, +/turf/open/floor/engine, +/area/station/engineering/engine_smes) "dXZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -14106,7 +14245,7 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) "ebz" = ( -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor/iron, /area/station/engineering/break_room) "ebK" = ( /obj/structure/closet/emcloset, @@ -14119,15 +14258,10 @@ /turf/open/floor/iron/white, /area/station/hallway/secondary/exit) "ebL" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/obj/structure/extinguisher_cabinet/directional/south, -/obj/machinery/camera/autoname/engineering/directional/south{ - dir = 5 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/break_room) +/obj/machinery/holopad, +/obj/structure/cable/layer3, +/turf/open/floor/engine, +/area/station/engineering/engine_smes) "ebN" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -14202,14 +14336,13 @@ /turf/closed/wall/rust, /area/station/ai_monitored/turret_protected/aisat/maint) "ecN" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/junction/yjunction{ - dir = 4 - }, -/turf/open/floor/catwalk_floor/iron, -/area/station/engineering/hallway) +/obj/machinery/door/firedoor, +/obj/effect/landmark/navigate_destination/tcomms, +/obj/machinery/door/airlock/engineering/glass, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, +/turf/open/floor/iron/dark, +/area/station/tcommsat/computer) "ecP" = ( /obj/effect/turf_decal/tile/dark_blue/half/contrasted, /obj/machinery/power/apc/auto_name/directional/south, @@ -14273,6 +14406,9 @@ name = "Research Division Access" }, /obj/effect/mapping_helpers/airlock/unres, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, /turf/open/floor/iron/white, /area/station/science/research) "edE" = ( @@ -14285,7 +14421,7 @@ "edN" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/station/engineering/power_station) +/area/station/engineering/storage) "edT" = ( /obj/effect/turf_decal/siding/wideplating_new/dark{ dir = 4 @@ -14508,7 +14644,7 @@ dir = 8 }, /obj/structure/lattice/catwalk, -/turf/open/chasm/moonstation, +/turf/open/openspace/moonstation, /area/moonstation/surface) "egY" = ( /obj/structure/cable, @@ -14654,7 +14790,7 @@ name = "External Public Airlock" }, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/starboard/aft) "eiH" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -14686,10 +14822,15 @@ /turf/open/floor/plating, /area/station/maintenance/abandon_office) "ejo" = ( -/obj/structure/frame/computer, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, -/area/station/maintenance/abandon_exam) +/obj/structure/table, +/obj/effect/turf_decal/tile/blue, +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_containers/cup/beaker/large, +/obj/item/reagent_containers/dropper, +/turf/open/floor/iron/white/corner{ + dir = 4 + }, +/area/station/medical/abandoned) "eju" = ( /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ dir = 4 @@ -14714,7 +14855,7 @@ }, /obj/effect/spawner/random/trash/grime, /turf/open/floor/wood, -/area/station/maintenance/console_room) +/area/moonstation/surface/unexplored) "ejO" = ( /obj/machinery/firealarm/directional/east, /obj/structure/filingcabinet/employment, @@ -14766,12 +14907,11 @@ /turf/open/floor/iron/dark, /area/station/maintenance/coffin_supply) "eko" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/siding/dark/corner{ dir = 8 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/checker, /area/station/engineering/storage/tech) "ekq" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -14806,13 +14946,14 @@ /turf/open/floor/iron/large, /area/station/hallway/primary/tram/left) "ekz" = ( -/obj/machinery/door/airlock/atmos{ - name = "Atmospherics Storage" +/obj/effect/turf_decal/tile/blue, +/obj/effect/spawner/random/structure/closet_private, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/cafeteria{ + dir = 8 }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/obj/machinery/door/firedoor, -/turf/open/floor/plating, -/area/station/engineering/atmos/storage/gas) +/area/station/medical/abandoned) "ekB" = ( /obj/structure/rack, /obj/effect/turf_decal/tile/yellow/half/contrasted, @@ -14840,11 +14981,13 @@ /turf/open/floor/carpet/royalblack, /area/station/service/chapel/office) "ekL" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/structure/chair/office/light, +/obj/effect/turf_decal/tile/blue, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/white/corner{ dir = 8 }, -/turf/open/floor/iron/dark, -/area/station/engineering/supermatter/emitter) +/area/station/medical/abandoned) "ekN" = ( /obj/machinery/firealarm/directional/east, /obj/machinery/camera/autoname/directional/east{ @@ -14952,22 +15095,14 @@ /turf/open/floor/plating, /area/station/maintenance/port) "elF" = ( -/obj/machinery/door/airlock/engineering/glass{ - name = "Engineering Storage" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/firedoor, -/obj/effect/landmark/navigate_destination/autoname, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark/side{ - dir = 8 +/obj/machinery/computer/telecomms/server{ + dir = 4; + network = "tcommsat" }, -/area/station/engineering/storage/tcomms) +/obj/machinery/light/warm/directional/west, +/obj/structure/sign/departments/telecomms/directional/west, +/turf/open/floor/iron/grimy, +/area/station/tcommsat/computer) "elI" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -15040,15 +15175,13 @@ /turf/open/floor/engine, /area/station/medical/morgue) "emr" = ( -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ - dir = 8 - }, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/hallway) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/start/telecomms_specialist, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/grimy, +/area/station/tcommsat/computer) "emt" = ( /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ dir = 4 @@ -15112,12 +15245,10 @@ /turf/open/floor/iron/dark/telecomms, /area/station/ai_monitored/turret_protected/ai) "env" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/carpet/orange, /area/station/command/heads_quarters/ce) "eny" = ( /obj/effect/turf_decal/stripes/line{ @@ -15242,7 +15373,7 @@ name = "External Public Airlock" }, /turf/open/floor/plating, -/area/station/construction) +/area/station/maintenance/department/engine) "epk" = ( /obj/effect/turf_decal/trimline/dark/filled/warning, /obj/effect/turf_decal/caution/stand_clear{ @@ -15261,11 +15392,14 @@ /turf/open/floor/plating, /area/station/science/genetics) "epx" = ( -/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ - dir = 1 - }, /obj/structure/rack, /obj/item/wrench, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, /turf/open/floor/iron, /area/station/cargo/storage) "epC" = ( @@ -15309,7 +15443,7 @@ dir = 5 }, /turf/open/floor/engine, -/area/station/construction) +/area/station/maintenance/department/engine) "epY" = ( /obj/effect/turf_decal/tile/purple/diagonal_centre, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -15324,7 +15458,9 @@ /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ dir = 8 }, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/junction/flip{ + dir = 1 + }, /turf/open/floor/iron/checker, /area/station/hallway/primary/aft) "eqr" = ( @@ -15338,7 +15474,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/iron/dark/corner, +/turf/open/floor/iron/checker, /area/station/hallway/primary/central/fore) "eqB" = ( /obj/structure/stone_tile/block{ @@ -15352,11 +15488,14 @@ /turf/open/lava/smooth/lava_land_surface, /area/ruin/unpowered/ash_walkers) "eqH" = ( -/obj/structure/cable, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/engineering/power_station) +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/engineering/storage) "eqL" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 @@ -15507,7 +15646,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/plating/foam, /area/station/maintenance/department/public_mining) "esO" = ( /obj/effect/turf_decal/siding/yellow{ @@ -15573,7 +15712,7 @@ dir = 1 }, /obj/structure/lattice/catwalk, -/turf/open/chasm/moonstation, +/turf/open/openspace/moonstation, /area/moonstation/surface) "etH" = ( /obj/structure/railing{ @@ -15945,7 +16084,7 @@ dir = 1 }, /turf/open/floor/catwalk_floor, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "exO" = ( /obj/machinery/atmospherics/components/binary/pump/on/general/visible{ dir = 8; @@ -16019,7 +16158,7 @@ /area/station/engineering/atmos) "ezj" = ( /obj/structure/cable, -/turf/open/floor/catwalk_floor/iron_dark, +/turf/open/floor/iron/dark, /area/station/engineering/main) "ezI" = ( /obj/machinery/portable_atmospherics/scrubber, @@ -16029,14 +16168,12 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos/hallway) "ezL" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark, -/area/station/engineering/gravity_generator) +/area/station/engineering/storage/eva) "ezN" = ( /turf/closed/wall, /area/station/commons/public_mining) @@ -16155,6 +16292,13 @@ /obj/machinery/mining_weather_monitor/directional/west, /turf/open/floor/pod, /area/station/cargo/miningfoundry/event_protected) +"eBC" = ( +/obj/effect/spawner/random/structure/chair_maintenance{ + dir = 1 + }, +/obj/structure/sign/poster/random/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "eBJ" = ( /obj/effect/turf_decal/plaque{ icon_state = "L12" @@ -16243,7 +16387,7 @@ /obj/effect/turf_decal/stripes/line, /obj/structure/sign/warning/vacuum/external/directional/south, /turf/open/floor/engine, -/area/station/construction) +/area/station/maintenance/department/engine) "eCS" = ( /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 4 @@ -16442,6 +16586,9 @@ dir = 8 }, /obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron, /area/station/cargo/lobby) "eFR" = ( @@ -16552,8 +16699,8 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "eHk" = ( -/obj/structure/cable, /obj/machinery/power/smes/engineering, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/emitter) "eHt" = ( @@ -16677,16 +16824,8 @@ /turf/open/floor/iron/dark, /area/station/security/checkpoint/engineering) "eIR" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/mob/living/basic/ant{ - name = "Gravity" - }, -/obj/structure/bed/dogbed{ - name = "Gravity's Bed" - }, -/turf/open/floor/engine, -/area/station/engineering/gravity_generator) +/turf/open/floor/catwalk_floor, +/area/station/maintenance/department/engine) "eIS" = ( /obj/structure/stone_tile/cracked{ dir = 4 @@ -16861,6 +17000,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/machinery/door/firedoor, /turf/open/floor/plating, /area/station/maintenance/port) "eLu" = ( @@ -17046,6 +17186,8 @@ /obj/machinery/camera/autoname/engineering/directional/west{ dir = 10 }, +/obj/machinery/light/warm/directional/west, +/obj/structure/disposalpipe/segment, /turf/open/floor/engine, /area/station/engineering/main) "eOJ" = ( @@ -17057,7 +17199,7 @@ "ePa" = ( /obj/effect/turf_decal/tile/green/half/contrasted, /obj/structure/sign/departments/custodian/directional/south, -/turf/open/floor/iron/dark/corner, +/turf/open/floor/iron/checker, /area/station/hallway/primary/central/aft) "ePl" = ( /obj/structure/table, @@ -17065,9 +17207,9 @@ /turf/open/floor/engine, /area/station/engineering/supermatter/room) "ePm" = ( -/obj/structure/sign/warning/radiation/directional/south, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/dark, -/area/station/engineering/gravity_generator) +/area/station/engineering/storage/eva) "ePo" = ( /obj/effect/turf_decal/siding/dark, /obj/structure/chair/sofa/corp/right, @@ -17216,7 +17358,7 @@ }, /obj/effect/turf_decal/tile/purple/half/contrasted, /obj/structure/disposalpipe/segment, -/turf/open/floor/iron/dark/corner, +/turf/open/floor/iron/checker, /area/station/hallway/secondary/exit) "eRv" = ( /obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ @@ -17227,9 +17369,11 @@ /turf/open/floor/iron/dark, /area/station/security/execution/education) "eRR" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/engineering/main) "eRW" = ( @@ -17665,8 +17809,7 @@ /area/station/hallway/primary/tram/left) "eXq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor/iron, /area/station/engineering/break_room) "eXt" = ( /obj/structure/disposalpipe/segment{ @@ -17785,10 +17928,19 @@ /turf/open/floor/iron/white, /area/station/science/lab) "eZN" = ( -/obj/structure/closet/radiation, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/iron/dark, -/area/station/engineering/gravity_generator) +/obj/effect/turf_decal/siding/yellow, +/obj/structure/table/reinforced, +/obj/item/clothing/shoes/magboots{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/shoes/magboots{ + pixel_x = -4; + pixel_y = 3 + }, +/turf/open/floor/engine, +/area/station/engineering/storage/eva) "eZW" = ( /obj/structure/railing, /obj/structure/showcase/machinery/cloning_pod{ @@ -17936,7 +18088,7 @@ dir = 1 }, /turf/open/floor/catwalk_floor, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "fbm" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -18258,7 +18410,7 @@ /obj/machinery/status_display/evac/directional/east, /obj/machinery/light/small/directional/east, /turf/open/floor/wood, -/area/station/maintenance/console_room) +/area/moonstation/surface/unexplored) "ffn" = ( /turf/open/floor/glass/reinforced/scrape_below, /area/station/command/bridge) @@ -18432,7 +18584,7 @@ "fie" = ( /obj/effect/spawner/random/burgerstation/vending, /turf/open/floor/plating, -/area/station/construction) +/area/station/maintenance/department/engine) "fil" = ( /obj/structure/transport/linear/tram, /obj/structure/fluff/tram_rail/electric, @@ -18493,14 +18645,13 @@ /turf/open/floor/wood, /area/station/command/heads_quarters/nt_rep) "fjw" = ( -/obj/structure/sign/warning/engine_safety/directional/south, -/obj/effect/turf_decal/stripes/line, +/obj/structure/closet/secure_closet/engineering_electrical, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 8 + }, /obj/item/radio/intercom/directional/west, -/obj/item/stack/tile/catwalk_tile/sixty, -/obj/structure/rack, -/obj/item/stack/tile/catwalk_tile/sixty, -/turf/open/floor/iron, -/area/station/engineering/power_station) +/turf/open/floor/iron/dark, +/area/station/engineering/storage) "fjF" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -18608,19 +18759,7 @@ /obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/o2, /obj/machinery/light/small/directional/east, /turf/open/floor/catwalk_floor, -/area/station/maintenance/aft) -"flw" = ( -/obj/effect/mapping_helpers/airlock/access/all/engineering/engine_equipment, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering/glass{ - name = "Engineering Storage" - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) +/area/station/maintenance/department/engine) "flB" = ( /obj/structure/sign/flag/syndicate/directional/east, /obj/effect/spawner/random/burgerstation/loot, @@ -18651,6 +18790,11 @@ }, /turf/open/floor/plating, /area/station/maintenance/fore) +"flR" = ( +/obj/machinery/light/small/directional/south, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/evac_maintenance) "flU" = ( /obj/machinery/atmospherics/components/unary/passive_vent{ dir = 4 @@ -18685,6 +18829,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/break_room) +"fmB" = ( +/obj/structure/cable/layer3, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "fmC" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 @@ -18715,10 +18863,12 @@ /turf/open/floor/iron, /area/station/security/prison/workout) "fmV" = ( -/obj/item/radio/intercom/directional/east, -/obj/machinery/power/port_gen/pacman, -/turf/open/floor/engine, -/area/station/engineering/main) +/obj/effect/spawner/random/trash/grille_or_waste, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "fnc" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/machinery/firealarm/directional/west, @@ -18977,31 +19127,23 @@ /turf/open/floor/iron/dark, /area/station/cargo/drone_bay) "fqJ" = ( -/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, -/obj/structure/cable, -/obj/machinery/door/airlock/engineering/glass{ - name = "Telecommunications" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/tcommsat/computer) +/obj/machinery/meter, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/tlv_no_checks, +/turf/open/floor/catwalk_floor{ + initial_gas_mix = "n2=100;TEMP=80" + }, +/area/station/tcommsat/server) "fqL" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/machinery/newscaster/directional/south, /turf/open/floor/iron/dark/corner, /area/station/hallway/primary/port) "fqU" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) +/obj/machinery/space_heater, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/tcommsat/computer) "fqW" = ( /obj/structure/fence, /turf/open/misc/moonstation_rock, @@ -19209,7 +19351,7 @@ }, /obj/effect/mapping_helpers/airlock/autoname, /turf/open/floor/plating, -/area/station/construction) +/area/station/maintenance/department/engine) "ftJ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -19308,9 +19450,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/spawner/random/decoration/glowstick, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/plating, /area/station/maintenance/port/aft) "fuS" = ( @@ -19448,7 +19587,7 @@ "fwo" = ( /obj/machinery/atmospherics/pipe/layer_manifold/general/visible, /turf/open/floor/catwalk_floor, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "fwq" = ( /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/canister/oxygen, @@ -19638,12 +19777,16 @@ /turf/closed/wall, /area/station/terminal/maintenance) "fyF" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 1 +/obj/effect/turf_decal/stripes/line{ + dir = 9 }, -/obj/machinery/incident_display/delam/directional/north, -/turf/open/floor/iron/dark, -/area/station/engineering/main) +/obj/effect/decal/cleanable/cobweb, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/computer/station_alert{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/engine) "fyH" = ( /obj/effect/turf_decal/siding/dark{ dir = 8 @@ -19664,7 +19807,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/purple/half/contrasted, -/turf/open/floor/iron/dark/corner, +/turf/open/floor/iron/checker, /area/station/hallway/secondary/exit) "fyZ" = ( /obj/effect/turf_decal/siding/dark/corner{ @@ -19866,7 +20009,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/spawner/random/burgerstation/atmos, /turf/open/floor/catwalk_floor, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "fBc" = ( /obj/structure/table/glass, /obj/item/storage/box/beakers, @@ -20030,11 +20173,10 @@ /turf/open/floor/wood, /area/station/command/heads_quarters/blueshield) "fDu" = ( -/obj/effect/mapping_helpers/broken_floor, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/landmark/blobstart, -/turf/open/floor/iron, -/area/station/maintenance/abandon_exam) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/event_spawn, +/turf/open/floor/plating, +/area/station/medical/abandoned) "fDG" = ( /obj/structure/chair/pew/right{ dir = 1 @@ -20142,7 +20284,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "fFs" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -20151,16 +20293,15 @@ /obj/structure/railing{ dir = 8 }, -/turf/open/chasm/moonstation, +/turf/open/openspace/moonstation, /area/moonstation/surface) "fFC" = ( /obj/machinery/light_switch/directional/south, /obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/siding/dark{ dir = 8 }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/checker, /area/station/engineering/storage/tech) "fFH" = ( /obj/effect/decal/cleanable/cobweb, @@ -20173,11 +20314,11 @@ /turf/open/floor/plating/rust/moonstation, /area/moonstation/surface) "fFM" = ( -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/storage/eva) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron, +/area/station/engineering/hallway) "fFY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -20264,7 +20405,7 @@ /obj/structure/table, /obj/effect/spawner/random/maintenance/two, /turf/open/floor/plating, -/area/station/construction) +/area/station/maintenance/department/engine) "fHy" = ( /obj/effect/mapping_helpers/airlock/access/all/security/armory, /obj/machinery/door/airlock/security{ @@ -20310,7 +20451,7 @@ /obj/structure/sign/poster/random/directional/east, /obj/effect/spawner/random/burgerstation/loot, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/starboard/aft) "fHL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/decal/cleanable/dirt/dust, @@ -20319,16 +20460,8 @@ /turf/open/floor/iron/dark, /area/station/maintenance/cult_chapel) "fHR" = ( -/obj/structure/rack/shelf, -/obj/item/stock_parts/subspace/amplifier, -/obj/item/stock_parts/subspace/analyzer, -/obj/item/stock_parts/subspace/ansible, -/obj/item/stock_parts/subspace/crystal, -/obj/item/stock_parts/subspace/filter, -/obj/item/stock_parts/subspace/transmitter, -/obj/item/stock_parts/subspace/treatment, -/turf/open/floor/iron/dark, -/area/station/engineering/storage/tcomms) +/turf/closed/wall/r_wall, +/area/station/tcommsat/computer) "fHZ" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -20385,6 +20518,10 @@ /obj/effect/spawner/random/trash/graffiti, /turf/open/floor/plating, /area/station/maintenance/central) +"fIA" = ( +/obj/structure/ladder, +/turf/open/floor/plating, +/area/station/construction) "fIF" = ( /obj/machinery/atmospherics/components/unary/thermomachine/heater/on, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -20435,7 +20572,7 @@ "fJJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "fJM" = ( /obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, @@ -20491,22 +20628,6 @@ /obj/structure/fluff/arc, /turf/open/floor/iron/dark, /area/station/commons/lounge) -"fKv" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/door/window/right/directional/east{ - name = "Gravity Generator Foyer"; - req_access = list("engineering") - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/gravity_generator) "fKx" = ( /obj/machinery/vending/cigarette, /turf/open/floor/glass/reinforced/scrape_below, @@ -20626,7 +20747,7 @@ /obj/structure/cable, /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, -/area/station/maintenance/console_room) +/area/station/maintenance/department/engine) "fLQ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -20668,17 +20789,10 @@ /turf/open/lava/smooth/lava_land_surface, /area/ruin/unpowered/ash_walkers) "fMh" = ( -/obj/structure/table/glass, -/obj/effect/mapping_helpers/broken_floor, -/obj/item/reagent_containers/blood/random, -/obj/effect/spawner/random/engineering/tool, -/obj/effect/spawner/random/engineering/tool, -/obj/effect/spawner/random/engineering/tool, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/effect/spawner/random/entertainment/drugs, -/turf/open/floor/iron, -/area/station/maintenance/abandon_exam) +/obj/effect/spawner/structure/window/reinforced/tinted, +/obj/effect/mapping_helpers/damaged_window, +/turf/open/floor/plating, +/area/station/maintenance/aft) "fMi" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, @@ -20727,9 +20841,19 @@ /turf/open/floor/engine, /area/station/science/ordnance/burnchamber) "fMW" = ( -/obj/machinery/suit_storage_unit/ce, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/item/radio/intercom/command/directional/north, +/obj/structure/table/reinforced, +/obj/machinery/fax/auto_name, +/obj/machinery/button/door/directional/west{ + id = "ce_officer_shutters"; + name = "Privacy Shutters Control"; + req_access = list("ce") + }, +/obj/machinery/requests_console/auto_name/directional/north, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/announcement, +/obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/command/heads_quarters/ce) "fNf" = ( @@ -20743,9 +20867,8 @@ "fNl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, /obj/structure/disposalpipe/segment, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor/iron, /area/station/engineering/break_room) "fNv" = ( /obj/effect/turf_decal/tile/red/anticorner/contrasted{ @@ -20817,10 +20940,11 @@ /turf/open/floor/iron/dark/corner, /area/station/hallway/secondary/exit) "fNS" = ( -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/abandoned, +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/mapping_helpers/airlock/autoname, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/engineering/main) "fNV" = ( /obj/effect/turf_decal/tile/purple/half/contrasted, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -21097,8 +21221,11 @@ /turf/open/floor/circuit, /area/station/command/secure_bunker) "fRt" = ( -/turf/closed/wall, -/area/station/engineering/lobby) +/obj/machinery/computer/station_alert{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/engine_smes) "fRv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -21343,11 +21470,14 @@ /turf/open/floor/iron/dark, /area/station/science/research) "fVd" = ( -/obj/effect/mapping_helpers/broken_floor, -/obj/item/circuitboard/machine/stasis, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron, -/area/station/maintenance/abandon_exam) +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/aft) "fVk" = ( /obj/structure/table, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -21531,9 +21661,11 @@ /turf/open/floor/wood, /area/station/maintenance/abandon_psych) "fYk" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/turf/open/floor/iron, +/obj/structure/table/glass/plasmaglass, +/obj/item/paper_bin, +/obj/item/pen, +/obj/item/hand_labeler, +/turf/open/floor/glass/reinforced/plasma, /area/station/command/heads_quarters/ce) "fYv" = ( /obj/structure/rack, @@ -21792,14 +21924,10 @@ /turf/open/floor/plating, /area/station/security/prison/work) "gcc" = ( -/obj/machinery/light/warm/directional/north, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/obj/machinery/status_display/evac/directional/north, -/obj/structure/closet/wardrobe/engineering_yellow, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) +/obj/machinery/power/smes/engineering, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/tcommsat/computer) "gcl" = ( /turf/closed/wall, /area/station/command/heads_quarters/nt_rep) @@ -21925,9 +22053,6 @@ /area/station/terminal/lobby) "geA" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /turf/open/floor/plating, /area/station/maintenance/department/chapel) "geQ" = ( @@ -22069,7 +22194,7 @@ /obj/structure/cable, /obj/effect/spawner/random/engineering/tracking_beacon, /obj/structure/disposalpipe/segment, -/turf/open/floor/iron, +/turf/open/floor/iron/checker, /area/station/hallway/primary/port) "ggS" = ( /obj/effect/turf_decal/stripes/line{ @@ -22111,13 +22236,14 @@ /turf/open/floor/carpet, /area/station/service/library) "ghC" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor, -/turf/open/floor/plating, -/area/station/maintenance/aft) +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/white/corner{ + dir = 4 + }, +/area/station/medical/abandoned) "gil" = ( /turf/closed/wall/r_wall/rust, /area/station/ai_monitored/turret_protected/aisat/teleporter) @@ -22269,7 +22395,7 @@ /obj/structure/table/wood/poker, /obj/effect/spawner/random/engineering/toolbox, /turf/open/floor/carpet/orange, -/area/station/engineering/lobby) +/area/station/engineering/break_room) "gks" = ( /obj/structure/disposalpipe/trunk{ dir = 4 @@ -22282,12 +22408,13 @@ /turf/open/floor/iron/dark, /area/station/common/wrestling/arena) "gkv" = ( -/obj/structure/closet/secure_closet/medical2, -/obj/structure/mirror/broken/directional/north, -/obj/effect/spawner/random/medical/medkit, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, -/area/station/maintenance/abandon_exam) +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/structure/chair_flipped{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/medical/abandoned) "gkz" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -22413,6 +22540,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/start/botanist, /turf/open/floor/grass, /area/station/service/hydroponics) "glU" = ( @@ -22495,10 +22623,9 @@ /area/station/ai_monitored/turret_protected/aisat/teleporter) "gnH" = ( /obj/structure/hedge, -/obj/machinery/status_display/ai/directional/west, /obj/structure/extinguisher_cabinet/directional/north, /obj/effect/turf_decal/siding/wood{ - dir = 4 + dir = 6 }, /turf/open/floor/wood/tile, /area/station/hallway/primary/aft) @@ -22527,13 +22654,11 @@ /turf/open/misc/beach/sand, /area/station/common/pool) "gok" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/smart_metal_foam, -/obj/effect/turf_decal/siding/yellow{ - dir = 1 +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/turf/open/floor/engine, -/area/station/engineering/storage/eva) +/turf/open/floor/plating, +/area/station/construction) "goq" = ( /obj/structure/stone_tile/cracked{ dir = 4 @@ -22841,7 +22966,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/starboard/aft) "gtp" = ( /obj/structure/chair/stool/bar/directional/north, /obj/effect/landmark/generic_maintenance_landmark, @@ -22896,15 +23021,14 @@ /turf/open/floor/catwalk_floor/rust/moonstation, /area/station/maintenance/department/public_mining) "gua" = ( -/obj/effect/turf_decal/caution{ - dir = 8 - }, -/obj/machinery/light/small/red/directional/west, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 6 }, -/turf/open/floor/engine, -/area/station/engineering/gravity_generator) +/turf/open/floor/catwalk_floor/iron, +/area/station/engineering/hallway) "gug" = ( /obj/effect/spawner/random/burgerstation/table, /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -22928,14 +23052,12 @@ /turf/open/floor/carpet/blue, /area/station/service/lawoffice) "guy" = ( -/obj/machinery/light/warm/directional/west, -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 +/obj/effect/turf_decal/siding/dark_green/corner{ + dir = 8 }, -/obj/machinery/camera/autoname/directional/west, -/turf/open/floor/iron/dark, -/area/station/engineering/storage/tcomms) +/obj/machinery/telecomms/broadcaster/preset_left, +/turf/open/floor/circuit/green/telecomms/mainframe, +/area/station/tcommsat/server) "guC" = ( /obj/effect/turf_decal/caution/stand_clear{ dir = 8 @@ -22994,7 +23116,7 @@ dir = 8 }, /turf/open/floor/engine, -/area/station/construction) +/area/station/maintenance/department/engine) "gve" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, @@ -23024,7 +23146,7 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/turf/open/floor/iron/dark/corner, +/turf/open/floor/iron/checker, /area/station/hallway/primary/central/fore) "gvt" = ( /obj/structure/table, @@ -23129,10 +23251,9 @@ /turf/open/floor/iron/dark, /area/station/common/night_club) "gwN" = ( -/obj/effect/mapping_helpers/broken_floor, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/plating, /area/station/maintenance/aft) "gwP" = ( @@ -23140,10 +23261,9 @@ /turf/open/floor/engine/n2o, /area/station/engineering/atmos) "gwT" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, -/area/station/maintenance/evac_maintenance) +/area/station/maintenance/starboard) "gxb" = ( /obj/structure/stone_tile{ dir = 4 @@ -23396,12 +23516,12 @@ /turf/open/floor/iron/dark, /area/station/cargo/drone_bay) "gCp" = ( -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/components/binary/pump/on{ name = "Gas to Cold Loop" }, +/obj/structure/cable, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "gCt" = ( @@ -23489,6 +23609,11 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/dark, /area/station/maintenance/disposal/incinerator) +"gDg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable/layer3, +/turf/open/floor/catwalk_floor, +/area/station/engineering/supermatter/room) "gDi" = ( /obj/machinery/atmospherics/components/unary/passive_vent/layer2{ dir = 4 @@ -23635,7 +23760,7 @@ /obj/structure/sign/directions/engineering/directional/west{ pixel_y = -40 }, -/turf/open/floor/iron/dark/corner, +/turf/open/floor/iron/checker, /area/station/hallway/primary/aft) "gFG" = ( /obj/effect/spawner/structure/window/reinforced, @@ -23679,11 +23804,12 @@ /turf/open/floor/plating, /area/station/maintenance/port) "gGh" = ( -/obj/effect/turf_decal/stripes/full, -/obj/machinery/power/smes/engineering, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/engineering/power_station) +/obj/structure/closet/secure_closet/engineering_personal, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/storage) "gGk" = ( /obj/structure/chair/office{ dir = 3 @@ -23786,7 +23912,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/starboard/aft) "gHN" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, @@ -23876,7 +24002,7 @@ "gKc" = ( /obj/structure/sign/poster/random/directional/west, /turf/open/floor/plating, -/area/station/construction) +/area/station/maintenance/department/engine) "gKe" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/window/reinforced/spawner/directional/north, @@ -23894,6 +24020,9 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/iron/dark, /area/station/security/checkpoint/supply) "gKh" = ( @@ -24049,7 +24178,7 @@ dir = 4 }, /obj/structure/cable, -/turf/open/floor/iron/dark/corner, +/turf/open/floor/iron/checker, /area/station/hallway/secondary/exit) "gMu" = ( /obj/structure/disposalpipe/segment, @@ -24161,7 +24290,8 @@ /turf/open/floor/engine, /area/station/engineering/main) "gOA" = ( -/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor, /area/station/engineering/supermatter/room) "gOE" = ( @@ -24169,11 +24299,10 @@ /turf/open/floor/iron, /area/station/cargo/storage) "gOK" = ( +/obj/effect/turf_decal/delivery, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/spawner/random/decoration/glowstick, -/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 10 }, @@ -24244,7 +24373,7 @@ dir = 8 }, /turf/open/floor/catwalk_floor, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "gQb" = ( /mob/living/carbon/human/species/monkey, /obj/structure/flora/bush/flowers_yw/style_random, @@ -24269,9 +24398,26 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/starboard) +"gQA" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/decal/cleanable/cobweb, +/obj/structure/closet/crate/medical, +/obj/effect/spawner/random/medical/memeorgans, +/obj/effect/spawner/random/medical/organs, +/obj/structure/sign/poster/contraband/random/directional/west, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/cafeteria{ + dir = 8 + }, +/area/station/medical/abandoned) "gQF" = ( -/turf/open/floor/engine, -/area/station/engineering/gravity_generator) +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor, +/area/station/maintenance/department/engine) "gQU" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -24460,14 +24606,8 @@ /turf/open/floor/iron/white, /area/station/science/genetics) "gTx" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/engineering/storage) +/turf/closed/wall/r_wall, +/area/station/construction) "gTz" = ( /obj/machinery/light/warm/directional/east, /obj/effect/turf_decal/stripes/line{ @@ -24534,9 +24674,8 @@ /area/station/maintenance/eva_shed) "gUA" = ( /obj/structure/extinguisher_cabinet/directional/west, -/obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/siding/dark, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/checker, /area/station/engineering/storage/tech) "gUB" = ( /obj/structure/cable, @@ -24712,15 +24851,9 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "gWY" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/hallway) +/obj/item/kirbyplants/random, +/turf/open/floor/iron/grimy, +/area/station/tcommsat/computer) "gXa" = ( /obj/effect/turf_decal/tile/dark_blue/half/contrasted, /obj/effect/spawner/random/engineering/tracking_beacon, @@ -24772,9 +24905,14 @@ /turf/open/floor/iron/dark, /area/station/command/cc_dock) "gXs" = ( -/obj/effect/landmark/event_spawn, -/turf/open/floor/iron/dark, -/area/station/engineering/break_room) +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, +/turf/open/floor/iron/checker, +/area/station/hallway/primary/aft) "gXu" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -24795,9 +24933,14 @@ /turf/open/floor/iron, /area/station/commons/fitness/locker_room) "gXL" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/hallway/secondary/exit) "gXU" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -24808,7 +24951,7 @@ /obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/starboard/aft) "gYk" = ( /obj/effect/turf_decal/trimline/dark/filled/warning{ dir = 1 @@ -25247,12 +25390,13 @@ /turf/open/floor/plating, /area/station/science/lab) "hft" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/obj/machinery/photocopier, -/turf/open/floor/iron/dark, -/area/station/engineering/break_room) +/obj/effect/spawner/random/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "hfz" = ( /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 @@ -25332,7 +25476,7 @@ /obj/structure/table/wood/poker, /obj/effect/spawner/random/food_or_drink/cups, /turf/open/floor/carpet/orange, -/area/station/engineering/lobby) +/area/station/engineering/break_room) "hhl" = ( /obj/structure/closet/firecloset, /obj/structure/cable, @@ -25347,7 +25491,7 @@ "hht" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/engine, -/area/station/construction) +/area/station/maintenance/department/engine) "hhu" = ( /obj/structure/table/wood, /obj/item/storage/photo_album/hos, @@ -25376,6 +25520,9 @@ }, /obj/machinery/door/firedoor, /obj/effect/landmark/navigate_destination/autoname, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/security/checkpoint/supply) "hhG" = ( @@ -25580,6 +25727,13 @@ }, /turf/open/floor/plating/rust/moonstation, /area/moonstation/underground) +"hjG" = ( +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance_hatch, +/turf/open/floor/iron/white, +/area/station/science/lab) "hjP" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -25710,6 +25864,8 @@ /area/station/terminal/maintenance/fore) "hkX" = ( /obj/structure/closet/emcloset, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/dorms) "hli" = ( @@ -25741,7 +25897,7 @@ "hlY" = ( /obj/machinery/atmospherics/pipe/layer_manifold/supply/visible, /turf/open/floor/catwalk_floor, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "hmg" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/effect/turf_decal/tile/purple{ @@ -25831,6 +25987,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/structure/cable/layer3, /turf/open/floor/catwalk_floor/iron_dark, /area/station/engineering/main) "hnt" = ( @@ -25867,7 +26024,7 @@ /area/station/command/heads_quarters/blueshield) "hnI" = ( /obj/structure/sign/warning/fire/directional/west, -/turf/open/chasm/moonstation, +/turf/open/openspace/moonstation, /area/moonstation/underground) "hnN" = ( /obj/structure/sink/kitchen/directional/east, @@ -25933,8 +26090,11 @@ /turf/open/floor/plating, /area/station/engineering/storage_shared) "hoY" = ( -/turf/closed/wall, -/area/station/maintenance/console_room) +/obj/effect/turf_decal/stripes/line, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/structure/closet/secure_closet/engineering_electrical, +/turf/open/floor/engine, +/area/station/engineering/engine_smes) "hpb" = ( /obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 8 @@ -25969,17 +26129,13 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/central) "hpp" = ( -/obj/effect/turf_decal/trimline/yellow/filled/warning{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/white/line{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/turf_decal/stripes/line{ + dir = 5 }, /turf/open/floor/iron/dark, -/area/station/engineering/gravity_generator) +/area/station/engineering/storage/eva) "hpH" = ( /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable, @@ -26401,7 +26557,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/random/trash/graffiti, /turf/open/floor/engine, -/area/station/construction) +/area/station/maintenance/department/engine) "hvG" = ( /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 @@ -26462,7 +26618,9 @@ }, /obj/structure/sign/warning/vacuum/external/directional/south, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, +/turf/open/floor/iron/dark/side{ + dir = 10 + }, /area/station/cargo/miningdock) "hwe" = ( /obj/effect/spawner/random/trash/bacteria, @@ -26617,7 +26775,7 @@ pixel_y = 32; pixel_x = -32 }, -/turf/open/floor/iron/dark/corner, +/turf/open/floor/iron/checker, /area/station/hallway/primary/central/fore) "hyh" = ( /obj/effect/turf_decal/siding/wood{ @@ -26652,7 +26810,7 @@ }, /obj/item/radio/intercom/directional/west, /turf/open/floor/catwalk_floor, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "hzf" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -26682,19 +26840,17 @@ /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) "hzx" = ( -/obj/machinery/door/airlock/highsecurity{ - name = "Gravity Generator Room (DEFUNCT)" +/obj/structure/window/reinforced/spawner/directional/west, +/obj/machinery/disposal/bin, +/obj/machinery/firealarm/directional/south, +/obj/machinery/camera/autoname/engineering/directional/south{ + dir = 5 }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/engine_equipment, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/firedoor, -/obj/effect/landmark/navigate_destination/autoname, -/obj/structure/barricade/wooden/crude, -/obj/effect/mapping_helpers/airlock/welded, -/turf/open/floor/iron/dark, -/area/station/engineering/gravity_generator) +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/engineering/storage/eva) "hzH" = ( /obj/effect/turf_decal/tile/dark/half/contrasted{ dir = 4 @@ -26751,20 +26907,13 @@ /turf/open/floor/iron/dark, /area/station/security/eva) "hAw" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 4 - }, -/obj/machinery/door/airlock/engineering/glass{ - name = "Secure Engineering Storage" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/engine_equipment, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/firedoor, -/obj/effect/landmark/navigate_destination/autoname, -/turf/open/floor/iron/dark, -/area/station/engineering/storage/eva) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/duct, +/obj/effect/turf_decal/tile/purple/diagonal_centre, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "hAx" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -26787,11 +26936,13 @@ /turf/open/floor/plating, /area/station/maintenance/aux_eva) "hAD" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 4 +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 }, -/turf/open/floor/iron/dark, -/area/station/engineering/break_room) +/obj/machinery/firealarm/directional/north, +/obj/machinery/camera/autoname/engineering/directional/north, +/turf/open/floor/iron, +/area/station/engineering/hallway) "hAR" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -26811,7 +26962,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/starboard/aft) "hBl" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/carpet/red, @@ -26822,7 +26973,7 @@ /obj/effect/decal/cleanable/cobweb, /obj/effect/spawner/random/burgerstation/atmos, /turf/open/floor/catwalk_floor, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "hBt" = ( /obj/machinery/button/door/directional/east{ id = "engsm"; @@ -26846,6 +26997,12 @@ }, /turf/open/floor/plating, /area/station/command/heads_quarters/rd) +"hBF" = ( +/obj/effect/spawner/random/structure/steam_vent, +/obj/effect/mapping_helpers/broken_floor, +/obj/structure/sign/poster/random/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "hBG" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/turf_decal/siding/dark{ @@ -26929,10 +27086,11 @@ /turf/open/floor/wood/tile, /area/station/hallway/primary/central/aft) "hDh" = ( -/obj/effect/decal/cleanable/greenglow/filled, -/obj/item/relic, -/turf/open/floor/plating, -/area/station/maintenance/aft) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/item/bot_assembly/medbot, +/turf/open/floor/iron, +/area/station/medical/abandoned) "hDi" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 @@ -27137,7 +27295,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "hFd" = ( /obj/effect/turf_decal/stripes/asteroid/line, /obj/effect/turf_decal/sand/plating, @@ -27272,6 +27430,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, +/obj/effect/turf_decal/tile/purple/diagonal_centre, /turf/open/floor/iron/white, /area/station/science/xenobiology) "hGD" = ( @@ -27383,8 +27542,10 @@ /turf/open/floor/iron/white, /area/station/science/cytology) "hIg" = ( -/obj/effect/turf_decal/siding/dark, -/obj/machinery/materials_market, +/obj/effect/turf_decal/siding/dark{ + dir = 10 + }, +/obj/item/kirbyplants/random, /turf/open/floor/engine, /area/station/cargo/storage) "hIh" = ( @@ -27404,8 +27565,10 @@ /turf/open/floor/iron/white, /area/station/science/xenobiology) "hIs" = ( -/obj/structure/sign/poster/random/directional/south, -/obj/effect/spawner/random/burgerstation/loot, +/obj/effect/mapping_helpers/broken_floor, +/obj/item/assembly/mousetrap/armed{ + dir = 4 + }, /turf/open/floor/plating, /area/station/maintenance/aft) "hIv" = ( @@ -27445,7 +27608,7 @@ /obj/effect/mapping_helpers/broken_floor, /obj/effect/spawner/random/trash/grille_or_waste, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/starboard/aft) "hIN" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -27468,11 +27631,11 @@ /turf/open/floor/iron/dark, /area/station/cargo/drone_bay) "hJa" = ( -/obj/effect/turf_decal/siding/dark_green/corner{ - dir = 8 +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 }, -/turf/open/floor/circuit/green/telecomms/mainframe, -/area/station/tcommsat/server) +/turf/open/floor/iron/checker, +/area/station/hallway/primary/central/aft) "hJg" = ( /obj/machinery/light/warm/directional/north, /obj/machinery/airalarm/directional/north, @@ -27530,8 +27693,9 @@ "hJT" = ( /obj/structure/reagent_dispensers/water_cooler, /obj/machinery/incident_display/delam/directional/north, +/obj/machinery/light/no_nightlight/directional/north, /turf/open/floor/wood, -/area/station/engineering/lobby) +/area/station/engineering/break_room) "hJV" = ( /obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, /obj/machinery/atmospherics/components/binary/pump/off/yellow/visible{ @@ -27579,9 +27743,11 @@ /turf/open/floor/plating, /area/station/maintenance/abandon_holding_cell) "hLj" = ( -/obj/structure/sign/departments/telecomms/directional/west, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/grimy, +/area/station/tcommsat/computer) "hLn" = ( /obj/structure/sign/warning/electric_shock/directional/west, /turf/open/misc/moonstation_sand, @@ -27603,11 +27769,10 @@ "hLy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, /obj/structure/disposalpipe/segment{ dir = 5 }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor/iron, /area/station/engineering/break_room) "hLG" = ( /obj/effect/turf_decal/stripes/line, @@ -27631,7 +27796,7 @@ /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/engine, -/area/station/construction) +/area/station/maintenance/department/engine) "hLS" = ( /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 8 @@ -27677,7 +27842,7 @@ "hMD" = ( /obj/structure/closet/emcloset/anchored, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/starboard/aft) "hMX" = ( /obj/structure/sign/warning/no_smoking/directional/east, /obj/effect/turf_decal/siding/yellow{ @@ -27703,7 +27868,7 @@ /area/station/maintenance/port) "hOj" = ( /obj/structure/sign/warning/fire/directional/east, -/turf/open/chasm/moonstation, +/turf/open/openspace/moonstation, /area/moonstation/underground) "hOs" = ( /obj/effect/turf_decal/stripes/line{ @@ -27800,10 +27965,6 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) -"hPO" = ( -/obj/machinery/space_heater, -/turf/open/floor/plating, -/area/station/maintenance/aft) "hPW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -27845,7 +28006,7 @@ /obj/structure/chair/sofa/corner/brown, /obj/machinery/computer/security/telescreen/entertainment/directional/east, /turf/open/floor/carpet/orange, -/area/station/engineering/lobby) +/area/station/engineering/break_room) "hQM" = ( /obj/effect/turf_decal/tile/holiday/rainbow/half/contrasted{ dir = 8 @@ -28138,6 +28299,13 @@ /turf/open/floor/iron/white, /area/station/science/xenobiology) "hUV" = ( +/obj/effect/turf_decal/caution/stand_clear{ + dir = 1 + }, +/obj/effect/turf_decal/box/corners{ + dir = 8 + }, +/obj/effect/turf_decal/box/corners, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/emitter) "hVa" = ( @@ -28263,7 +28431,7 @@ /obj/machinery/light/warm/directional/east, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, -/area/station/construction) +/area/station/maintenance/department/engine) "hXt" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 8 @@ -28528,12 +28696,12 @@ /turf/open/floor/catwalk_floor, /area/station/ai_monitored/turret_protected/aisat/maint) "iav" = ( -/obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ dir = 1 }, +/obj/item/radio/intercom/directional/south, /turf/open/floor/iron, /area/station/engineering/storage_shared) "iaA" = ( @@ -28573,12 +28741,12 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "ibe" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 4 - }, -/obj/machinery/status_display/evac/directional/east, -/turf/open/floor/iron/dark, -/area/station/engineering/storage/eva) +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/station/maintenance/department/engine) "ibj" = ( /obj/machinery/rnd/server/master, /obj/effect/turf_decal/siding/blue{ @@ -28597,15 +28765,14 @@ /area/station/maintenance/department/prison) "ibs" = ( /obj/machinery/door/airlock/maintenance_hatch, -/obj/effect/mapping_helpers/airlock/access/any/engineering/general, -/obj/effect/mapping_helpers/airlock/autoname, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, +/obj/effect/mapping_helpers/airlock/autoname, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, -/area/station/engineering/hallway) +/area/station/tcommsat/computer) "ibA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, @@ -28795,7 +28962,9 @@ /turf/open/floor/iron/dark, /area/station/security/warden) "ieB" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, /turf/open/floor/iron, /area/station/command/heads_quarters/ce) "ieC" = ( @@ -28830,9 +28999,6 @@ name = "Supermatter Engine Room" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/engineering/supermatter/room) "ifR" = ( @@ -29050,11 +29216,12 @@ /turf/open/floor/plating, /area/station/engineering/rbmk2/chamber) "iju" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/light/warm/directional/north, -/obj/effect/turf_decal/siding/yellow, -/turf/open/floor/engine, -/area/station/engineering/storage/eva) +/obj/effect/turf_decal/tile/brown/half/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/lobby) "ijx" = ( /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 4 @@ -29133,7 +29300,7 @@ }, /obj/machinery/meter, /turf/open/floor/plating, -/area/station/construction) +/area/station/maintenance/department/engine) "ikt" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, @@ -29193,9 +29360,13 @@ /turf/open/floor/plating, /area/station/maintenance/abandon_office) "ila" = ( -/obj/effect/spawner/random/structure/steam_vent, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/duct, +/obj/effect/turf_decal/tile/purple/diagonal_centre, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "ilb" = ( /turf/open/floor/engine{ name = "Holodeck Projector Floor" @@ -29278,7 +29449,6 @@ /obj/structure/cable, /obj/machinery/light/small/directional/north, /obj/effect/spawner/random/decoration/ornament, -/obj/effect/spawner/random/entertainment/plushie, /obj/machinery/newscaster/directional/north, /turf/open/floor/carpet/purple, /area/station/commons/dorms/room3) @@ -29381,15 +29551,15 @@ /turf/open/floor/iron/white, /area/station/science/research) "inX" = ( -/obj/structure/closet/secure_closet/engineering_welding, -/turf/open/floor/iron/dark, -/area/station/engineering/gravity_generator) +/obj/machinery/suit_storage_unit/engine, +/obj/effect/turf_decal/siding/yellow, +/obj/machinery/requests_console/auto_name/directional/north, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/effect/mapping_helpers/requests_console/information, +/turf/open/floor/engine, +/area/station/engineering/storage/eva) "ioa" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor/iron, /area/station/engineering/hallway) @@ -29502,6 +29672,14 @@ initial_gas_mix = "n2=100;TEMP=293.15" }, /area/station/maintenance/gag_room) +"iqD" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters{ + id = "abandoned_medbay_shutters"; + name = "Abandoned Medbay Shutters" + }, +/turf/open/floor/iron, +/area/station/medical/abandoned) "iqP" = ( /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 @@ -29531,7 +29709,7 @@ "iqX" = ( /obj/structure/chair/sofa/right/brown, /turf/open/floor/carpet/orange, -/area/station/engineering/lobby) +/area/station/engineering/break_room) "iqZ" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 @@ -29597,7 +29775,7 @@ "ise" = ( /obj/effect/spawner/random/structure/steam_vent, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/starboard/aft) "isj" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 @@ -29696,10 +29874,14 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos/asteroid) "itV" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, -/obj/structure/disposalpipe/segment, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/tcommsat/computer) +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/junction/yjunction{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "itY" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -29758,6 +29940,13 @@ /obj/effect/spawner/random/structure/billboard, /turf/open/misc/moonstation_sand, /area/moonstation/surface) +"iva" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/camera/autoname/engineering/directional/north, +/turf/open/floor/plating, +/area/station/construction) "ivf" = ( /obj/structure/beebox, /obj/machinery/airalarm/directional/west, @@ -29872,6 +30061,12 @@ /obj/effect/turf_decal/siding/dark{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/engine, /area/station/engineering/main) "iwQ" = ( @@ -29927,11 +30122,11 @@ /turf/open/floor/iron/dark, /area/station/security/interrogation) "ixm" = ( -/obj/effect/spawner/random/trash/mess, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/sign/poster/contraband/random/directional/west, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, /turf/open/floor/plating, -/area/station/maintenance/abandon_exam) +/area/station/medical/abandoned) "ixr" = ( /obj/machinery/power/terminal{ dir = 1 @@ -29975,6 +30170,9 @@ /turf/open/floor/iron/dark, /area/station/security/eva) "iyh" = ( +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, /turf/open/floor/iron/white, /area/station/hallway/secondary/exit) "iyl" = ( @@ -30047,7 +30245,7 @@ }, /obj/machinery/airalarm/directional/east, /turf/open/floor/carpet/orange, -/area/station/engineering/lobby) +/area/station/engineering/break_room) "iAj" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -30168,6 +30366,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/light/floor, /turf/open/floor/iron/dark, /area/station/engineering/main) "iBj" = ( @@ -30235,7 +30434,7 @@ /obj/machinery/power/apc/auto_name/directional/north, /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, -/area/station/maintenance/console_room) +/area/moonstation/surface/unexplored) "iCo" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark, @@ -30437,6 +30636,10 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/station/hallway/secondary/exit) +"iEI" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/plating, +/area/station/construction) "iEL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -30695,11 +30898,10 @@ /turf/open/floor/iron/checker, /area/station/hallway/secondary/exit) "iIt" = ( -/obj/structure/sign/warning/radiation/directional/south, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/camera/autoname/engineering/directional/south, -/turf/open/floor/iron, -/area/station/engineering/power_station) +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/storage) "iIy" = ( /obj/effect/turf_decal/tile/brown/half/contrasted, /obj/structure/cable, @@ -30813,7 +31015,7 @@ dir = 4 }, /turf/open/floor/catwalk_floor, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "iKx" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 @@ -30936,6 +31138,10 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/station/cargo/storage) +"iMH" = ( +/obj/structure/cable/multilayer/connected, +/turf/open/floor/catwalk_floor, +/area/station/engineering/supermatter/room) "iMK" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/iron/dark, @@ -31030,7 +31236,7 @@ }, /obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, /turf/open/floor/plating, -/area/station/maintenance/port/aft) +/area/station/cargo/lobby) "iNL" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 5 @@ -31040,8 +31246,9 @@ /area/moonstation/underground) "iNM" = ( /obj/structure/sign/warning/vacuum/external/directional/west, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/starboard/aft) "iNP" = ( /obj/structure/bookcase/random/fiction, /obj/machinery/light/warm/directional/south, @@ -31058,7 +31265,7 @@ /obj/effect/decal/cleanable/cobweb, /obj/effect/spawner/random/burgerstation/power, /turf/open/floor/plating, -/area/station/construction) +/area/station/maintenance/department/engine) "iOj" = ( /mob/living/basic/sloth/paperwork, /turf/open/floor/iron, @@ -31249,9 +31456,9 @@ /turf/open/floor/plating/lavaland_atmos, /area/station/cargo/miningelevators) "iRj" = ( -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/station/maintenance/console_room) +/obj/effect/spawner/random/burgerstation/loot, +/turf/open/floor/catwalk_floor, +/area/station/maintenance/department/engine) "iRk" = ( /obj/structure/railing/corner/end/flip, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -31327,7 +31534,7 @@ }, /obj/structure/railing/corner, /obj/structure/lattice/catwalk, -/turf/open/chasm/moonstation, +/turf/open/openspace/moonstation, /area/moonstation/surface) "iSo" = ( /obj/item/kirbyplants/random/fullysynthetic, @@ -31549,13 +31756,17 @@ /turf/open/floor/wood/parquet, /area/station/command/heads_quarters/hop) "iUA" = ( -/obj/structure/chair/plastic{ +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, +/obj/structure/cable, +/obj/machinery/door/airlock/engineering/glass{ + name = "Telecommunications" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/binary/pump/on/supply/visible, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/tcommsat/computer) "iUD" = ( /obj/effect/turf_decal/siding/yellow{ dir = 9 @@ -31663,9 +31874,11 @@ /turf/open/floor/plating, /area/station/hallway/primary/tram/left) "iVN" = ( -/obj/machinery/door/airlock/maintenance, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) +/obj/structure/disposalpipe/junction/yjunction{ + dir = 4 + }, +/turf/open/misc/moonstation_sand, +/area/moonstation/surface) "iVO" = ( /obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/trimline/dark/filled/warning{ @@ -31688,12 +31901,11 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/central/fore) "iWb" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/siding/dark, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/checker, /area/station/engineering/storage/tech) "iWg" = ( /obj/structure/cable, @@ -31755,8 +31967,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/mail_sorting/engineering/general, -/obj/structure/disposalpipe/sorting/mail/flip{ +/obj/structure/disposalpipe/junction/flip{ dir = 1 }, /turf/open/floor/plating, @@ -31822,11 +32033,8 @@ /turf/open/floor/iron/white, /area/station/medical/treatment_center) "iXG" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, /turf/open/floor/wood, -/area/station/engineering/lobby) +/area/station/engineering/break_room) "iXS" = ( /obj/effect/mapping_helpers/broken_floor, /obj/item/assembly/mousetrap/armed{ @@ -31888,6 +32096,12 @@ /obj/effect/mapping_helpers/airlock/access/all/science/research, /turf/open/floor/iron, /area/station/science/explab) +"iYt" = ( +/obj/structure/bookcase/random, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/sign/poster/random/directional/west, +/turf/open/floor/iron/grimy, +/area/station/service/library/abandoned) "iYw" = ( /obj/structure/sign/poster/random/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible/layer1, @@ -31903,6 +32117,15 @@ /obj/structure/stone_tile/burnt, /turf/open/misc/asteroid/basalt/lava_land_surface, /area/ruin/unpowered/ash_walkers) +"iYR" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/caution{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/emitter) "iYY" = ( /obj/structure/closet/secure_closet/engineering_electrical, /obj/item/radio/intercom/directional/north, @@ -32221,7 +32444,7 @@ dir = 5 }, /turf/open/floor/catwalk_floor, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "jdf" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/random/trash/caution_sign, @@ -32358,10 +32581,12 @@ /turf/open/floor/wood/parquet, /area/station/security/brig/entrance) "jeX" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/iron/dark, -/area/station/engineering/main) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/turf/open/floor/catwalk_floor, +/area/station/maintenance/department/engine) "jeZ" = ( /obj/structure/barricade/wooden, /turf/open/floor/plating, @@ -32582,14 +32807,9 @@ /turf/open/floor/wood, /area/station/medical/psychology) "jik" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/item/kirbyplants/random, /turf/open/floor/catwalk_floor/iron_dark, -/area/station/engineering/storage) +/area/station/tcommsat/computer) "jil" = ( /obj/structure/table, /obj/item/paper_bin, @@ -32626,18 +32846,17 @@ /turf/open/floor/plating, /area/station/maintenance/fore) "jis" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/siding/dark{ dir = 1 }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/checker, /area/station/engineering/storage/tech) "jiF" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 }, -/turf/open/floor/iron, -/area/station/engineering/power_station) +/turf/open/floor/iron/dark, +/area/station/engineering/storage) "jiM" = ( /obj/machinery/light/small/directional/east, /obj/structure/chair/plastic{ @@ -32964,14 +33183,10 @@ /turf/open/floor/iron/white, /area/station/medical/storage) "jmo" = ( -/obj/structure/sign/warning/radiation/directional/south, -/obj/effect/turf_decal/stripes/line, -/obj/structure/table/reinforced, -/obj/item/clothing/gloves/color/yellow, -/obj/item/geiger_counter, -/obj/item/toy/figure/engineer, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) +/obj/machinery/light/warm/directional/west, +/obj/machinery/announcement_system, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/tcommsat/computer) "jmy" = ( /turf/closed/mineral/random/volcanic, /area/lavaland/underground) @@ -33180,11 +33395,12 @@ /turf/open/floor/iron/dark, /area/station/maintenance/disposal/incinerator) "jpe" = ( -/obj/machinery/modular_computer/preset/id, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/newscaster/directional/north, -/turf/open/floor/iron, -/area/station/command/heads_quarters/ce) +/obj/machinery/power/smes/engineering, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/full, +/obj/structure/sign/warning/electric_shock/directional/north, +/turf/open/floor/engine, +/area/station/engineering/engine_smes) "jph" = ( /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 @@ -33277,13 +33493,10 @@ /turf/open/misc/moonstation_sand, /area/moonstation/surface) "jqr" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating, -/area/station/maintenance/aft) +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "jqv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -33300,11 +33513,11 @@ /turf/closed/wall/r_wall/rust, /area/station/maintenance/port/aft) "jqH" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/turf/open/floor/engine, -/area/station/engineering/gravity_generator) +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark, +/area/station/engineering/engine_smes) "jqM" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/smart/simple/green/visible{ @@ -33414,7 +33627,8 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) "jsY" = ( -/obj/structure/sign/warning/vacuum/external/directional/north, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/station/maintenance/department/chapel) "jta" = ( @@ -33471,10 +33685,12 @@ /turf/open/floor/carpet, /area/station/commons/lounge) "juw" = ( -/obj/effect/turf_decal/siding/dark_green, -/obj/machinery/telecomms/broadcaster/preset_left, -/turf/open/floor/circuit/green/telecomms/mainframe, -/area/station/tcommsat/server) +/obj/structure/cable, +/obj/structure/sign/warning/cold_temp/directional/south, +/obj/structure/sign/warning/gas_mask/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/tcommsat/computer) "juA" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/plating, @@ -33776,13 +33992,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible/layer1, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable/layer3, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "jzf" = ( -/obj/structure/table, -/obj/machinery/fax/auto_name, -/turf/open/floor/iron/dark, -/area/station/engineering/break_room) +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/command/heads_quarters/ce) "jzi" = ( /obj/machinery/door/airlock/engineering{ name = "Emergency Wood Storage" @@ -33886,23 +34105,12 @@ }, /area/station/hallway/primary/starboard) "jBQ" = ( -/obj/structure/table/reinforced, -/obj/item/clothing/glasses/meson{ - pixel_x = 5; - pixel_y = -3 - }, -/obj/item/clothing/glasses/meson, -/obj/item/clothing/glasses/meson{ - pixel_y = 5; - pixel_x = -3 - }, -/obj/effect/turf_decal/siding/yellow{ - dir = 1 - }, -/obj/machinery/camera/autoname/engineering/directional/west, -/obj/machinery/newscaster/directional/south, -/turf/open/floor/engine, -/area/station/engineering/storage/eva) +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/engineering/hallway) "jCb" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/effect/spawner/structure/window/reinforced, @@ -34014,8 +34222,9 @@ /obj/effect/turf_decal/siding/dark{ dir = 4 }, -/obj/structure/closet/secure_closet/engineering_welding, /obj/machinery/airalarm/directional/west, +/obj/structure/closet/radiation, +/obj/structure/disposalpipe/segment, /turf/open/floor/engine, /area/station/engineering/main) "jDL" = ( @@ -34059,6 +34268,12 @@ /obj/structure/sign/warning/vacuum/external/directional/south, /turf/open/floor/iron/dark, /area/station/engineering/rbmk2) +"jEA" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "jEN" = ( /obj/effect/spawner/random/burgerstation/liquid, /turf/open/floor/plating, @@ -34067,9 +34282,8 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/iron/dark, /area/station/engineering/main) "jFm" = ( @@ -34084,8 +34298,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -34142,6 +34354,7 @@ dir = 1; id = "QMLoad" }, +/obj/machinery/light/warm/directional/west, /turf/open/floor/iron, /area/station/cargo/storage) "jGN" = ( @@ -34209,7 +34422,7 @@ "jHr" = ( /obj/effect/spawner/random/burgerstation/power, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/starboard/aft) "jHv" = ( /obj/machinery/computer/cargo/request{ dir = 1 @@ -34312,7 +34525,7 @@ /area/station/security/brig) "jIL" = ( /obj/structure/sign/poster/random/directional/south, -/obj/structure/girder, +/obj/effect/spawner/random/burgerstation/odd, /turf/open/floor/plating, /area/station/maintenance/aft) "jIM" = ( @@ -34353,6 +34566,7 @@ dir = 4; name = "Emergency Cooling Bypass" }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/dark, /area/station/engineering/rbmk2) "jJh" = ( @@ -34383,11 +34597,11 @@ /turf/open/floor/iron/dark/corner, /area/station/engineering/atmos/hallway) "jJJ" = ( -/obj/structure/cable, /obj/machinery/power/terminal, /obj/machinery/airalarm/directional/east, /obj/machinery/firealarm/directional/north, -/turf/open/floor/catwalk_floor, +/obj/structure/cable, +/turf/open/floor/iron/dark, /area/station/engineering/supermatter/emitter) "jJM" = ( /obj/effect/spawner/structure/window/reinforced, @@ -34399,10 +34613,12 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "jKl" = ( -/obj/effect/spawner/random/maintenance, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/plating, /area/station/maintenance/port/aft) "jKA" = ( @@ -34462,6 +34678,8 @@ /obj/effect/mapping_helpers/burnt_floor, /obj/effect/spawner/random/decoration/glowstick, /obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/port/aft) "jLN" = ( @@ -34608,14 +34826,13 @@ /turf/open/floor/iron/dark/small, /area/station/ai_monitored/turret_protected/aisat_interior) "jNn" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/catwalk_floor/iron, -/area/station/engineering/hallway) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/department/engine) "jNo" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 5 @@ -34993,19 +35210,6 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/primary/central/aft) -"jRW" = ( -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/siding/dark{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 4 - }, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/ce) "jRZ" = ( /obj/effect/mine/sound/bwoink, /obj/structure/cable, @@ -35154,12 +35358,17 @@ }, /turf/open/floor/iron/white, /area/station/science/research) +"jTR" = ( +/obj/structure/sign/poster/random/directional/south, +/obj/effect/spawner/random/trash/graffiti, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "jUg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "jUh" = ( /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 1 @@ -35232,7 +35441,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "jVa" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer2{ dir = 1 @@ -35304,7 +35513,7 @@ }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/engine, -/area/station/construction) +/area/station/maintenance/department/engine) "jVO" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/effect/turf_decal/bot, @@ -35370,6 +35579,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "jXr" = ( @@ -35436,7 +35646,7 @@ /obj/structure/table, /obj/effect/spawner/random/maintenance/two, /turf/open/floor/plating, -/area/station/construction) +/area/station/maintenance/department/engine) "jYl" = ( /obj/effect/turf_decal/tile/neutral/opposingcorners{ dir = 1 @@ -35623,11 +35833,17 @@ /turf/open/floor/plating, /area/station/maintenance/aft) "kbe" = ( -/obj/machinery/airalarm/directional/north, -/obj/effect/spawner/random/burgerstation/liquid, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, -/area/station/construction) +/obj/effect/turf_decal/siding/dark, +/obj/machinery/light_switch/directional/east, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/open/floor/iron/grimy, +/area/station/tcommsat/computer) "kbj" = ( /obj/effect/spawner/random/structure/chair_maintenance{ dir = 8 @@ -35796,9 +36012,44 @@ /turf/open/floor/iron, /area/station/cargo/lobby) "kdQ" = ( -/obj/machinery/recharge_station, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) +/obj/structure/table, +/obj/item/electronics/airalarm{ + pixel_x = -7; + pixel_y = 7 + }, +/obj/item/electronics/airalarm{ + pixel_x = -7; + pixel_y = 7 + }, +/obj/item/electronics/airlock{ + pixel_x = 5; + pixel_y = 9 + }, +/obj/item/electronics/airlock{ + pixel_x = 5; + pixel_y = 9 + }, +/obj/item/electronics/airlock{ + pixel_x = 5; + pixel_y = 9 + }, +/obj/item/electronics/airlock{ + pixel_x = 5; + pixel_y = 9 + }, +/obj/item/electronics/airalarm{ + pixel_x = -7; + pixel_y = 7 + }, +/obj/item/stack/cable_coil/thirty, +/obj/machinery/light/directional/west, +/obj/effect/spawner/random/engineering/tool, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/construction) "kdS" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "bar_kitchen_counter"; @@ -35979,6 +36230,12 @@ /obj/effect/spawner/random/decoration/glowstick, /obj/effect/turf_decal/delivery, /obj/structure/sign/warning/radiation/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plating, /area/station/maintenance/port/aft) "kij" = ( @@ -36194,10 +36451,10 @@ /turf/open/floor/plating, /area/station/maintenance/pool_maintenance) "kkV" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/engine, -/area/station/engineering/supermatter/room) +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/machinery/incident_display/delam/directional/south, +/turf/open/floor/iron, +/area/station/engineering/hallway) "kld" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 @@ -36220,9 +36477,11 @@ /turf/open/floor/carpet, /area/station/service/library) "klh" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/tcommsat/computer) +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/machinery/light/warm/directional/south, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron, +/area/station/engineering/hallway) "kll" = ( /obj/machinery/door/airlock/highsecurity{ name = "AI Upload" @@ -36776,12 +37035,12 @@ /turf/open/floor/iron/dark, /area/station/security/brig) "ksJ" = ( -/obj/item/radio/intercom/directional/north, -/obj/effect/turf_decal/stripes/line{ - dir = 5 +/obj/effect/spawner/random/trash/moisture_trap, +/obj/structure/railing{ + dir = 6 }, -/turf/open/floor/engine, -/area/station/engineering/gravity_generator) +/turf/open/floor/plating, +/area/station/maintenance/department/engine) "ksN" = ( /obj/effect/landmark/start/bouncer, /obj/effect/turf_decal/siding/dark/corner, @@ -36835,10 +37094,12 @@ /turf/open/floor/catwalk_floor, /area/station/maintenance/gag_room) "ktG" = ( -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/engineering/power_station) +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/machinery/vending/tool, +/turf/open/floor/iron/dark, +/area/station/engineering/storage) "ktI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -36965,11 +37226,9 @@ /turf/open/misc/asteroid/basalt/lava_land_surface, /area/lavaland/underground) "kvt" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/engine, -/area/station/engineering/gravity_generator) +/obj/effect/spawner/random/burgerstation/table, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "kvu" = ( /obj/structure/urinal/directional/east, /turf/open/floor/iron/showroomfloor, @@ -37051,12 +37310,12 @@ /turf/open/floor/plating, /area/station/engineering/supermatter/waste) "kwL" = ( -/obj/effect/turf_decal/box/corners{ - dir = 8 +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/engine, -/area/station/engineering/gravity_generator) +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "kwN" = ( /obj/structure/railing/corner/end/flip{ dir = 1 @@ -37105,6 +37364,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /turf/open/floor/engine, /area/station/engineering/supermatter/room) @@ -37168,6 +37429,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/machinery/light_switch/directional/east, +/obj/structure/sign/poster/random/directional/north, /turf/open/floor/wood, /area/station/service/library/abandoned) "kyP" = ( @@ -37720,7 +37982,6 @@ /obj/structure/cable, /obj/machinery/light/small/directional/north, /obj/effect/spawner/random/decoration/ornament, -/obj/effect/spawner/random/entertainment/plushie, /obj/machinery/newscaster/directional/north, /turf/open/floor/carpet/purple, /area/station/commons/dorms/room4) @@ -37766,13 +38027,15 @@ /turf/open/misc/grass/jungle, /area/station/biodome) "kGT" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/obj/machinery/airalarm/directional/east, -/obj/machinery/camera/autoname/engineering/directional/east, +/obj/machinery/light/warm/directional/east, /turf/open/floor/iron/dark, -/area/station/engineering/gravity_generator) +/area/station/engineering/storage/eva) "kHv" = ( /obj/effect/turf_decal/siding/dark{ dir = 1 @@ -37856,16 +38119,6 @@ /obj/structure/closet/wardrobe/cargotech, /turf/open/floor/iron, /area/station/cargo/storage) -"kIO" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/delivery, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) "kIX" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /obj/structure/disposalpipe/segment, @@ -37882,6 +38135,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/plastic, /area/station/commons/public_xenoarch) "kJl" = ( @@ -38093,10 +38347,9 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "kMq" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/east, -/turf/open/floor/plating, -/area/station/construction) +/obj/effect/spawner/random/burgerstation/liquid, +/turf/open/floor/catwalk_floor, +/area/station/maintenance/department/engine) "kMt" = ( /turf/closed/wall/r_wall/rust, /area/station/ai_monitored/turret_protected/ai_upload) @@ -38234,10 +38487,10 @@ /obj/effect/turf_decal/siding/dark{ dir = 1 }, -/obj/structure/cable, /obj/structure/reflector/single/anchored{ dir = 8 }, +/obj/structure/cable, /turf/open/floor/plating, /area/station/engineering/supermatter/emitter) "kNJ" = ( @@ -38257,12 +38510,16 @@ /turf/open/floor/engine, /area/station/science/auxlab) "kOq" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/iron, -/area/station/engineering/power_station) +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 4 + }, +/obj/machinery/firealarm/directional/north, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/storage) "kOs" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/structure/cable, @@ -38320,7 +38577,7 @@ /obj/structure/rack, /obj/effect/spawner/costume/highlander, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/starboard/aft) "kPO" = ( /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 @@ -38622,14 +38879,14 @@ /turf/open/floor/iron/dark, /area/station/security/brig) "kSZ" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 6 +/obj/effect/turf_decal/siding/purple{ + dir = 1 }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/engineering/storage) +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/hallway/secondary/exit) "kTe" = ( /obj/item/stack/cable_coil/thirty, /turf/open/misc/moonstation_rock, @@ -38640,12 +38897,14 @@ /turf/open/floor/iron, /area/station/security/prison/workout) "kTl" = ( -/obj/machinery/door/airlock/maintenance_hatch, -/obj/effect/mapping_helpers/airlock/access/all/engineering/engine_equipment, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/machinery/door/firedoor, -/turf/open/floor/plating, -/area/station/engineering/storage) +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/checker, +/area/station/hallway/primary/central/fore) "kTm" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, /obj/effect/turf_decal/siding/blue{ @@ -38700,7 +38959,7 @@ /obj/effect/spawner/random/burgerstation/loot, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, -/area/station/construction) +/area/station/maintenance/department/engine) "kUn" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -38728,6 +38987,7 @@ "kUw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, +/obj/structure/cable/layer3, /turf/open/floor/catwalk_floor/iron_dark, /area/station/engineering/main) "kUC" = ( @@ -38938,6 +39198,7 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, +/obj/structure/cable/layer3, /turf/open/floor/iron/dark, /area/station/engineering/main) "kXB" = ( @@ -39006,6 +39267,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/light/floor, /turf/open/floor/iron/dark, /area/station/engineering/main) "kYi" = ( @@ -39473,14 +39735,9 @@ /turf/open/floor/iron/dark/small, /area/station/ai_monitored/turret_protected/aisat_interior) "leq" = ( -/obj/structure/disposalpipe/junction/flip{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/iron, -/area/station/engineering/hallway) +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/turf/open/floor/iron/checker, +/area/station/hallway/primary/aft) "leC" = ( /obj/effect/turf_decal/siding/purple{ dir = 1 @@ -39742,7 +39999,7 @@ /turf/open/floor/circuit/telecomms, /area/station/ai_monitored/turret_protected/ai) "lhQ" = ( -/obj/structure/rack/shelf, +/obj/structure/cargo_shelf, /turf/open/floor/catwalk_floor/iron, /area/station/cargo/storage) "lhR" = ( @@ -39818,11 +40075,9 @@ /turf/open/floor/catwalk_floor, /area/station/science/xenobiology) "liY" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/west, -/turf/open/floor/iron, -/area/station/maintenance/abandon_exam) +/obj/effect/landmark/generic_maintenance_landmark, +/turf/open/floor/plating, +/area/station/medical/abandoned) "ljk" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/machinery/door/airlock/public/glass{ @@ -39899,6 +40154,9 @@ /obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/any/service/maintenance, /obj/effect/mapping_helpers/airlock/access/any/service/chapel_office, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, /turf/open/floor/plating, /area/station/maintenance/department/chapel) "lkq" = ( @@ -40004,7 +40262,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, /turf/open/floor/plating, -/area/station/maintenance/port/aft) +/area/station/cargo/drone_bay) "lml" = ( /obj/machinery/atmospherics/components/binary/valve/digital{ dir = 8; @@ -40037,9 +40295,11 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) "lmC" = ( -/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, /turf/open/floor/iron/dark, -/area/station/engineering/gravity_generator) +/area/station/engineering/storage/eva) "lmG" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -40270,7 +40530,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/catwalk_floor/iron, +/turf/open/floor/iron/checker, /area/station/hallway/primary/aft) "lpJ" = ( /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ @@ -40285,18 +40545,13 @@ /obj/effect/turf_decal/tile/brown{ dir = 1 }, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, +/turf/open/floor/iron/checker, /area/station/hallway/primary/aft) "lpS" = ( -/obj/effect/turf_decal/tile/holiday/rainbow/half/contrasted{ - dir = 4 - }, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark/corner, -/area/station/hallway/secondary/exit) +/obj/structure/cable, +/obj/structure/cable/layer3, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "lpY" = ( /obj/structure/railing{ dir = 8 @@ -40355,9 +40610,11 @@ /turf/open/floor/iron/dark, /area/station/command/heads_quarters/captain) "lqM" = ( -/obj/item/kirbyplants/random, -/turf/open/floor/iron/dark, -/area/station/tcommsat/computer) +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/checker, +/area/station/hallway/secondary/exit) "lqS" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/south, @@ -40778,11 +41035,10 @@ /turf/open/floor/carpet/red, /area/station/service/library/artgallery) "lwK" = ( +/obj/effect/landmark/atmospheric_sanity/ignore_area, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/engineering/storage/eva) +/turf/open/floor/plating, +/area/station/construction) "lwR" = ( /obj/structure/chair{ dir = 1 @@ -41043,9 +41299,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, +/turf/open/floor/iron/checker, /area/station/hallway/secondary/exit) "lAR" = ( /obj/effect/spawner/liquids_spawner{ @@ -41071,7 +41325,7 @@ }, /obj/structure/cable, /turf/open/floor/catwalk_floor, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "lAW" = ( /obj/effect/turf_decal/vg_decals/numbers/four, /turf/open/floor/engine, @@ -41098,12 +41352,14 @@ /turf/open/floor/iron/dark, /area/station/security/brig/entrance) "lBq" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 10 - }, /obj/machinery/camera/autoname/directional/north, -/obj/item/kirbyplants/random, -/turf/open/floor/engine, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/iron, /area/station/cargo/storage) "lBu" = ( /obj/effect/spawner/random/maintenance, @@ -41173,7 +41429,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/starboard/aft) "lCu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible/layer1, @@ -41267,6 +41523,7 @@ "lEf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/purple/diagonal_centre, /turf/open/floor/iron/white, /area/station/science/xenobiology) "lEk" = ( @@ -41367,16 +41624,12 @@ /turf/open/floor/iron/white, /area/station/medical/pharmacy) "lFk" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 4 +/obj/machinery/modular_computer/preset/id, +/obj/machinery/computer/security/telescreen/ce{ + pixel_y = 28 }, -/obj/structure/filingcabinet/chestdrawer/wheeled, -/obj/structure/extinguisher_cabinet/directional/east, -/obj/machinery/light_switch/directional/north, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron, /area/station/command/heads_quarters/ce) "lFo" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -41533,6 +41786,8 @@ /obj/effect/turf_decal/siding/dark{ dir = 8 }, +/obj/item/radio/intercom/directional/east, +/obj/machinery/camera/autoname/engineering/directional/east, /turf/open/floor/iron/dark, /area/station/engineering/main) "lHl" = ( @@ -41575,12 +41830,12 @@ /turf/closed/wall/r_wall/rust, /area/station/command/secure_bunker) "lHC" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable, -/obj/machinery/camera/autoname/engineering/directional/west, -/turf/open/floor/iron, -/area/station/command/heads_quarters/ce) +/obj/effect/turf_decal/tile/green/half/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/checker, +/area/station/hallway/primary/central/aft) "lHK" = ( /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/dark, @@ -41658,9 +41913,14 @@ /turf/closed/wall/mineral/wood, /area/station/commons/vacant_room/commissary) "lIO" = ( -/obj/effect/landmark/start/telecomms_specialist, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, +/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/tcommsat/computer) "lIT" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -41719,7 +41979,7 @@ "lJt" = ( /obj/structure/sign/poster/random/directional/south, /turf/open/floor/wood, -/area/station/maintenance/console_room) +/area/moonstation/surface/unexplored) "lJx" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/arrows/white{ @@ -41806,7 +42066,6 @@ /obj/effect/mapping_helpers/requests_console/supplies, /obj/effect/mapping_helpers/requests_console/assistance, /obj/effect/mapping_helpers/requests_console/information, -/obj/machinery/camera/autoname/security/directional/east, /obj/machinery/light_switch/directional/north, /turf/open/floor/iron/dark, /area/station/security/checkpoint/arrivals) @@ -42012,12 +42271,11 @@ /turf/open/floor/engine/vacuum, /area/station/engineering/supermatter/waste) "lNv" = ( -/obj/structure/railing{ - dir = 6 - }, -/obj/effect/spawner/random/burgerstation/loot, +/obj/structure/mirror/directional/west, +/obj/structure/sink/directional/east, +/obj/effect/spawner/random/trash/soap, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/medical/abandoned) "lNx" = ( /obj/effect/turf_decal/tile/green/diagonal_centre, /obj/structure/cable, @@ -42061,13 +42319,11 @@ /turf/open/floor/iron/showroomfloor, /area/station/medical/chemistry) "lOk" = ( -/obj/machinery/computer/telecomms/server{ - dir = 8 +/obj/effect/turf_decal/stripes/line{ + dir = 6 }, -/obj/item/radio/intercom/directional/east, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/grimy, -/area/station/tcommsat/computer) +/turf/open/floor/plating, +/area/station/construction) "lOw" = ( /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt/dust, @@ -42124,8 +42380,9 @@ /turf/open/misc/moonstation_rock, /area/moonstation/underground) "lPu" = ( -/turf/closed/wall/r_wall, -/area/station/tcommsat/computer) +/obj/effect/turf_decal/tile/holiday/rainbow/half/contrasted, +/turf/open/floor/iron/checker, +/area/station/hallway/primary/starboard) "lPE" = ( /obj/effect/turf_decal/siding/dark, /obj/effect/turf_decal/trimline/yellow/warning, @@ -42356,13 +42613,15 @@ /turf/closed/wall/rust, /area/station/commons/toilet) "lSM" = ( -/obj/structure/sign/poster/random/directional/east, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating, -/area/station/maintenance/aft) +/obj/structure/table, +/obj/machinery/light_switch/directional/north, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/reagentgrinder, +/turf/open/floor/iron/white/corner{ + dir = 4 + }, +/area/station/medical/abandoned) "lSO" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 4 @@ -42414,9 +42673,14 @@ /turf/open/floor/wood, /area/station/service/barber) "lUo" = ( -/obj/effect/spawner/random/burgerstation/table, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) +/obj/machinery/computer/atmos_alert{ + dir = 8 + }, +/obj/machinery/light/warm/directional/east, +/obj/structure/cable/multilayer/connected, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/catwalk_floor, +/area/station/engineering/engine_smes) "lUp" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 4 @@ -42433,7 +42697,7 @@ dir = 4 }, /turf/open/floor/engine, -/area/station/construction) +/area/station/maintenance/department/engine) "lUw" = ( /obj/machinery/door/airlock/maintenance_hatch, /obj/effect/mapping_helpers/airlock/access/all/service/lawyer, @@ -42505,7 +42769,7 @@ }, /obj/structure/sign/warning/fire/directional/south, /turf/open/floor/iron, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "lVF" = ( /obj/effect/turf_decal/siding/dark{ dir = 4 @@ -42538,6 +42802,7 @@ /turf/open/floor/plating/lavaland_atmos, /area/station/cargo/miningelevators) "lWf" = ( +/obj/effect/turf_decal/tile/purple/diagonal_centre, /turf/open/floor/iron/white, /area/station/science/xenobiology) "lWj" = ( @@ -42820,10 +43085,10 @@ /turf/open/floor/iron/white, /area/station/medical/treatment_center) "lZt" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark, -/area/station/engineering/storage/eva) +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/spawner/random/structure/steam_vent, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "lZC" = ( /obj/effect/turf_decal/siding/dark{ dir = 4 @@ -42925,11 +43190,15 @@ /turf/open/floor/iron, /area/station/commons/storage) "maI" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/structure/chair/plastic{ dir = 8 }, -/turf/open/floor/iron/dark, -/area/station/tcommsat/computer) +/turf/open/floor/plating, +/area/station/maintenance/department/engine) "maM" = ( /obj/structure/table/wood, /obj/item/paper_bin/carbon, @@ -43003,7 +43272,7 @@ "mbB" = ( /obj/structure/cable, /turf/open/floor/catwalk_floor, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "mbC" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -43062,6 +43331,17 @@ dir = 1 }, /area/station/security/brig/entrance) +"mcl" = ( +/obj/effect/spawner/random/maintenance, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/poster/random/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "mcJ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -43102,9 +43382,7 @@ dir = 8 }, /obj/item/radio/intercom/directional/west, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, +/turf/open/floor/iron/checker, /area/station/hallway/primary/port) "mdr" = ( /obj/structure/stone_tile/surrounding_tile/cracked, @@ -43161,6 +43439,7 @@ /obj/machinery/duct, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/start/botanist, /turf/open/floor/grass, /area/station/service/hydroponics) "mdU" = ( @@ -43195,6 +43474,9 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, /turf/open/floor/wood/tile, /area/station/hallway/primary/aft) "mej" = ( @@ -43286,6 +43568,7 @@ /obj/machinery/duct, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/purple/diagonal_centre, /turf/open/floor/iron/white, /area/station/science/xenobiology) "mfS" = ( @@ -43374,16 +43657,17 @@ /turf/open/floor/iron, /area/station/security/prison/upper) "mhK" = ( -/turf/closed/wall/r_wall, -/area/station/engineering/gravity_generator) +/obj/structure/sign/warning/electric_shock/directional/south, +/obj/item/assembly/mousetrap/armed, +/turf/open/floor/catwalk_floor, +/area/station/maintenance/department/engine) "mhL" = ( /obj/effect/spawner/random/engineering/tracking_beacon, -/obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/siding/dark{ dir = 1 }, /obj/structure/cable, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/checker, /area/station/engineering/storage/tech) "mhY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -43444,9 +43728,9 @@ /turf/open/floor/plating, /area/station/security/range) "miS" = ( -/obj/structure/cable, -/turf/open/floor/catwalk_floor/iron, -/area/station/engineering/power_station) +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/engineering/storage) "miX" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -43519,13 +43803,13 @@ dir = 8 }, /turf/open/floor/catwalk_floor, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "mjM" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 6 }, /turf/open/floor/plating, /area/station/maintenance/port/aft) @@ -43598,9 +43882,7 @@ /obj/structure/sign/directions/engineering/directional/west{ pixel_y = -40 }, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, +/turf/open/floor/iron/checker, /area/station/hallway/primary/starboard) "mkM" = ( /obj/structure/cable, @@ -43715,13 +43997,16 @@ /turf/open/floor/plating, /area/station/command/cc_dock) "mmo" = ( -/obj/structure/window/reinforced/spawner/directional/south, -/obj/effect/turf_decal/delivery, -/obj/structure/disposalpipe/segment{ +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, +/obj/structure/filingcabinet/chestdrawer/wheeled, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/dark, -/area/station/engineering/break_room) +/area/station/command/heads_quarters/ce) "mmw" = ( /turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins, /area/lavaland/underground) @@ -43836,7 +44121,6 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/camera/autoname/engineering/directional/south, /turf/open/floor/engine, /area/station/engineering/storage_shared) "moL" = ( @@ -43913,14 +44197,9 @@ /turf/open/floor/wood/large, /area/station/commons/lounge) "mpE" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/engineering/storage) +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/construction) "mpP" = ( /turf/closed/wall/rust, /area/station/commons/dorms) @@ -44087,14 +44366,15 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/central) "msI" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/structure/table/glass/plasmaglass, +/obj/item/paper/monitorkey, +/obj/item/stamp/head/ce, +/obj/item/spess_knife{ + pixel_y = 3; + pixel_x = -10 }, -/turf/open/floor/engine, -/area/station/engineering/gravity_generator) +/turf/open/floor/glass/reinforced/plasma, +/area/station/command/heads_quarters/ce) "msN" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -44219,13 +44499,12 @@ /turf/open/floor/plating, /area/station/command/heads_quarters/blueshield) "muq" = ( -/obj/effect/spawner/random/maintenance, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "muH" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -44243,7 +44522,7 @@ /obj/machinery/door/firedoor, /obj/structure/cable, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "muS" = ( /obj/structure/mirror/directional/east, /obj/structure/sink/directional/west, @@ -44266,17 +44545,14 @@ /turf/open/floor/engine/co2, /area/station/engineering/atmos) "mvs" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, /turf/open/floor/iron/dark, -/area/station/engineering/gravity_generator) +/area/station/engineering/storage/eva) "mvv" = ( /obj/structure/disposalpipe/segment, -/turf/open/floor/iron/large, +/turf/open/floor/iron/checker, /area/station/hallway/secondary/exit) "mvA" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -44324,12 +44600,9 @@ /turf/open/floor/iron/dark, /area/station/security/prison/safe) "mwo" = ( -/obj/structure/rack/shelf, -/obj/effect/spawner/random/maintenance{ - spawn_loot_chance = 50 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cargo_shelf, /turf/open/floor/catwalk_floor/iron, /area/station/cargo/storage) "mwu" = ( @@ -44376,7 +44649,7 @@ }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "mxc" = ( /obj/machinery/seed_extractor, /obj/structure/window/reinforced/spawner/directional/east, @@ -44581,17 +44854,16 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/firealarm/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/recharge_station, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "mAy" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, +/obj/machinery/power/smes/engineering, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/full, /turf/open/floor/engine, -/area/station/engineering/gravity_generator) +/area/station/engineering/engine_smes) "mAE" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron, @@ -44728,8 +45000,15 @@ /turf/open/floor/plating, /area/station/maintenance/fore) "mBS" = ( -/turf/closed/wall/r_wall, -/area/station/engineering/power_station) +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/catwalk_floor, +/area/station/maintenance/department/engine) "mBU" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 @@ -44834,7 +45113,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /obj/machinery/door/firedoor, -/turf/open/floor/plating, +/turf/open/floor/iron/dark, /area/station/engineering/supermatter/emitter) "mEp" = ( /obj/machinery/atmospherics/components/binary/valve/layer2, @@ -44875,11 +45154,16 @@ /turf/open/floor/iron/dark, /area/station/common/night_club) "mEV" = ( -/obj/structure/table/glass/plasmaglass, -/obj/item/melee/roastingstick, -/obj/item/storage/photo_album/ce, -/obj/item/toy/figure/ce, -/turf/open/floor/glass/reinforced/plasma, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron, /area/station/command/heads_quarters/ce) "mFf" = ( /obj/structure/table/optable, @@ -45064,7 +45348,7 @@ target_pressure = 120 }, /turf/open/floor/catwalk_floor, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "mHS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -45277,11 +45561,11 @@ /turf/open/floor/iron/dark, /area/station/science/circuits) "mLe" = ( -/obj/structure/table, -/obj/structure/extinguisher_cabinet/directional/west, -/obj/item/hand_labeler, -/turf/open/floor/iron/dark, -/area/station/engineering/break_room) +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/ce) "mLl" = ( /obj/machinery/camera/autoname/engineering/directional/east, /turf/open/floor/plating, @@ -45450,11 +45734,20 @@ /turf/open/floor/iron, /area/station/maintenance/department/electrical) "mOc" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/main) +/obj/structure/rack/shelf, +/obj/item/stock_parts/subspace/amplifier, +/obj/item/stock_parts/subspace/analyzer, +/obj/item/stock_parts/subspace/ansible, +/obj/item/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/transmitter, +/obj/item/stock_parts/subspace/treatment, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/light_switch/directional/north, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/engineering/storage/tcomms) "mOe" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -45539,7 +45832,7 @@ /obj/effect/spawner/random/trash/hobo_squat, /obj/effect/landmark/event_spawn, /turf/open/floor/wood, -/area/station/maintenance/console_room) +/area/moonstation/surface/unexplored) "mPH" = ( /obj/structure/table/wood, /obj/effect/turf_decal/siding/dark, @@ -45563,6 +45856,9 @@ name = "Research Division Access" }, /obj/effect/mapping_helpers/airlock/unres, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, /turf/open/floor/iron/white, /area/station/science/research) "mPV" = ( @@ -45714,13 +46010,11 @@ /turf/open/floor/plating/rust/moonstation, /area/moonstation/surface) "mRp" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark, -/area/station/engineering/storage/tcomms) +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/turf/open/floor/plating, +/area/station/engineering/hallway) "mRq" = ( /obj/structure/table, /obj/machinery/microwave/engineering/cell_included{ @@ -45728,7 +46022,7 @@ }, /obj/effect/spawner/random/food_or_drink/donkpockets, /turf/open/floor/wood, -/area/station/engineering/lobby) +/area/station/engineering/break_room) "mRD" = ( /obj/effect/spawner/random/burgerstation/loot, /turf/open/floor/catwalk_floor, @@ -45916,6 +46210,7 @@ name = "Research Division Access" }, /obj/effect/mapping_helpers/airlock/unres, +/obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/station/science/research) "mTE" = ( @@ -46119,12 +46414,18 @@ /turf/open/floor/iron, /area/station/science/circuits) "mWF" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/machinery/button/door/directional/north{ + id = "qm_warehouse"; + name = "Warehouse Shutters Control"; + pixel_x = 8; + req_access = list("shipping") }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/siding/dark{ + dir = 6 + }, +/turf/open/floor/engine, +/area/station/cargo/storage) "mWJ" = ( /obj/effect/turf_decal/siding/dark{ dir = 4 @@ -46162,7 +46463,7 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "mXb" = ( /obj/structure/table/wood/fancy/red, /obj/item/ai_module/reset/purge, @@ -46175,7 +46476,7 @@ "mXp" = ( /obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/n2, /turf/open/floor/catwalk_floor, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "mXB" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/south, @@ -46190,17 +46491,11 @@ /turf/closed/wall, /area/station/cargo/warehouse) "mXF" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/computer/security/telescreen/engine{ - dir = 1; - pixel_y = -32 - }, -/obj/machinery/modular_computer/preset/engineering{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet/directional/east, -/turf/open/floor/iron, -/area/station/engineering/power_station) +/obj/machinery/vending/wardrobe/engi_wardrobe, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/storage) "mXK" = ( /obj/structure/curtain, /obj/machinery/shower/directional/south, @@ -46211,7 +46506,6 @@ /turf/closed/wall, /area/station/security/checkpoint/escape) "mYj" = ( -/obj/structure/sign/poster/random/directional/west, /obj/effect/spawner/random/burgerstation/odd, /turf/open/floor/plating, /area/station/maintenance/port/aft) @@ -46275,19 +46569,7 @@ }, /obj/structure/cable, /turf/open/floor/catwalk_floor, -/area/station/maintenance/aft) -"mZa" = ( -/obj/structure/table/reinforced, -/obj/machinery/fax/auto_name, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/button/door/directional/west{ - id = "ce_officer_shutters"; - name = "Privacy Shutters Control"; - req_access = list("ce") - }, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/iron, -/area/station/command/heads_quarters/ce) +/area/station/maintenance/department/engine) "mZd" = ( /turf/closed/wall, /area/station/maintenance/abandon_holding_cell) @@ -46296,13 +46578,16 @@ /turf/open/floor/iron/white, /area/station/medical/treatment_center) "mZz" = ( -/obj/structure/sign/poster/random/directional/west, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating, -/area/station/maintenance/aft) +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/decal/cleanable/greenglow/filled, +/obj/effect/spawner/random/medical/patient_stretcher, +/obj/structure/sign/poster/contraband/random/directional/west, +/turf/open/floor/iron/white/corner{ + dir = 8 + }, +/area/station/medical/abandoned) "mZB" = ( /obj/machinery/door/airlock/command{ name = "Conference Room" @@ -46415,26 +46700,6 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/rust/moonstation, /area/moonstation/surface) -"nby" = ( -/obj/structure/cable, -/obj/structure/rack, -/obj/item/clothing/suit/hooded/wintercoat/engineering, -/obj/item/clothing/suit/hooded/wintercoat/engineering, -/obj/item/clothing/suit/hooded/wintercoat/engineering, -/obj/item/clothing/mask/gas{ - pixel_x = 2; - pixel_y = -2 - }, -/obj/item/clothing/mask/gas{ - pixel_x = 2; - pixel_y = -2 - }, -/obj/item/clothing/mask/gas{ - pixel_x = 2; - pixel_y = -2 - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/tcommsat/computer) "nbz" = ( /obj/machinery/airalarm/directional/north, /obj/structure/filingcabinet/security, @@ -46456,6 +46721,9 @@ /obj/machinery/light/floor, /turf/open/floor/iron/dark, /area/station/command/bridge) +"nbK" = ( +/turf/open/floor/glass/reinforced/scrape_below, +/area/station/engineering/main) "nbU" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -46478,12 +46746,15 @@ }, /area/station/science/robotics/mechbay) "nch" = ( -/obj/machinery/light/warm/directional/west, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/machinery/firealarm/directional/west, -/turf/open/floor/iron, -/area/station/command/heads_quarters/ce) +/obj/effect/spawner/random/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "nci" = ( /obj/structure/window/reinforced/spawner/directional/west, /turf/open/floor/circuit/green, @@ -46535,6 +46806,7 @@ /area/station/maintenance/port) "ncB" = ( /obj/effect/spawner/random/trash/caution_sign, +/obj/effect/spawner/random/structure/steam_vent, /turf/open/floor/plating, /area/station/maintenance/aft) "ncI" = ( @@ -46603,16 +46875,16 @@ /turf/open/floor/iron, /area/station/cargo/office) "ndJ" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/obj/machinery/firealarm/directional/north, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ +/obj/structure/table, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/effect/spawner/random/engineering/material, +/obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/construction) "ndN" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -46655,7 +46927,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/effect/spawner/random/maintenance, -/turf/open/floor/plating, +/turf/open/floor/plating/foam, /area/station/maintenance/evac_maintenance) "ney" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -46704,16 +46976,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/station/security/prison/upper) -"neZ" = ( -/obj/effect/turf_decal/caution{ - dir = 4 - }, -/obj/machinery/light/small/red/directional/east, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/engine, -/area/station/engineering/gravity_generator) "nfa" = ( /obj/effect/turf_decal/bot, /obj/machinery/light/warm/directional/west, @@ -46810,7 +47072,7 @@ /obj/structure/cable, /obj/effect/spawner/random/maintenance, /turf/open/floor/catwalk_floor, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "nfZ" = ( /obj/structure/sink/directional/east, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -46915,7 +47177,6 @@ "nii" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /obj/effect/turf_decal/bot, -/obj/structure/sign/poster/official/random/directional/east, /turf/open/floor/iron/dark/textured_large, /area/station/engineering/atmos/storage/gas) "nil" = ( @@ -46923,6 +47184,13 @@ /obj/item/storage/toolbox/mechanical, /turf/open/floor/iron/dark, /area/station/engineering/asteroid_lobby) +"nim" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/port) "niE" = ( /obj/effect/turf_decal/tile/dark_green/half/contrasted, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -46933,7 +47201,7 @@ /obj/effect/mapping_helpers/broken_floor, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, -/area/station/construction) +/area/station/maintenance/department/engine) "niO" = ( /obj/effect/turf_decal/trimline/dark/filled/warning{ dir = 9 @@ -47111,11 +47379,11 @@ /turf/open/floor/iron/dark, /area/station/security/prison/safe) "nlQ" = ( -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/sign/warning/vacuum/external/directional/south, /obj/machinery/camera/autoname/engineering/directional/south, +/obj/structure/cable, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "nmc" = ( @@ -47132,13 +47400,17 @@ /obj/effect/mapping_helpers/broken_floor, /obj/structure/sign/poster/random/directional/south, /turf/open/floor/wood, -/area/station/maintenance/console_room) +/area/moonstation/surface/unexplored) "nmn" = ( /obj/effect/turf_decal/bot, /obj/effect/mapping_helpers/dead_body_placer, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/engine, /area/station/medical/morgue) +"nmB" = ( +/obj/structure/sign/poster/random/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "nmC" = ( /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ dir = 1 @@ -47159,6 +47431,7 @@ /obj/machinery/light/small/directional/north, /obj/machinery/newscaster/directional/north, /obj/item/radio/intercom/directional/east, +/obj/effect/spawner/random/engineering/vending_restock, /turf/open/floor/iron, /area/station/commons/storage) "nnd" = ( @@ -47280,7 +47553,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/starboard/aft) "noz" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 8 @@ -47479,11 +47752,10 @@ /turf/open/floor/iron, /area/station/cargo/sorting) "nra" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/power_station) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/engineering/storage) "nrg" = ( /obj/effect/turf_decal/tile/brown/half/contrasted, /obj/structure/cable, @@ -47672,11 +47944,12 @@ /turf/open/floor/iron, /area/station/maintenance/abandon_cafeteria) "ntF" = ( -/obj/structure/rack/shelf, -/obj/effect/spawner/random/techstorage/tcomms_all, -/obj/machinery/light_switch/directional/north, -/turf/open/floor/iron/dark, -/area/station/engineering/storage/tcomms) +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/components/binary/pump/on/supply/visible{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/engine) "ntQ" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -47717,6 +47990,12 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, /area/station/maintenance/abandon_cafeteria) +"nur" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "nut" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/abandoned, @@ -48019,6 +48298,13 @@ /obj/machinery/light/warm/directional/east, /turf/open/floor/iron/edge, /area/station/hallway/primary/tram/left) +"nyN" = ( +/obj/effect/spawner/random/structure/chair_maintenance{ + dir = 8 + }, +/obj/structure/sign/poster/random/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "nyP" = ( /obj/effect/turf_decal/trimline/dark/filled/warning{ dir = 4 @@ -48040,7 +48326,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/station/construction) +/area/station/maintenance/department/engine) "nzr" = ( /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 @@ -48213,15 +48499,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/starboard) -"nCl" = ( -/obj/machinery/computer/telecomms/monitor{ - dir = 8 - }, -/obj/item/radio/intercom/directional/east, -/obj/machinery/airalarm/directional/north, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/grimy, -/area/station/tcommsat/computer) "nCn" = ( /obj/structure/cable, /turf/closed/wall/r_wall/rust, @@ -48434,13 +48711,15 @@ /turf/open/floor/iron/checker, /area/station/hallway/primary/central/aft) "nFp" = ( -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 8 }, -/turf/open/floor/carpet/orange, -/area/station/command/heads_quarters/ce) +/obj/effect/mapping_helpers/mail_sorting/engineering/general, +/turf/open/floor/catwalk_floor, +/area/station/maintenance/department/engine) "nFz" = ( /obj/structure/cable, /obj/machinery/door/airlock/external{ @@ -48535,11 +48814,11 @@ /turf/open/floor/carpet, /area/station/command/heads_quarters/hop) "nGI" = ( -/obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/mapping_helpers/airlock/access/all/security/general, /obj/effect/mapping_helpers/airlock/autoname, +/obj/machinery/door/airlock/maintenance_hatch, /turf/open/floor/plating, /area/station/security/checkpoint/escape) "nGV" = ( @@ -48872,13 +49151,9 @@ /turf/open/floor/plating, /area/station/hallway/primary/starboard) "nMr" = ( -/obj/structure/closet/radiation, -/obj/machinery/light/warm/directional/east, -/obj/item/radio/intercom/directional/east, /obj/effect/turf_decal/siding/dark{ dir = 8 }, -/obj/machinery/camera/autoname/engineering/directional/east, /turf/open/floor/iron/dark, /area/station/engineering/main) "nMy" = ( @@ -49019,17 +49294,15 @@ dir = 9 }, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/starboard/aft) "nOb" = ( -/obj/machinery/pdapainter/engineering, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/requests_console/auto_name/directional/north, -/obj/effect/mapping_helpers/requests_console/assistance, -/obj/effect/mapping_helpers/requests_console/supplies, -/obj/effect/mapping_helpers/requests_console/information, -/obj/effect/mapping_helpers/requests_console/announcement, -/turf/open/floor/iron, -/area/station/command/heads_quarters/ce) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "nOg" = ( /obj/structure/table, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -49128,10 +49401,9 @@ /turf/open/floor/iron/vaporwave, /area/station/service/barber) "nPC" = ( -/obj/machinery/shieldgen, -/obj/machinery/light/warm/directional/north, -/turf/open/floor/engine, -/area/station/engineering/main) +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, +/area/station/construction) "nPK" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -49144,7 +49416,7 @@ /obj/effect/landmark/atmospheric_sanity/ignore_area, /obj/effect/landmark/navigate_destination/autoname, /turf/open/floor/plating, -/area/station/construction) +/area/station/maintenance/department/engine) "nPM" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/components/tank/oxygen{ @@ -49201,16 +49473,11 @@ /turf/open/floor/plating, /area/station/maintenance/aft) "nQK" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, +/obj/item/kirbyplants/random, /obj/machinery/firealarm/directional/north, /obj/machinery/camera/autoname/engineering/directional/north, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/hallway) +/turf/open/floor/iron/grimy, +/area/station/tcommsat/computer) "nQV" = ( /obj/structure/sign/flag/nanotrasen/directional/north, /obj/structure/ladder, @@ -49526,10 +49793,10 @@ /turf/open/floor/engine, /area/station/science/ordnance/storage) "nWj" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/keycard_auth/directional/west, -/turf/open/floor/iron, -/area/station/command/heads_quarters/ce) +/obj/effect/spawner/random/burgerstation/loot, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "nWn" = ( /turf/closed/wall/rust, /area/station/maintenance/starboard/aft) @@ -49702,12 +49969,8 @@ /turf/open/floor/catwalk_floor, /area/station/engineering/atmos/hallway) "nYS" = ( -/obj/machinery/light/warm/directional/east, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/main) +/turf/closed/wall/rust, +/area/station/maintenance/gag_room) "nYT" = ( /obj/machinery/door/airlock/public/glass{ name = "Medbay Access"; @@ -49726,16 +49989,18 @@ /turf/open/floor/iron/white, /area/station/science/xenobiology) "nYZ" = ( -/obj/structure/closet/wardrobe/white, -/obj/item/reagent_containers/blood/random, -/obj/item/reagent_containers/blood/random, -/obj/item/reagent_containers/blood/random, -/obj/item/reagent_containers/blood/random, -/obj/effect/mapping_helpers/broken_floor, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/cobweb, -/turf/open/floor/plating, -/area/station/maintenance/abandon_exam) +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/table, +/obj/item/storage/medkit, +/obj/effect/spawner/random/medical/minor_healing, +/obj/effect/spawner/random/medical/minor_healing, +/turf/open/floor/iron/white/corner{ + dir = 4 + }, +/area/station/medical/abandoned) "nZc" = ( /obj/structure/reagent_dispensers/plumbed{ dir = 8 @@ -49849,7 +50114,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/starboard/aft) "oaD" = ( /obj/effect/turf_decal/tile/dark, /turf/open/floor/iron, @@ -49976,9 +50241,7 @@ pixel_x = -32; pixel_y = 24 }, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, +/turf/open/floor/iron/checker, /area/station/hallway/primary/aft) "obN" = ( /obj/effect/turf_decal/tile/red/real_red, @@ -50044,9 +50307,8 @@ /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 4 }, -/obj/structure/closet/secure_closet/engineering_welding, -/obj/item/radio/intercom/directional/north, /obj/machinery/firealarm/directional/east, +/obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/engineering/hallway) "ocI" = ( @@ -50350,7 +50612,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "ofX" = ( /obj/machinery/xenoarch/digger, /obj/structure/table, @@ -50489,12 +50751,15 @@ /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/aisat_interior) "oie" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 +/obj/effect/spawner/random/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/incident_display/delam/directional/north, -/turf/open/floor/iron, -/area/station/engineering/hallway) +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "oig" = ( /obj/machinery/flasher/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, @@ -50573,7 +50838,6 @@ /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ dir = 1 }, -/obj/machinery/light/warm/directional/north, /turf/open/floor/iron, /area/station/cargo/storage) "ojH" = ( @@ -50633,7 +50897,6 @@ /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /obj/effect/turf_decal/bot, /obj/machinery/light/warm/directional/east, -/obj/structure/sign/poster/official/random/directional/east, /turf/open/floor/iron/dark/textured_large, /area/station/engineering/atmos/storage/gas) "okd" = ( @@ -50651,7 +50914,7 @@ dir = 2 }, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/starboard/aft) "oks" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/circuit, @@ -50665,6 +50928,7 @@ /area/station/common/pool) "okA" = ( /obj/machinery/firealarm/directional/north, +/obj/structure/reagent_dispensers/watertank, /turf/open/floor/iron/dark, /area/station/engineering/main) "okD" = ( @@ -50738,10 +51002,10 @@ /turf/open/floor/wood/tile, /area/station/common/pool/sauna) "olZ" = ( -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/item/radio/intercom/directional/south, +/obj/structure/cable, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "omb" = ( @@ -50832,17 +51096,12 @@ /area/station/ai_monitored/turret_protected/aisat_interior) "onf" = ( /obj/item/assembly/mousetrap/armed, +/obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/dorms) "onm" = ( -/obj/effect/mapping_helpers/apc/full_charge, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/west, -/turf/open/floor/iron/dark, -/area/station/engineering/main) +/turf/closed/wall/r_wall, +/area/station/engineering/storage/tcomms) "onn" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/engine, @@ -50870,8 +51129,9 @@ /turf/open/floor/engine/vacuum, /area/station/science/ordnance/burnchamber) "onG" = ( -/obj/machinery/light/warm/directional/west, -/obj/effect/turf_decal/delivery, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/structure/reagent_dispensers/watertank, +/obj/item/radio/intercom/directional/west, /turf/open/floor/iron/dark, /area/station/engineering/main) "onI" = ( @@ -51013,10 +51273,9 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "opZ" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/siding/dark, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/checker, /area/station/engineering/storage/tech) "oqc" = ( /obj/effect/spawner/random/trash/mess, @@ -51134,8 +51393,8 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "orJ" = ( -/obj/machinery/light/warm/directional/south, /obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/engineering/hallway) "orM" = ( @@ -51188,6 +51447,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/station/security/checkpoint/supply) "osB" = ( @@ -51407,7 +51667,7 @@ /obj/structure/disposalpipe/junction{ dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/catwalk_floor/iron, /area/station/engineering/break_room) "ovV" = ( /obj/effect/landmark/start/medical_doctor, @@ -51467,6 +51727,7 @@ "owO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/item/assembly/mousetrap/armed, /turf/open/floor/plating, /area/station/maintenance/aft) "owP" = ( @@ -51629,10 +51890,12 @@ /turf/open/floor/iron/white, /area/station/security/prison/shower) "ozl" = ( -/obj/machinery/vending/sovietsoda, -/obj/effect/decal/cleanable/cobweb, -/turf/open/floor/plating, -/area/station/maintenance/console_room) +/obj/effect/spawner/random/burgerstation/loot, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/catwalk_floor, +/area/station/maintenance/department/engine) "ozp" = ( /obj/machinery/door/airlock{ id_tag = "AuxToilet3"; @@ -51646,7 +51909,7 @@ /obj/effect/spawner/random/trash/cigbutt, /obj/effect/spawner/random/entertainment/lighter, /turf/open/floor/carpet/orange, -/area/station/engineering/lobby) +/area/station/engineering/break_room) "ozu" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 @@ -51726,6 +51989,7 @@ /obj/effect/turf_decal/stripes/line, /obj/structure/sign/delam_procedure/directional/south, /obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/effect/spawner/random/burgerstation/power, /turf/open/floor/iron/dark, /area/station/engineering/main) "oCf" = ( @@ -51802,12 +52066,11 @@ /turf/open/floor/wood, /area/station/service/library/abandoned) "oDq" = ( -/obj/structure/table, -/obj/item/stack/rods/fifty, -/obj/item/stack/sheet/iron/fifty, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron/dark, -/area/station/engineering/main) +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/checker, +/area/station/hallway/secondary/exit) "oDv" = ( /obj/structure/extinguisher_cabinet/directional/west, /obj/structure/table/wood, @@ -51976,9 +52239,7 @@ dir = 8 }, /obj/machinery/status_display/evac/directional/west, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, +/turf/open/floor/iron/checker, /area/station/hallway/primary/port) "oFD" = ( /obj/effect/turf_decal/tile/purple{ @@ -52222,9 +52483,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/light/warm/directional/west, /obj/structure/disposalpipe/segment, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, +/turf/open/floor/iron/checker, /area/station/hallway/primary/central/aft) "oIv" = ( /obj/structure/cable, @@ -52272,7 +52531,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/structure/tank_dispenser/oxygen, /turf/open/floor/plating, -/area/station/construction) +/area/station/maintenance/department/engine) "oIY" = ( /obj/machinery/air_sensor/mix_tank{ chamber_id = "mix_sm_waste" @@ -52341,21 +52600,8 @@ /turf/open/floor/iron, /area/station/security/prison/workout) "oKj" = ( -/obj/structure/table/reinforced, -/obj/item/tank/jetpack/carbondioxide{ - pixel_x = 4; - pixel_y = -1 - }, -/obj/item/tank/jetpack/carbondioxide, -/obj/item/tank/jetpack/carbondioxide{ - pixel_x = -4; - pixel_y = 1 - }, -/obj/effect/turf_decal/siding/yellow, -/obj/machinery/firealarm/directional/west, -/obj/machinery/light_switch/directional/north, -/turf/open/floor/engine, -/area/station/engineering/storage/eva) +/turf/open/floor/glass/reinforced/scrape_below, +/area/station/medical/medbay/lobby) "oKn" = ( /obj/structure/table/wood, /obj/effect/spawner/random/clothing/bowler_or_that, @@ -52370,6 +52616,7 @@ "oKx" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible/layer1, +/obj/structure/cable/layer3, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "oKy" = ( @@ -52426,11 +52673,12 @@ /turf/open/floor/iron/dark, /area/station/common/night_club) "oKV" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/engine, -/area/station/engineering/gravity_generator) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "oLd" = ( /obj/machinery/light/small/red/directional/south, /obj/structure/closet{ @@ -52439,12 +52687,12 @@ /turf/open/floor/iron/checker, /area/station/security/evidence) "oLl" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/engineering/main) +/obj/structure/table/glass/plasmaglass, +/obj/item/melee/roastingstick, +/obj/item/storage/photo_album/ce, +/obj/item/toy/figure/ce, +/turf/open/floor/glass/reinforced/plasma, +/area/station/command/heads_quarters/ce) "oLm" = ( /obj/effect/landmark/start/station_engineer, /turf/open/floor/iron/dark, @@ -52527,7 +52775,7 @@ /obj/effect/spawner/random/trash/mess, /obj/effect/spawner/random/mod/maint, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/starboard/aft) "oMR" = ( /obj/machinery/firealarm/directional/east, /obj/structure/cable, @@ -52636,7 +52884,6 @@ /turf/open/floor/iron/dark, /area/station/security/brig) "oOv" = ( -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, @@ -52712,7 +52959,7 @@ }, /obj/machinery/meter, /turf/open/floor/catwalk_floor, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "oPE" = ( /obj/machinery/photocopier, /turf/open/floor/wood/parquet, @@ -52730,6 +52977,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/decal/cleanable/cobweb, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/plating, /area/station/maintenance/port/aft) "oPN" = ( @@ -52793,8 +53043,17 @@ /turf/open/floor/iron, /area/station/cargo/storage) "oQV" = ( -/turf/open/floor/iron/white, -/area/station/medical/treatment_center) +/obj/structure/closet/secure_closet/engineering_personal, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/machinery/light_switch/directional/north, +/obj/machinery/camera/autoname/engineering/directional/north{ + dir = 9 + }, +/obj/machinery/light/warm/directional/north, +/turf/open/floor/iron/dark, +/area/station/engineering/storage) "oQZ" = ( /obj/effect/turf_decal/bot, /obj/machinery/airalarm/directional/south, @@ -52822,7 +53081,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "oRp" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 @@ -52964,9 +53223,7 @@ pixel_y = 24; pixel_x = 32 }, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, +/turf/open/floor/iron/checker, /area/station/hallway/primary/central/fore) "oSS" = ( /obj/effect/spawner/structure/window/reinforced, @@ -53376,8 +53633,8 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 5 +/obj/structure/disposalpipe/junction/yjunction{ + dir = 4 }, /turf/open/floor/plating, /area/station/maintenance/port/aft) @@ -53496,9 +53753,13 @@ /turf/open/floor/iron, /area/station/security/prison/workout) "pag" = ( -/obj/structure/closet/secure_closet/engineering_electrical, -/turf/open/floor/iron, -/area/station/engineering/power_station) +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/turf/open/floor/iron/dark, +/area/station/engineering/storage) "pak" = ( /obj/machinery/suit_storage_unit, /obj/effect/turf_decal/delivery, @@ -53528,8 +53789,8 @@ /obj/effect/turf_decal/siding/dark{ dir = 8 }, -/obj/structure/closet/secure_closet/engineering_welding, -/obj/machinery/airalarm/directional/east, +/obj/structure/cable, +/obj/structure/cable/layer3, /turf/open/floor/engine, /area/station/engineering/main) "paA" = ( @@ -53638,7 +53899,7 @@ /obj/effect/mapping_helpers/broken_floor, /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/plating, -/area/station/construction) +/area/station/maintenance/department/engine) "pcy" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/effect/turf_decal/tile/yellow/fourcorners, @@ -53792,6 +54053,7 @@ /obj/machinery/door/airlock/grunge, /obj/effect/mapping_helpers/airlock/autoname, /obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/service/crematorium, /turf/open/floor/plating, /area/station/maintenance/coffin_supply) "peq" = ( @@ -53834,7 +54096,6 @@ /obj/effect/turf_decal/tile/yellow{ dir = 1 }, -/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/engineering/hallway) "pfC" = ( @@ -54181,19 +54442,16 @@ /turf/open/floor/plating, /area/station/maintenance/night_club) "pkz" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/junction/flip{ - dir = 4 +/obj/effect/turf_decal/stripes/line{ + dir = 9 }, /turf/open/floor/iron/dark, -/area/station/engineering/gravity_generator) +/area/station/engineering/storage/eva) "pkC" = ( /obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable, /obj/effect/mapping_helpers/apc/full_charge, /obj/effect/mapping_helpers/apc/cell_10k, +/obj/structure/cable, /turf/open/floor/catwalk_floor, /area/station/engineering/supermatter) "pkE" = ( @@ -54316,11 +54574,11 @@ /turf/open/floor/plating, /area/station/medical/treatment_center) "plU" = ( -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/abandoned, -/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, /turf/open/floor/plating, -/area/station/maintenance/abandon_exam) +/area/station/medical/abandoned) "pmb" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -54358,6 +54616,7 @@ "pmn" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/layer_manifold/purple/visible, +/obj/structure/cable/layer3, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "pms" = ( @@ -54394,10 +54653,6 @@ "pmz" = ( /turf/closed/wall, /area/station/commons/dorms) -"pmQ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/iron/dark, -/area/station/tcommsat/computer) "pmR" = ( /obj/structure/rack, /obj/effect/spawner/random/techstorage/medical_all, @@ -54473,13 +54728,9 @@ /turf/open/floor/iron, /area/station/cargo/office) "pol" = ( -/obj/machinery/requests_console/auto_name/directional/north, -/obj/effect/mapping_helpers/requests_console/assistance, -/obj/effect/mapping_helpers/requests_console/announcement, -/obj/effect/mapping_helpers/requests_console/information, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/mapping_helpers/requests_console/supplies, -/turf/open/floor/iron/grimy, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/tcommsat/computer) "poo" = ( /obj/structure/cable, @@ -54491,7 +54742,7 @@ }, /obj/item/wrench, /turf/open/floor/catwalk_floor, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "poJ" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -54526,14 +54777,12 @@ /turf/open/floor/iron/dark, /area/station/service/library/private) "poT" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 5 +/obj/machinery/recharge_station, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 }, -/turf/open/floor/iron, -/area/station/engineering/power_station) +/turf/open/floor/iron/dark, +/area/station/engineering/storage) "pph" = ( /obj/machinery/status_display/evac/directional/north, /obj/effect/landmark/start/hangover, @@ -54965,12 +55214,11 @@ /turf/open/floor/plating/rust/moonstation, /area/moonstation/surface) "pvF" = ( -/obj/effect/spawner/random/medical/memeorgans, -/obj/structure/closet/crate/freezer/surplus_limbs, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/random/medical/organs, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/blobstart, /turf/open/floor/plating, -/area/station/maintenance/abandon_exam) +/area/station/medical/abandoned) "pvJ" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 @@ -54993,6 +55241,9 @@ /area/station/security/warden) "pvR" = ( /obj/item/radio/intercom/directional/east, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, /turf/open/floor/iron/white, /area/station/hallway/secondary/exit) "pvZ" = ( @@ -55012,8 +55263,9 @@ dir = 1 }, /obj/machinery/computer/security/telescreen/entertainment/directional/south, +/obj/machinery/camera/autoname/engineering/directional/south, /turf/open/floor/carpet/orange, -/area/station/engineering/lobby) +/area/station/engineering/break_room) "pwm" = ( /obj/effect/turf_decal/siding/blue{ dir = 4 @@ -55063,19 +55315,18 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "pwG" = ( -/obj/item/radio/intercom/directional/west, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 +/obj/machinery/camera/autoname/engineering/directional/north{ + dir = 9 }, -/turf/open/floor/iron/dark, -/area/station/engineering/main) +/obj/structure/rack/shelf, +/obj/effect/spawner/random/techstorage/tcomms_all, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/engineering/storage/tcomms) "pwJ" = ( /obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/visible, /turf/open/floor/catwalk_floor, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "pwK" = ( /turf/open/floor/iron/dark, /area/station/security/checkpoint/science/research) @@ -55171,11 +55422,11 @@ /turf/open/floor/wood/parquet, /area/station/security/brig/entrance) "pyi" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/storage/eva) +/obj/structure/cable, +/obj/machinery/atmospherics/components/binary/valve/layer2, +/obj/machinery/atmospherics/components/binary/valve/layer4, +/turf/open/floor/plating, +/area/station/construction) "pyn" = ( /obj/machinery/computer/records/medical{ dir = 4 @@ -55190,7 +55441,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/delivery, /turf/open/floor/plating, -/area/station/construction) +/area/station/maintenance/department/engine) "pyO" = ( /obj/machinery/airalarm/directional/north, /turf/open/floor/engine, @@ -55255,16 +55506,12 @@ /turf/closed/wall, /area/station/security/brig/entrance) "pzz" = ( -/obj/structure/railing/corner/end{ - dir = 4 - }, -/obj/structure/railing/corner/end/flip{ +/obj/effect/turf_decal/tile/blue, +/obj/effect/decal/cleanable/greenglow/filled, +/turf/open/floor/iron/white/corner{ dir = 8 }, -/obj/structure/rack, -/obj/effect/spawner/random/mod/maint, -/turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/medical/abandoned) "pzA" = ( /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -55293,7 +55540,7 @@ dir = 1 }, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "pzQ" = ( /obj/structure/chair/plastic{ name = "the most uncomfortable chair in the world"; @@ -55518,7 +55765,7 @@ pixel_y = -40; pixel_x = -32 }, -/turf/open/floor/iron/dark/corner, +/turf/open/floor/iron/checker, /area/station/hallway/primary/central/fore) "pDM" = ( /obj/machinery/door/airlock/maintenance, @@ -55659,9 +55906,15 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "pFh" = ( -/obj/effect/spawner/random/trash/garbage, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/obj/machinery/airalarm/directional/south, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/engine_smes) "pFj" = ( /obj/effect/spawner/random/engineering/tracking_beacon, /obj/machinery/holopad/secure, @@ -55939,7 +56192,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "pJo" = ( /obj/structure/table/wood, /obj/machinery/fax/auto_name, @@ -56059,7 +56312,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/starboard/aft) "pLt" = ( /obj/machinery/light/floor, /turf/open/floor/catwalk_floor/colony_fabricator, @@ -56086,7 +56339,7 @@ /obj/effect/spawner/random/burgerstation/atmos, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, -/area/station/construction) +/area/station/maintenance/department/engine) "pLL" = ( /turf/closed/wall, /area/station/cargo/storage) @@ -56117,10 +56370,11 @@ /turf/open/floor/wood/tile, /area/station/hallway/secondary/recreation) "pMk" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk, -/turf/open/floor/iron/dark, -/area/station/engineering/gravity_generator) +/obj/machinery/suit_storage_unit/engine, +/obj/effect/turf_decal/siding/yellow, +/obj/machinery/light_switch/directional/west, +/turf/open/floor/engine, +/area/station/engineering/storage/eva) "pMp" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/random/vending/colavend, @@ -56222,10 +56476,11 @@ /turf/open/floor/iron/dark, /area/station/security/office) "pND" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/closet/secure_closet/engineering_welding, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/tcommsat/computer) "pNG" = ( /turf/open/misc/moonstation_sand, /area/station/terminal/tramline) @@ -56360,14 +56615,9 @@ /turf/open/floor/wood, /area/station/service/library/abandoned) "pPG" = ( -/obj/effect/turf_decal/siding/dark_green{ - dir = 1 - }, -/obj/machinery/airalarm/directional/south, -/obj/effect/mapping_helpers/airalarm/tlv_no_checks, -/obj/machinery/telecomms/broadcaster/preset_right, -/turf/open/floor/circuit/green/telecomms/mainframe, -/area/station/tcommsat/server) +/obj/effect/spawner/random/structure/shipping_container, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "pPL" = ( /obj/effect/turf_decal/sand/plating, /obj/machinery/power/colony_wind_turbine, @@ -56403,7 +56653,7 @@ /turf/open/floor/iron/white, /area/station/science/research) "pQb" = ( -/obj/effect/turf_decal/delivery, +/obj/effect/spawner/random/burgerstation/odd, /turf/open/floor/plating, /area/station/maintenance/aft) "pQk" = ( @@ -56428,17 +56678,21 @@ /turf/open/indestructible/boss, /area/lavaland/underground) "pQr" = ( -/obj/machinery/firealarm/directional/north, -/obj/machinery/computer/monitor, -/obj/structure/cable, -/turf/open/floor/catwalk_floor/iron, -/area/station/engineering/power_station) +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/storage) "pQs" = ( /obj/effect/turf_decal/siding/dark{ dir = 4 }, /obj/structure/closet/radiation, /obj/structure/extinguisher_cabinet/directional/west, +/obj/structure/disposalpipe/segment, /turf/open/floor/engine, /area/station/engineering/main) "pQu" = ( @@ -56498,11 +56752,22 @@ /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) "pRM" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 +/obj/effect/decal/cleanable/crayon{ + icon_state = "n"; + pixel_x = -11; + pixel_y = 8 }, -/turf/open/floor/iron, -/area/station/hallway/primary/central/fore) +/obj/effect/decal/cleanable/crayon{ + icon_state = "i"; + pixel_y = 8 + }, +/obj/effect/decal/cleanable/crayon{ + icon_state = "s"; + pixel_x = 10; + pixel_y = 7 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "pRN" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -56549,11 +56814,15 @@ /turf/open/floor/iron/dark, /area/station/common/night_club) "pTi" = ( -/obj/effect/turf_decal/caution, -/obj/machinery/light/small/red/directional/south, -/obj/effect/turf_decal/stripes/line, +/obj/machinery/power/smes/engineering, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/full, +/obj/machinery/firealarm/directional/north, +/obj/machinery/camera/autoname/engineering/directional/north{ + dir = 9 + }, /turf/open/floor/engine, -/area/station/engineering/gravity_generator) +/area/station/engineering/engine_smes) "pTm" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 @@ -56572,14 +56841,18 @@ /turf/open/floor/iron, /area/station/engineering/atmos/control_center) "pTy" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 8 +/obj/effect/decal/cleanable/crayon{ + icon_state = "p"; + pixel_x = -8; + pixel_y = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 10 +/obj/effect/decal/cleanable/crayon{ + icon_state = "e"; + pixel_y = 8; + pixel_x = 8 }, -/turf/open/floor/iron, -/area/station/engineering/break_room) +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "pTA" = ( /turf/open/floor/carpet, /area/station/command/heads_quarters/hos) @@ -56608,6 +56881,9 @@ /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/iron, /area/station/cargo/lobby) "pTZ" = ( @@ -56667,15 +56943,14 @@ /turf/open/floor/wood, /area/station/commons/lounge) "pUT" = ( -/obj/structure/frame/computer{ - anchored = 1; - dir = 4 - }, /obj/effect/turf_decal/siding/wood, /obj/effect/mapping_helpers/broken_floor, /obj/structure/sign/poster/random/directional/south, +/obj/structure/showcase/fakeid{ + dir = 4 + }, /turf/open/floor/wood, -/area/station/maintenance/console_room) +/area/moonstation/surface/unexplored) "pUU" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -56721,9 +56996,7 @@ dir = 8 }, /obj/machinery/firealarm/directional/west, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, +/turf/open/floor/iron/checker, /area/station/hallway/primary/central/fore) "pVd" = ( /obj/structure/railing/corner/end{ @@ -56735,7 +57008,7 @@ /obj/effect/decal/cleanable/greenglow/filled, /obj/effect/spawner/random/structure/steam_vent, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "pVg" = ( /turf/closed/indestructible/riveted/boss/see_through, /area/lavaland/underground) @@ -56750,14 +57023,12 @@ /turf/open/floor/iron/white, /area/station/medical/surgery) "pVl" = ( -/obj/machinery/light/warm/directional/south, -/obj/effect/turf_decal/siding/yellow{ - dir = 1 - }, -/obj/structure/tank_dispenser/oxygen, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/engine, -/area/station/engineering/storage/eva) +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/checker, +/area/station/hallway/primary/aft) "pVt" = ( /obj/effect/turf_decal/tile/brown/half/contrasted, /obj/structure/throwing_wheel, @@ -56949,7 +57220,8 @@ /obj/effect/turf_decal/siding/dark{ dir = 8 }, -/obj/structure/closet/secure_closet/engineering_electrical, +/obj/machinery/airalarm/directional/north, +/obj/item/kirbyplants/random, /turf/open/floor/engine, /area/station/engineering/main) "pYo" = ( @@ -57211,12 +57483,9 @@ /turf/open/floor/iron/checker, /area/station/hallway/secondary/exit/departure_lounge) "qbW" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/storage/eva) +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/construction) "qbX" = ( /obj/effect/turf_decal/tile/blue/half/contrasted, /obj/effect/turf_decal/trimline/white/arrow_ccw, @@ -57312,11 +57581,15 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, -/obj/item/kirbyplants/random, +/obj/structure/bed/dogbed{ + name = "Gravity's Bed" + }, +/mob/living/basic/ant{ + name = "Gravity" + }, +/obj/effect/mapping_helpers/mob_buckler, /turf/open/floor/wood, -/area/station/engineering/lobby) +/area/station/engineering/break_room) "qcW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -57405,8 +57678,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/engineering/gravity_generator) +/obj/effect/landmark/start/station_engineer, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/engineering/storage/eva) "qdL" = ( /obj/machinery/door/airlock/maintenance_hatch, /obj/structure/disposalpipe/segment{ @@ -57546,6 +57820,7 @@ dir = 1 }, /obj/structure/extinguisher_cabinet/directional/east, +/obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) "qge" = ( @@ -57578,14 +57853,11 @@ /turf/open/floor/wood, /area/station/command/meeting_room) "qgB" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 8 +/obj/effect/turf_decal/tile/yellow{ + dir = 4 }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/engineering/storage/eva) +/turf/open/floor/iron/checker, +/area/station/hallway/primary/aft) "qgI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -57618,6 +57890,7 @@ /obj/machinery/duct, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/purple/diagonal_centre, /turf/open/floor/iron/white, /area/station/science/xenobiology) "qgU" = ( @@ -57757,6 +58030,8 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/engineering/supermatter/room) "qiD" = ( @@ -57802,11 +58077,13 @@ /turf/open/floor/wood, /area/station/commons/lounge) "qiY" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/closet/secure_closet/medical1, -/obj/structure/sign/poster/random/directional/east, +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, -/area/station/maintenance/abandon_exam) +/area/station/medical/abandoned) "qja" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -57833,13 +58110,12 @@ /turf/open/floor/engine, /area/station/engineering/atmos/project) "qjD" = ( -/obj/structure/extinguisher_cabinet/directional/south, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/tcommsat/computer) +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/random/structure/crate_loot, +/obj/machinery/light_switch/directional/south, +/turf/open/floor/iron, +/area/station/cargo/warehouse) "qjG" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 @@ -57907,7 +58183,7 @@ /obj/effect/spawner/random/burgerstation/table, /obj/item/radio/intercom/directional/north, /turf/open/floor/plating, -/area/station/construction) +/area/station/maintenance/department/engine) "qkB" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -58071,6 +58347,7 @@ /obj/effect/mapping_helpers/airlock/welded, /obj/structure/cable, /obj/structure/barricade/wooden/crude, +/obj/machinery/door/firedoor, /turf/open/floor/plating, /area/station/maintenance/gamer_lair) "qnm" = ( @@ -58090,13 +58367,11 @@ /turf/open/floor/circuit/telecomms, /area/station/ai_monitored/turret_protected/ai) "qny" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/siding/dark, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/checker, /area/station/engineering/storage/tech) "qnD" = ( /obj/machinery/light/warm/directional/west, @@ -58191,6 +58466,7 @@ name = "Research Division Access" }, /obj/effect/mapping_helpers/airlock/unres, +/obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/station/science/research) "qpx" = ( @@ -58331,7 +58607,7 @@ /area/station/science/ordnance) "qsC" = ( /obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron/dark/corner, +/turf/open/floor/iron/checker, /area/station/hallway/primary/port) "qsW" = ( /obj/structure/table, @@ -58456,7 +58732,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/starboard/aft) "qup" = ( /obj/effect/turf_decal/siding/dark, /obj/structure/table/wood, @@ -58536,7 +58812,7 @@ name = "External Public Airlock" }, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/starboard/aft) "qvz" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark, @@ -58996,10 +59272,17 @@ /turf/open/misc/asteroid/basalt/lava_land_surface, /area/ruin/unpowered/ash_walkers) "qAr" = ( -/obj/effect/spawner/random/trash/mess, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, -/area/station/maintenance/abandon_exam) +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/chair/office/light{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron/white/corner{ + dir = 4 + }, +/area/station/medical/abandoned) "qAB" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 @@ -59085,16 +59368,7 @@ }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/engine, -/area/station/construction) -"qBd" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/construction) +/area/station/maintenance/department/engine) "qBf" = ( /turf/closed/wall/rust, /area/station/maintenance/port/aft) @@ -59144,7 +59418,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /obj/structure/disposalpipe/segment, -/turf/open/floor/iron, +/turf/open/floor/iron/checker, /area/station/hallway/primary/port) "qBS" = ( /obj/machinery/airalarm/directional/north, @@ -59354,12 +59628,15 @@ /turf/open/floor/iron/dark, /area/station/security/brig) "qFS" = ( -/obj/structure/disposalpipe/segment, +/obj/machinery/power/terminal{ + dir = 1 + }, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/engineering/storage) +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/engineering/engine_smes) "qFU" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -59376,16 +59653,10 @@ /turf/open/floor/plating/rust/moonstation, /area/moonstation/underground) "qGx" = ( -/obj/machinery/door/window/left/directional/west, -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/iron/dark, -/area/station/engineering/break_room) +/obj/structure/cable, +/obj/structure/cable/layer3, +/turf/open/floor/engine, +/area/station/engineering/engine_smes) "qGG" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/junction{ dir = 8 @@ -59517,6 +59788,15 @@ }, /turf/open/floor/iron/dark, /area/station/security/brig) +"qHW" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/foam, +/area/station/maintenance/evac_maintenance) "qIb" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 @@ -59554,7 +59834,6 @@ "qIt" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/item/radio/intercom/directional/south, /turf/open/floor/iron, /area/station/engineering/storage_shared) "qIP" = ( @@ -59644,7 +59923,7 @@ "qKq" = ( /obj/machinery/atmospherics/components/binary/pump/on/supply/visible/layer4, /turf/open/floor/catwalk_floor, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "qKt" = ( /obj/structure/chair{ dir = 1 @@ -59817,6 +60096,7 @@ "qNr" = ( /obj/structure/extinguisher_cabinet/directional/west, /obj/effect/turf_decal/delivery, +/obj/item/radio/intercom/directional/north, /turf/open/floor/iron, /area/station/cargo/storage) "qNw" = ( @@ -59952,6 +60232,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance_hatch, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/security/checkpoint/supply) "qQd" = ( @@ -60156,6 +60437,7 @@ /obj/machinery/light_switch/directional/south, /obj/structure/table/wood, /obj/machinery/digital_clock/directional/east, +/obj/effect/spawner/random/entertainment/plushie, /turf/open/floor/wood, /area/station/commons/dorms/room4) "qSC" = ( @@ -60178,6 +60460,7 @@ "qSN" = ( /obj/machinery/libraryscanner, /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/sign/poster/random/directional/north, /turf/open/floor/iron/grimy, /area/station/service/library/abandoned) "qSP" = ( @@ -60201,7 +60484,7 @@ /obj/machinery/meter, /obj/machinery/atmospherics/pipe/smart/manifold4w/pink/visible, /turf/open/floor/catwalk_floor, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "qTp" = ( /obj/structure/toilet/greyscale{ dir = 4 @@ -60219,11 +60502,12 @@ /turf/open/floor/wood, /area/station/command/heads_quarters/nt_rep) "qTw" = ( -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ +/obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/iron/dark, -/area/station/engineering/storage/eva) +/obj/structure/closet/secure_closet/engineering_electrical, +/turf/open/floor/plating, +/area/station/construction) "qTx" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 @@ -60242,21 +60526,8 @@ /turf/open/floor/iron, /area/station/cargo/warehouse) "qTH" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering/glass{ - name = "Telecommunications Lobby" - }, -/obj/effect/landmark/navigate_destination/tcomms, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, -/obj/effect/mapping_helpers/airlock/access/any/command/general, -/turf/open/floor/iron/dark, -/area/station/tcommsat/computer) +/turf/closed/wall/r_wall/rust, +/area/station/maintenance/department/engine) "qTR" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -60809,7 +61080,6 @@ /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/random/structure/crate_loot, -/obj/machinery/light_switch/directional/south, /obj/machinery/camera/autoname/security/directional/south, /turf/open/floor/iron, /area/station/cargo/warehouse) @@ -61296,12 +61566,14 @@ /turf/open/floor/grass, /area/station/service/hydroponics/garden) "rhR" = ( -/obj/effect/mapping_helpers/broken_floor, -/obj/effect/spawner/random/trash/grille_or_waste, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/aft) "rhT" = ( /obj/effect/turf_decal/tile/brown/anticorner/contrasted, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/cargo/lobby) "rhX" = ( @@ -61505,17 +61777,15 @@ /turf/open/floor/wood, /area/station/security/courtroom) "rkW" = ( -/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, -/obj/structure/cable, -/obj/machinery/door/airlock/engineering/glass{ - name = "Telecommunications" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ +/obj/effect/turf_decal/siding/dark{ dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/tcommsat/computer) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/engine_smes) "rlf" = ( /obj/machinery/door/airlock/public/glass{ name = "Prison Work Room" @@ -61604,11 +61874,15 @@ /turf/open/floor/iron/white, /area/station/medical/cryo) "rlU" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) +/obj/structure/table, +/obj/effect/spawner/random/engineering/toolbox, +/obj/effect/spawner/random/engineering/flashlight, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/construction) "rlV" = ( /obj/structure/railing{ dir = 4 @@ -61661,10 +61935,12 @@ /area/station/security/brig) "rmG" = ( /obj/effect/mapping_helpers/broken_floor, -/obj/structure/sign/departments/telecomms/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plating, /area/station/maintenance/port/aft) "rmH" = ( @@ -61677,18 +61953,17 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos/asteroid) "rmL" = ( -/obj/effect/mapping_helpers/airlock/access/all/engineering/engine_equipment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, +/obj/structure/cable, /obj/machinery/door/airlock/engineering/glass{ - name = "Engineering Storage" + name = "Telecommunications" }, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment, -/obj/effect/landmark/navigate_destination/autoname, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark/side, -/area/station/engineering/storage) +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/tcommsat/computer) "rmR" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -61741,18 +62016,25 @@ /turf/open/floor/iron/dark, /area/station/science/genetics) "rnD" = ( -/obj/effect/spawner/random/trash/graffiti, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) -"rnF" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/start/station_engineer, +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/holopad, -/obj/structure/disposalpipe/segment{ - dir = 5 +/obj/structure/cable/layer3, +/turf/open/floor/catwalk_floor, +/area/station/engineering/engine_smes) +"rnF" = ( +/obj/structure/window/spawner/directional/east{ + name = "BREAK GLASS IN CASE OF EMERGENCY" }, -/turf/open/floor/iron/dark, -/area/station/tcommsat/computer) +/obj/effect/spawner/random/structure/table_fancy, +/obj/item/grenade/clusterbuster/metalfoam{ + pixel_x = -4 + }, +/obj/machinery/light/small/red/dim/directional/north, +/turf/open/floor/plating, +/area/station/engineering/main) "rnG" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -61815,10 +62097,9 @@ /area/station/commons/lounge) "rot" = ( /obj/effect/mapping_helpers/broken_floor, -/obj/machinery/light_switch/directional/west, /obj/item/assembly/mousetrap/armed, /turf/open/floor/plating, -/area/station/construction) +/area/station/maintenance/department/engine) "roJ" = ( /obj/machinery/light_switch/directional/east, /obj/structure/dresser, @@ -61838,14 +62119,16 @@ /turf/open/floor/iron/grimy, /area/station/security/detectives_office) "roW" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ +/obj/structure/chair/office{ dir = 8 }, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/engineering/hallway) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/start/telecomms_specialist, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/grimy, +/area/station/tcommsat/computer) "roX" = ( /obj/effect/turf_decal/siding/wideplating_new/dark/corner{ dir = 1 @@ -61955,14 +62238,13 @@ /turf/open/floor/plating, /area/station/maintenance/department/engine) "rqG" = ( -/obj/item/rwd/loaded, -/obj/structure/cable, -/obj/structure/extinguisher_cabinet/directional/west, -/obj/machinery/power/terminal{ - dir = 1 +/obj/effect/landmark/start/station_engineer, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 }, -/turf/open/floor/catwalk_floor, -/area/station/engineering/power_station) +/obj/machinery/newscaster/directional/west, +/turf/open/floor/iron/dark, +/area/station/engineering/storage) "rqN" = ( /obj/effect/spawner/random/burgerstation/atmos, /turf/open/floor/iron/dark, @@ -62020,10 +62302,14 @@ /turf/open/floor/iron/dark/corner, /area/station/hallway/secondary/command) "rsq" = ( -/obj/structure/barricade/wooden, -/obj/structure/fake_stairs/wood/directional/east, -/turf/open/floor/plating, -/area/station/maintenance/console_room) +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/structure/noticeboard/ce{ + pixel_y = 32 + }, +/turf/open/floor/iron, +/area/station/engineering/hallway) "rsA" = ( /obj/machinery/door/airlock/public{ name = "Prison Showers" @@ -62055,9 +62341,6 @@ /turf/open/floor/iron/dark, /area/station/security/brig/entrance) "rsV" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 10 - }, /obj/structure/closet/emcloset, /turf/open/floor/wood/tile, /area/station/hallway/primary/aft) @@ -62249,7 +62532,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, -/area/station/construction) +/area/station/maintenance/department/engine) "rwb" = ( /obj/machinery/door/airlock/external{ name = "Escape Pod Three"; @@ -62511,12 +62794,10 @@ /turf/closed/wall/r_wall, /area/station/command/heads_quarters/hop) "rzQ" = ( -/obj/structure/cable, -/obj/machinery/power/terminal{ - dir = 1 - }, -/turf/open/floor/catwalk_floor, -/area/station/engineering/power_station) +/obj/effect/landmark/start/station_engineer, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/dark, +/area/station/engineering/storage) "rzW" = ( /obj/structure/sign/poster/official/random/directional/south, /obj/structure/table/wood, @@ -62588,7 +62869,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/simple/supply/visible, /turf/open/floor/catwalk_floor, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "rBb" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -62691,9 +62972,11 @@ /turf/open/floor/pod, /area/station/cargo/miningfoundry/event_protected) "rBR" = ( -/obj/structure/closet/radiation, -/turf/open/floor/iron/dark, -/area/station/engineering/gravity_generator) +/obj/machinery/suit_storage_unit/engine, +/obj/effect/turf_decal/siding/yellow, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/engine, +/area/station/engineering/storage/eva) "rBY" = ( /obj/machinery/light/warm/directional/south, /obj/effect/turf_decal/tile/red/half/contrasted, @@ -62989,12 +63272,11 @@ }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/engine, -/area/station/construction) +/area/station/maintenance/department/engine) "rHr" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable, -/turf/open/floor/catwalk_floor, -/area/station/engineering/asteroid_lobby) +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark, +/area/station/commons/dorms) "rHx" = ( /obj/effect/turf_decal/tile/purple{ dir = 8 @@ -63005,12 +63287,9 @@ /turf/open/floor/plastic, /area/station/commons/public_xenoarch) "rHy" = ( -/obj/machinery/modular_computer/preset/engineering, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/main) +/obj/item/fakeartefact, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "rHz" = ( /obj/machinery/light/warm/directional/west, /obj/item/radio/intercom/directional/north, @@ -63233,10 +63512,12 @@ /turf/open/floor/iron/white, /area/station/science/genetics) "rKh" = ( -/obj/effect/spawner/random/burgerstation/loot, -/obj/effect/decal/cleanable/cobweb, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable/layer3, +/turf/open/floor/engine, +/area/station/engineering/engine_smes) "rKl" = ( /obj/effect/turf_decal/siding/dark_green{ dir = 8 @@ -63393,7 +63674,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/structure/cable, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -63410,18 +63690,14 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) "rMZ" = ( -/obj/effect/mapping_helpers/airlock/access/all/engineering/ce, -/obj/machinery/door/airlock/ce{ - name = "Chief Engineer's Office" - }, -/obj/effect/turf_decal/tile/yellow/half/contrasted, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/turf_decal/siding/white{ + dir = 4 }, -/obj/machinery/door/firedoor, -/obj/effect/landmark/navigate_destination/autoname, -/turf/open/floor/iron, -/area/station/command/heads_quarters/ce) +/turf/open/floor/iron/white, +/area/station/medical/chemistry) "rNi" = ( /obj/item/radio/intercom/directional/south, /obj/machinery/power/apc/auto_name/directional/east, @@ -63437,10 +63713,9 @@ /turf/open/floor/plating/rust/moonstation, /area/station/cargo/miningelevators) "rNo" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/siding/dark, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/checker, /area/station/engineering/storage/tech) "rNp" = ( /obj/machinery/light/small/red/directional/east, @@ -63607,16 +63882,12 @@ /turf/open/floor/wood, /area/station/command/heads_quarters/hos) "rPa" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/obj/structure/closet/secure_closet/engineering_personal, -/obj/effect/turf_decal/box/corners, -/obj/effect/turf_decal/box/corners{ +/obj/machinery/computer/monitor{ dir = 8 }, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) +/obj/structure/cable, +/turf/open/floor/catwalk_floor, +/area/station/engineering/engine_smes) "rPb" = ( /obj/machinery/power/terminal{ dir = 8 @@ -63654,11 +63925,18 @@ /obj/effect/spawner/random/trash/graffiti, /obj/machinery/light/warm/directional/west, /turf/open/floor/plating, -/area/station/construction) +/area/station/maintenance/department/engine) "rPF" = ( /obj/structure/chair/wood, /turf/open/floor/iron/grimy, /area/station/service/library) +"rPM" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/door/airlock/maintenance, +/turf/open/floor/engine, +/area/station/maintenance/department/engine) "rQs" = ( /turf/open/floor/iron/dark, /area/station/engineering/rbmk2) @@ -63799,9 +64077,8 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/structure/cable, /turf/open/floor/wood, -/area/station/engineering/lobby) +/area/station/engineering/break_room) "rSH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -63892,15 +64169,15 @@ /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/aisat/teleporter) "rUh" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/table/reinforced, +/obj/item/storage/box/bodybags, +/obj/item/pen, +/obj/machinery/door/poddoor/shutters{ + id = "abandoned_medbay_shutters"; + name = "Abandoned Medbay Shutters" }, -/turf/open/floor/plating, -/area/station/maintenance/aft) +/turf/open/floor/iron, +/area/station/medical/abandoned) "rUw" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -63920,15 +64197,16 @@ /turf/open/floor/plating, /area/station/maintenance/department/public_mining) "rUJ" = ( -/obj/structure/window/reinforced/spawner/directional/south, -/obj/structure/disposaloutlet{ - dir = 4 +/obj/item/kirbyplants/random, +/mob/living/basic/parrot/poly{ + name = "Mono" }, -/obj/structure/disposalpipe/trunk{ - dir = 4 +/obj/item/radio/intercom/command/directional/north, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 }, -/turf/open/floor/iron/dark, -/area/station/engineering/break_room) +/turf/open/floor/iron, +/area/station/command/heads_quarters/ce) "rVe" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 5 @@ -64015,8 +64293,6 @@ /area/station/cargo/office) "rWi" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "rWk" = ( @@ -64052,6 +64328,7 @@ /obj/machinery/light_switch/directional/south, /obj/structure/table/wood, /obj/machinery/digital_clock/directional/east, +/obj/effect/spawner/random/entertainment/plushie, /turf/open/floor/wood, /area/station/commons/dorms/room3) "rWv" = ( @@ -64143,6 +64420,7 @@ /obj/structure/table/wood, /obj/machinery/light_switch/directional/north, /obj/machinery/digital_clock/directional/west, +/obj/effect/spawner/random/entertainment/plushie, /turf/open/floor/wood, /area/station/commons/dorms/room2) "rYk" = ( @@ -64604,21 +64882,12 @@ /turf/open/floor/plating/rust/moonstation, /area/moonstation/surface) "sfE" = ( -/obj/structure/table/reinforced, -/obj/item/clothing/shoes/magboots{ - pixel_x = 4; - pixel_y = -3 - }, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots{ - pixel_x = -4; - pixel_y = 3 +/obj/effect/turf_decal/stripes/line{ + dir = 5 }, -/obj/effect/turf_decal/siding/yellow, -/obj/machinery/airalarm/directional/east, -/obj/structure/extinguisher_cabinet/directional/north, -/turf/open/floor/engine, -/area/station/engineering/storage/eva) +/obj/structure/closet/secure_closet/engineering_welding, +/turf/open/floor/plating, +/area/station/construction) "sfJ" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ @@ -64774,7 +65043,7 @@ /obj/structure/table/wood/poker, /obj/effect/spawner/random/entertainment/deck, /turf/open/floor/carpet/orange, -/area/station/engineering/lobby) +/area/station/engineering/break_room) "shs" = ( /obj/effect/turf_decal/tile/red/half/contrasted, /obj/structure/extinguisher_cabinet/directional/south, @@ -64968,12 +65237,15 @@ }, /area/station/hallway/secondary/exit) "skr" = ( -/obj/structure/table/glass/plasmaglass, -/obj/item/paper_bin, -/obj/item/pen, -/obj/item/hand_labeler, -/turf/open/floor/glass/reinforced/plasma, -/area/station/command/heads_quarters/ce) +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "sks" = ( /mob/living/carbon/human/species/monkey, /obj/structure/flora/bush/fullgrass/style_random, @@ -65154,7 +65426,9 @@ /obj/effect/decal/cleanable/dirt, /obj/item/radio/intercom/directional/south, /obj/machinery/camera/autoname/mine/directional/east, -/turf/open/floor/iron, +/turf/open/floor/iron/dark/side{ + dir = 6 + }, /area/station/cargo/miningdock) "smS" = ( /obj/machinery/vending/autodrobe, @@ -65186,12 +65460,13 @@ /turf/open/floor/iron/dark, /area/station/security/interrogation) "snB" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/engineering/main) +/obj/machinery/light/warm/directional/south, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/engineering/storage/tcomms) "snF" = ( /obj/structure/table/wood, /obj/machinery/fax/auto_name, @@ -65403,9 +65678,7 @@ /obj/effect/turf_decal/tile/holiday/rainbow/half/contrasted{ dir = 1 }, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, +/turf/open/floor/iron/checker, /area/station/hallway/secondary/exit) "sql" = ( /obj/structure/cable, @@ -65503,9 +65776,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, +/turf/open/floor/iron/checker, /area/station/hallway/primary/central/aft) "srC" = ( /obj/effect/turf_decal/tile/holiday/rainbow/anticorner/contrasted{ @@ -65675,7 +65946,7 @@ }, /obj/effect/turf_decal/delivery, /turf/open/floor/iron, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "stD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -65843,6 +66114,13 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/commons/lounge) +"svT" = ( +/obj/effect/spawner/random/maintenance, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/evac_maintenance) "svZ" = ( /obj/machinery/light/warm/directional/north, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -65926,7 +66204,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "sxi" = ( /obj/machinery/seed_extractor, /obj/effect/turf_decal/tile/green/half/contrasted{ @@ -65941,12 +66219,11 @@ /turf/open/floor/wood/parquet, /area/station/commons/lounge) "sxN" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/siding/dark{ dir = 1 }, /obj/structure/sign/warning/secure_area/directional/north, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/checker, /area/station/engineering/storage/tech) "sxT" = ( /obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2{ @@ -66020,6 +66297,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible/layer1, +/obj/machinery/firealarm/directional/south, /turf/open/floor/engine, /area/station/engineering/main) "syE" = ( @@ -66415,7 +66693,6 @@ /turf/open/floor/plating/rust/moonstation, /area/station/commons/public_mining) "sEn" = ( -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor/iron_dark, @@ -66468,14 +66745,14 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos/storage/gas) "sFq" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/tcommsat/computer) +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/engineering/storage/tcomms) "sFA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -66629,9 +66906,12 @@ /turf/open/floor/iron/dark, /area/station/security/brig) "sHG" = ( -/obj/machinery/holopad, -/turf/open/floor/iron/white, -/area/station/medical/treatment_center) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "sHH" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -66737,10 +67017,9 @@ /obj/structure/chair/sofa/corner/brown{ dir = 8 }, -/obj/machinery/camera/autoname/engineering/directional/east, /obj/machinery/newscaster/directional/east, /turf/open/floor/carpet/orange, -/area/station/engineering/lobby) +/area/station/engineering/break_room) "sJh" = ( /obj/structure/railing/corner/end/flip{ dir = 8 @@ -66835,7 +67114,7 @@ /obj/effect/turf_decal/stripes/line, /obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/engine, -/area/station/construction) +/area/station/maintenance/department/engine) "sKV" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -66876,9 +67155,7 @@ pixel_y = 24; pixel_x = 32 }, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, +/turf/open/floor/iron/checker, /area/station/hallway/primary/aft) "sLA" = ( /obj/machinery/light/small/red/directional/east, @@ -66898,6 +67175,11 @@ }, /turf/open/floor/catwalk_floor, /area/station/engineering/supermatter/room) +"sMg" = ( +/obj/structure/sign/warning/vacuum/external/directional/north, +/obj/effect/spawner/random/burgerstation/loot, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) "sMm" = ( /obj/effect/turf_decal/siding/dark{ dir = 1 @@ -66926,6 +67208,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/duct, +/obj/effect/turf_decal/tile/purple/diagonal_centre, /turf/open/floor/iron/white, /area/station/science/xenobiology) "sMA" = ( @@ -66942,10 +67225,24 @@ /turf/open/floor/iron, /area/station/science/ordnance/testlab) "sMI" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor/iron, -/area/station/engineering/power_station) +/obj/structure/rack, +/obj/item/clothing/suit/hooded/wintercoat/engineering, +/obj/item/clothing/suit/hooded/wintercoat/engineering, +/obj/item/clothing/suit/hooded/wintercoat/engineering, +/obj/item/clothing/mask/gas{ + pixel_x = 2; + pixel_y = -2 + }, +/obj/item/clothing/mask/gas{ + pixel_x = 2; + pixel_y = -2 + }, +/obj/item/clothing/mask/gas{ + pixel_x = 2; + pixel_y = -2 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/tcommsat/computer) "sMM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/holopad, @@ -67208,7 +67505,16 @@ }, /obj/machinery/space_heater, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) +"sQz" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/white/corner{ + dir = 8 + }, +/area/station/medical/abandoned) "sQK" = ( /obj/structure/stone_tile/block, /obj/structure/stone_tile{ @@ -67369,6 +67675,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/light/floor, /turf/open/floor/iron/dark, /area/station/engineering/main) "sSy" = ( @@ -67426,7 +67733,7 @@ pixel_x = 32; pixel_y = -40 }, -/turf/open/floor/iron/dark/corner, +/turf/open/floor/iron/checker, /area/station/hallway/primary/starboard) "sTm" = ( /obj/structure/rack, @@ -67705,10 +68012,12 @@ /turf/open/floor/wood/tile, /area/station/common/pool/sauna) "sXm" = ( -/obj/effect/turf_decal/tile/brown/half/contrasted{ +/obj/effect/turf_decal/tile/brown{ dir = 1 }, -/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, /turf/open/floor/iron, /area/station/cargo/storage) "sXs" = ( @@ -67796,14 +68105,9 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) "sZb" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/item/kirbyplants/random, -/obj/machinery/computer/security/telescreen/ce{ - pixel_y = 28 - }, -/mob/living/basic/parrot/poly{ - name = "Mono" - }, +/obj/machinery/pdapainter/engineering, +/obj/machinery/newscaster/directional/north, +/obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/station/command/heads_quarters/ce) "sZh" = ( @@ -67922,16 +68226,8 @@ /turf/open/floor/catwalk_floor, /area/station/maintenance/pool_maintenance) "taT" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 6 - }, -/obj/machinery/button/door/directional/north{ - id = "qm_warehouse"; - name = "Warehouse Shutters Control"; - pixel_x = 8; - req_access = list("shipping") - }, -/obj/item/kirbyplants/random, +/obj/machinery/materials_market, +/obj/effect/turf_decal/siding/dark, /turf/open/floor/engine, /area/station/cargo/storage) "tbd" = ( @@ -67958,11 +68254,11 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/central) "tbD" = ( -/obj/machinery/computer/security/telescreen/engine{ - pixel_y = 32 +/obj/item/toy/plush/lizard_plushie/green{ + name = "Hides-In-Maint" }, -/turf/open/floor/iron/dark, -/area/station/engineering/main) +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "tbH" = ( /obj/effect/turf_decal/trimline/red/filled/warning{ dir = 4 @@ -68111,10 +68407,12 @@ /area/station/medical/pharmacy) "tdl" = ( /obj/structure/sign/poster/random/directional/north, -/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/plating, /area/station/maintenance/port/aft) "tds" = ( @@ -68394,6 +68692,12 @@ /obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/port) +"thN" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "thP" = ( /obj/effect/spawner/random/trash/grille_or_waste, /turf/open/floor/plating/lavaland_atmos, @@ -68477,7 +68781,7 @@ pixel_x = 32; pixel_y = -40 }, -/turf/open/floor/iron/dark/corner, +/turf/open/floor/iron/checker, /area/station/hallway/primary/aft) "tiG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -68487,7 +68791,7 @@ dir = 9 }, /obj/effect/spawner/random/decoration/glowstick, -/turf/open/floor/plating, +/turf/open/floor/plating/foam, /area/station/maintenance/evac_maintenance) "tiI" = ( /obj/effect/spawner/random/decoration/glowstick, @@ -68561,14 +68865,15 @@ /turf/open/floor/plating/rust/moonstation, /area/moonstation/surface) "tjR" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 10 +/obj/machinery/door/airlock/external/glass{ + name = "External Public Airlock" }, -/turf/open/floor/catwalk_floor/iron, -/area/station/engineering/hallway) +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/construction) "tjU" = ( /obj/item/radio/intercom/directional/south, /turf/open/floor/carpet/purple, @@ -68667,13 +68972,14 @@ /turf/open/floor/engine, /area/station/engineering/supermatter) "tlH" = ( -/obj/effect/turf_decal/siding/dark, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/iron/grimy, -/area/station/tcommsat/computer) +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "tlL" = ( /obj/machinery/atmospherics/pipe/smart/simple/violet/visible{ dir = 9 @@ -68717,6 +69023,7 @@ /turf/open/lava/smooth/lava_land_surface, /area/ruin/unpowered/ash_walkers) "tme" = ( +/obj/machinery/power/emitter, /obj/machinery/light/warm/directional/west, /turf/open/floor/engine, /area/station/engineering/main) @@ -69085,10 +69392,13 @@ /turf/open/floor/catwalk_floor/rust/moonstation, /area/moonstation/surface) "trx" = ( +/obj/structure/sign/poster/random/directional/east, +/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/engine, -/area/station/engineering/gravity_generator) +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/station/maintenance/department/engine) "trT" = ( /obj/machinery/light_switch/directional/north, /turf/open/floor/carpet/purple, @@ -69135,6 +69445,7 @@ /obj/effect/mapping_helpers/airlock/access/any/service/library, /obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, /obj/effect/mapping_helpers/airlock/unres, +/obj/machinery/door/firedoor, /turf/open/floor/plating, /area/station/maintenance/port) "tsP" = ( @@ -69406,7 +69717,6 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/command/nuke_storage) "twX" = ( -/obj/machinery/light/warm/directional/south, /obj/machinery/conveyor{ dir = 8; id = "QMLoad" @@ -69429,9 +69739,9 @@ "txl" = ( /obj/machinery/power/apc/auto_name/directional/west, /obj/effect/mapping_helpers/apc/full_charge, -/obj/structure/cable, /obj/machinery/camera/autoname/engineering/directional/west, /obj/effect/mapping_helpers/apc/cell_10k, +/obj/structure/cable, /turf/open/floor/catwalk_floor, /area/station/engineering/supermatter/room) "txm" = ( @@ -69460,8 +69770,13 @@ /turf/open/floor/carpet, /area/station/service/chapel) "txL" = ( -/turf/closed/wall, -/area/station/engineering/gravity_generator) +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/structure/cable, +/obj/structure/cable/layer3, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "txO" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light/small/directional/north, @@ -69470,6 +69785,12 @@ "txR" = ( /turf/open/floor/carpet/cyan, /area/station/command/heads_quarters/cmo) +"txU" = ( +/obj/machinery/atmospherics/components/tank/air, +/obj/effect/turf_decal/delivery, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/iron/dark, +/area/station/maintenance/aft) "txV" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt/dust, @@ -69572,6 +69893,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/start/botanist, /turf/open/floor/grass, /area/station/service/hydroponics) "tzr" = ( @@ -69642,11 +69964,9 @@ /turf/open/floor/iron, /area/station/security/prison/workout) "tAr" = ( -/obj/effect/turf_decal/box/corners{ - dir = 1 - }, -/turf/open/floor/engine, -/area/station/engineering/gravity_generator) +/obj/effect/spawner/random/burgerstation/power, +/turf/open/floor/catwalk_floor, +/area/station/maintenance/department/engine) "tAw" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -69704,6 +70024,7 @@ dir = 3 }, /obj/effect/landmark/start/chief_engineer, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet/orange, /area/station/command/heads_quarters/ce) "tBN" = ( @@ -69804,7 +70125,7 @@ pixel_x = 32; pixel_y = 32 }, -/turf/open/floor/iron/dark/corner, +/turf/open/floor/iron/checker, /area/station/hallway/primary/central/fore) "tCI" = ( /obj/effect/turf_decal/tile/green/half/contrasted{ @@ -69929,6 +70250,9 @@ dir = 4 }, /obj/machinery/camera/autoname/engineering/directional/north, +/obj/effect/turf_decal/caution{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/emitter) "tEa" = ( @@ -70223,7 +70547,7 @@ }, /obj/structure/cable, /turf/open/floor/catwalk_floor, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "tIi" = ( /obj/machinery/door/airlock/public/glass, /obj/machinery/door/firedoor, @@ -70424,21 +70748,27 @@ /turf/closed/wall/rust, /area/station/maintenance/space_hut) "tKK" = ( -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted, -/turf/open/floor/iron/dark, -/area/station/engineering/storage/eva) +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/closet/toolcloset, +/turf/open/floor/plating, +/area/station/construction) "tKS" = ( -/obj/machinery/firealarm/directional/east, -/obj/item/kirbyplants/random, -/obj/machinery/camera/autoname/engineering/directional/east, /obj/structure/cable, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/tcommsat/computer) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/checker, +/area/station/hallway/primary/aft) "tKU" = ( -/obj/effect/turf_decal/box/corners, +/obj/structure/cable, +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/engine, -/area/station/engineering/gravity_generator) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/engineering/engine_smes) "tKV" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -70465,23 +70795,16 @@ "tLd" = ( /obj/structure/table/wood, /obj/effect/spawner/random/decoration/ornament, -/obj/effect/spawner/random/entertainment/plushie, /obj/structure/cable, /obj/machinery/newscaster/directional/south, /obj/machinery/light/small/directional/south, /turf/open/floor/carpet/purple, /area/station/commons/dorms/room1) "tLe" = ( -/obj/effect/turf_decal/caution{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/engine, -/area/station/engineering/gravity_generator) +/obj/effect/spawner/random/burgerstation/loot, +/obj/structure/disposalpipe/segment, +/turf/open/floor/catwalk_floor, +/area/station/maintenance/department/engine) "tLf" = ( /turf/open/floor/wood/parquet, /area/station/command/heads_quarters/hop) @@ -70501,6 +70824,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/cargo/lobby) +"tLW" = ( +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) "tMa" = ( /obj/structure/ladder, /obj/effect/turf_decal/stripes/box, @@ -70520,7 +70847,7 @@ /obj/effect/spawner/random/maintenance, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "tMk" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/yellow/warning, @@ -70667,7 +70994,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "tOa" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, @@ -70732,11 +71059,15 @@ /turf/open/floor/iron/dark, /area/station/security/checkpoint/science/research) "tPl" = ( -/obj/machinery/newscaster/directional/west, -/obj/machinery/light/warm/directional/west, -/obj/structure/closet/secure_closet/engineering_electrical, -/turf/open/floor/iron, -/area/station/engineering/power_station) +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/obj/machinery/requests_console/auto_name/directional/west, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/effect/mapping_helpers/requests_console/information, +/turf/open/floor/iron/dark, +/area/station/engineering/storage) "tPv" = ( /obj/structure/chair/sofa/corp/right{ dir = 4 @@ -70879,11 +71210,14 @@ /turf/open/floor/iron, /area/station/engineering/storage_shared) "tRw" = ( -/obj/item/assembly/mousetrap/armed{ - dir = 4 +/obj/effect/turf_decal/tile/brown/fourcorners, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Cargo Lobby" }, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/cargo/lobby) "tRy" = ( /obj/structure/railing/corner/end{ dir = 4 @@ -70946,18 +71280,15 @@ /turf/open/floor/plating, /area/station/maintenance/starboard) "tSl" = ( -/obj/machinery/door/airlock/maintenance_hatch, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/firedoor, /turf/open/floor/plating, -/area/station/engineering/gravity_generator) +/area/station/maintenance/port/aft) "tSt" = ( /obj/effect/turf_decal/trimline/dark/filled/warning{ dir = 4 @@ -71150,10 +71481,10 @@ /turf/open/floor/carpet/purple, /area/station/command/heads_quarters/hop) "tVi" = ( -/obj/structure/table, -/obj/item/paper_bin, +/obj/structure/tank_dispenser/oxygen, +/obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, -/area/station/engineering/break_room) +/area/station/engineering/storage/eva) "tVj" = ( /obj/effect/spawner/random/burgerstation/loot, /obj/structure/sign/warning/secure_area/directional/north, @@ -71262,17 +71593,16 @@ }, /obj/effect/landmark/blobstart, /turf/open/floor/catwalk_floor, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "tXq" = ( /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/structure/cable, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ name = "Power Monitoring" }, /turf/open/floor/iron/dark/side, -/area/station/engineering/power_station) +/area/station/engineering/storage) "tXv" = ( /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) @@ -71407,17 +71737,15 @@ /turf/open/floor/wood, /area/station/security/courtroom) "tZx" = ( -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/engineering/ce, -/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/turf_decal/siding/dark, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 5 }, -/turf/open/floor/plating, -/area/station/command/heads_quarters/ce) +/turf/open/floor/iron/grimy, +/area/station/tcommsat/computer) "tZE" = ( /obj/effect/mapping_helpers/broken_floor, /obj/effect/spawner/random/trash/moisture, @@ -71523,17 +71851,15 @@ /turf/open/floor/catwalk_floor, /area/station/maintenance/pool_maintenance) "uaM" = ( -/obj/structure/closet/secure_closet/engineering_personal, -/obj/machinery/light_switch/directional/north, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/obj/effect/turf_decal/box/corners{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/power/terminal{ dir = 8 }, -/obj/effect/turf_decal/box/corners, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/tcommsat/computer) "uaR" = ( /obj/machinery/computer/cryopod/directional/east, /obj/machinery/time_clock/directional/south, @@ -71590,8 +71916,10 @@ /turf/open/floor/iron/white, /area/station/science/lab) "ubL" = ( -/obj/structure/railing, -/obj/effect/spawner/random/trash/moisture_trap, +/obj/effect/mapping_helpers/broken_floor, +/obj/item/assembly/mousetrap/armed{ + dir = 8 + }, /turf/open/floor/plating, /area/station/maintenance/aft) "ubP" = ( @@ -71665,11 +71993,12 @@ /obj/structure/sign/painting/parting{ pixel_y = -32 }, -/obj/structure/chair/sofa/middle/brown{ +/obj/structure/chair/sofa/left/brown{ dir = 1 }, +/obj/machinery/light/no_nightlight/directional/south, /turf/open/floor/carpet/orange, -/area/station/engineering/lobby) +/area/station/engineering/break_room) "udp" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 @@ -72210,12 +72539,23 @@ /obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"ukn" = ( +/obj/effect/turf_decal/caution/stand_clear, +/obj/effect/turf_decal/box/corners{ + dir = 1 + }, +/obj/effect/turf_decal/box/corners{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/emitter) "ukp" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, /obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible/layer1, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable/layer3, /turf/open/floor/iron/dark, /area/station/engineering/main) "ukt" = ( @@ -72252,18 +72592,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/ai_monitored/command/storage/eva) -"uly" = ( -/obj/machinery/newscaster/directional/north, -/obj/structure/closet/secure_closet/engineering_personal, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/obj/effect/turf_decal/box/corners{ - dir = 8 - }, -/obj/effect/turf_decal/box/corners, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) "ulD" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -72336,7 +72664,7 @@ "umE" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/wood, -/area/station/engineering/lobby) +/area/station/engineering/break_room) "umK" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -72377,7 +72705,7 @@ pixel_y = -40 }, /obj/effect/turf_decal/tile/purple/half/contrasted, -/turf/open/floor/iron/dark/corner, +/turf/open/floor/iron/checker, /area/station/hallway/secondary/exit) "unu" = ( /obj/machinery/duct, @@ -72406,8 +72734,15 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "unz" = ( -/turf/closed/wall/rust, -/area/station/construction) +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/engine, +/area/station/engineering/engine_smes) "unD" = ( /obj/structure/bodycontainer/morgue, /obj/effect/landmark/blobstart, @@ -72453,6 +72788,13 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron/dark, /area/station/hallway/primary/central/fore) +"unS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, +/obj/structure/cable, +/turf/open/floor/catwalk_floor{ + initial_gas_mix = "n2=100;TEMP=80" + }, +/area/station/tcommsat/server) "unW" = ( /obj/effect/turf_decal/tile/brown/half/contrasted, /obj/machinery/firealarm/directional/south, @@ -72565,12 +72907,12 @@ /turf/open/floor/iron, /area/station/service/hydroponics) "upw" = ( -/obj/structure/cable, -/obj/structure/sign/warning/cold_temp/directional/south, -/obj/structure/sign/warning/gas_mask/directional/north, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/tcommsat/computer) +/obj/structure/closet/secure_closet/engineering_personal, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/storage) "upT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -72638,7 +72980,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "uqI" = ( /obj/structure/window/reinforced/plasma/spawner/directional/south, /obj/machinery/power/energy_accumulator/grounding_rod/anchored, @@ -72761,14 +73103,12 @@ /turf/open/floor/iron, /area/station/engineering/atmos/control_center) "usy" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/iron, -/area/station/engineering/hallway) +/obj/structure/table/wood, +/obj/item/flashlight/lamp, +/obj/effect/turf_decal/siding/dark, +/obj/item/paper/monitorkey, +/turf/open/floor/iron/grimy, +/area/station/tcommsat/computer) "usI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -72847,11 +73187,15 @@ /turf/open/floor/catwalk_floor, /area/station/maintenance/aft) "uuA" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/closet/secure_closet/chemical, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/iron, -/area/station/maintenance/abandon_exam) +/obj/effect/turf_decal/tile/blue, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white/corner{ + dir = 4 + }, +/area/station/medical/abandoned) "uuB" = ( /obj/structure/railing/corner{ dir = 1 @@ -72917,7 +73261,7 @@ location = "hall13"; name = "Pathing Navigation Beacon" }, -/turf/open/floor/catwalk_floor/iron, +/turf/open/floor/iron/checker, /area/station/hallway/primary/aft) "uvA" = ( /obj/docking_port/stationary/escape_pod, @@ -73076,13 +73420,6 @@ dir = 1 }, /area/station/hallway/primary/central/aft) -"uxS" = ( -/obj/machinery/holopad, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/landmark/event_spawn, -/turf/open/floor/iron/dark, -/area/station/engineering/storage/eva) "uxX" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -73838,7 +74175,7 @@ dir = 1 }, /turf/open/floor/catwalk_floor, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "uIm" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -73898,6 +74235,7 @@ dir = 1; id = "QMLoad2" }, +/obj/machinery/light/warm/directional/west, /turf/open/floor/iron, /area/station/cargo/storage) "uIN" = ( @@ -73962,6 +74300,10 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/rbmk2) +"uKe" = ( +/obj/structure/cable, +/turf/open/floor/catwalk_floor, +/area/station/engineering/supermatter/room) "uKl" = ( /obj/machinery/firealarm/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -74023,13 +74365,11 @@ /turf/open/floor/catwalk_floor/rust/moonstation, /area/moonstation/surface) "uLw" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plating, -/area/station/maintenance/evac_maintenance) +/area/station/maintenance/department/chapel) "uLA" = ( /obj/effect/turf_decal/trimline/dark/filled/warning{ dir = 4 @@ -74041,7 +74381,7 @@ /area/station/security/prison/upper) "uLQ" = ( /turf/open/floor/carpet/orange, -/area/station/engineering/lobby) +/area/station/engineering/break_room) "uMg" = ( /obj/effect/mapping_helpers/broken_floor, /obj/structure/sign/poster/contraband/lusty_xenomorph/directional/north, @@ -74175,7 +74515,7 @@ /obj/effect/spawner/random/burgerstation/liquid, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, -/area/station/construction) +/area/station/maintenance/department/engine) "uOy" = ( /obj/structure/table/glass, /obj/item/reagent_containers/cup/watering_can, @@ -74323,11 +74663,13 @@ /turf/open/floor/plating, /area/station/engineering/rbmk2/chamber) "uQo" = ( -/obj/machinery/power/apc/auto_name/directional/south, -/obj/machinery/announcement_system, -/obj/structure/cable, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/tcommsat/computer) +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/item/kirbyplants/random, +/obj/machinery/light_switch/directional/south, +/turf/open/floor/engine, +/area/station/engineering/engine_smes) "uQp" = ( /obj/machinery/door/airlock/mining/glass{ name = "Mining Dock" @@ -74342,12 +74684,6 @@ "uQt" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/machinery/airalarm/directional/south, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, /turf/open/floor/iron, /area/station/engineering/hallway) "uQB" = ( @@ -74448,6 +74784,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/purple/diagonal_centre, /turf/open/floor/iron/white, /area/station/science/xenobiology) "uSs" = ( @@ -74585,11 +74922,10 @@ /turf/open/floor/iron/dark, /area/station/security/prison/safe) "uUq" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/gravity_generator) +/obj/machinery/duct, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/catwalk_floor, +/area/station/maintenance/aft) "uUs" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -74617,6 +74953,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, +/obj/machinery/light/warm/directional/west, /turf/open/floor/iron/checker, /area/station/cargo/blacksmith) "uVi" = ( @@ -74796,9 +75133,7 @@ pixel_x = -32; pixel_y = 32 }, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, +/turf/open/floor/iron/checker, /area/station/hallway/primary/central/fore) "uWV" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -74910,10 +75245,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/sign/poster/random/directional/east, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/starboard/aft) "uYI" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted, -/obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, /turf/open/floor/iron, /area/station/engineering/hallway) "uYP" = ( @@ -75231,7 +75568,7 @@ dir = 1 }, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/starboard/aft) "veK" = ( /obj/structure/table/reinforced, /obj/item/tank/jetpack/carbondioxide{ @@ -75295,7 +75632,7 @@ name = "External Public Airlock" }, /turf/open/floor/plating, -/area/station/construction) +/area/station/maintenance/department/engine) "vfs" = ( /obj/machinery/door/airlock/security{ name = "Evidence Storage" @@ -75576,9 +75913,7 @@ }, /obj/machinery/light/warm/directional/west, /obj/machinery/airalarm/directional/west, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, +/turf/open/floor/iron/checker, /area/station/hallway/primary/central/fore) "vjq" = ( /obj/machinery/firealarm/directional/east, @@ -75638,11 +75973,10 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "vkz" = ( -/obj/machinery/iv_drip, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/sign/poster/random/directional/east, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, -/area/station/maintenance/abandon_exam) +/area/station/medical/abandoned) "vkA" = ( /obj/structure/chair/sofa/corp/right{ dir = 1 @@ -75916,16 +76250,10 @@ }, /area/station/commons/fitness/locker_room) "vnX" = ( -/obj/effect/turf_decal/siding/dark, -/obj/structure/sign/directions/lavaland/directional/north, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, -/area/station/hallway/secondary/exit) +/area/station/engineering/main) "vnY" = ( /obj/structure/table/reinforced, /obj/item/storage/box/syringes{ @@ -76153,7 +76481,7 @@ dir = 6 }, /turf/open/floor/engine, -/area/station/construction) +/area/station/maintenance/department/engine) "vqG" = ( /obj/effect/turf_decal/vg_decals/numbers/five, /turf/open/floor/engine/n2, @@ -76367,7 +76695,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/station/construction) +/area/station/maintenance/department/engine) "vvd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/atmos{ @@ -76549,10 +76877,9 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "vxz" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted, -/obj/structure/cable, +/obj/machinery/light/warm/directional/west, /turf/open/floor/iron/dark, -/area/station/engineering/storage/eva) +/area/station/engineering/main) "vxF" = ( /obj/machinery/newscaster/directional/west, /obj/effect/turf_decal/tile/neutral/opposingcorners, @@ -76568,7 +76895,9 @@ /obj/effect/turf_decal/caution/stand_clear, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/turf/open/floor/iron, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, /area/station/cargo/miningdock) "vxY" = ( /obj/structure/stone_tile/slab/cracked, @@ -76681,15 +77010,13 @@ /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) "vzz" = ( -/obj/machinery/suit_storage_unit/engine, -/obj/effect/turf_decal/siding/yellow{ - dir = 1 - }, -/obj/machinery/requests_console/auto_name/directional/south, -/obj/effect/mapping_helpers/requests_console/supplies, -/obj/effect/mapping_helpers/requests_console/assistance, -/obj/effect/mapping_helpers/requests_console/information, -/turf/open/floor/engine, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/delivery, +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron/dark, /area/station/engineering/storage/eva) "vzA" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, @@ -76713,18 +77040,15 @@ /turf/open/floor/plating, /area/station/command/heads_quarters/hop) "vzU" = ( -/obj/machinery/door/airlock/engineering/glass{ - name = "Power Monitoring" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment, -/obj/effect/landmark/navigate_destination/autoname, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/engineering/power_station) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/catwalk_floor, +/area/station/maintenance/aft) "vAd" = ( /obj/effect/turf_decal/trimline/blue/filled/corner, /turf/open/floor/iron/white, @@ -76744,11 +77068,9 @@ /area/station/medical/morgue/office) "vAC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/port/aft) "vAF" = ( @@ -76827,7 +77149,9 @@ /obj/structure/sign/poster/official/random/directional/north, /obj/effect/decal/cleanable/dirt, /obj/structure/closet/emcloset/anchored, -/turf/open/floor/iron, +/turf/open/floor/iron/dark/side{ + dir = 5 + }, /area/station/cargo/miningdock) "vBV" = ( /obj/structure/sign/directions/supply/directional/west{ @@ -76898,12 +77222,12 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/central/aft) "vCn" = ( -/obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/effect/mapping_helpers/airlock/access/all/security/general, /obj/effect/mapping_helpers/airlock/autoname, +/obj/machinery/door/airlock/maintenance_hatch, /turf/open/floor/plating, /area/station/security/checkpoint/customs) "vCx" = ( @@ -76984,11 +77308,15 @@ /turf/open/floor/iron/showroomfloor, /area/station/commons/dorms/laundry) "vDi" = ( -/obj/structure/sign/warning/radiation/directional/south, -/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/item/radio/intercom/directional/east, /turf/open/floor/iron/dark, -/area/station/engineering/gravity_generator) +/area/station/engineering/storage/eva) "vDs" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 4 @@ -77398,11 +77726,15 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/central/aft) "vKC" = ( -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ - dir = 8 +/obj/machinery/power/terminal{ + dir = 1 }, -/turf/open/floor/iron/dark, -/area/station/engineering/storage/eva) +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/engine, +/area/station/engineering/engine_smes) "vKD" = ( /obj/structure/railing, /obj/effect/turf_decal/caution{ @@ -77819,6 +78151,7 @@ /area/station/science/ordnance) "vRX" = ( /obj/machinery/holopad, +/obj/effect/turf_decal/tile/purple/diagonal_centre, /turf/open/floor/iron/white, /area/station/science/xenobiology) "vSa" = ( @@ -77854,7 +78187,7 @@ dir = 6 }, /turf/open/floor/catwalk_floor, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "vSC" = ( /obj/effect/spawner/random/structure/crate_loot, /obj/effect/decal/cleanable/cobweb, @@ -78097,11 +78430,12 @@ }, /area/station/hallway/secondary/recreation) "vVS" = ( -/obj/machinery/light/warm/directional/west, -/obj/machinery/power/smes/engineering, -/obj/structure/cable, -/turf/open/floor/catwalk_floor, -/area/station/tcommsat/computer) +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/mob/living/basic/pet/bumbles, +/turf/open/floor/grass, +/area/station/service/hydroponics) "vVW" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 @@ -78155,7 +78489,8 @@ /obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, /obj/machinery/camera/autoname/engineering/directional/east, -/obj/machinery/recharge_station, +/obj/item/kirbyplants/random, +/obj/item/radio/intercom/directional/south, /turf/open/floor/iron, /area/station/engineering/hallway) "vWE" = ( @@ -78331,7 +78666,7 @@ }, /obj/machinery/door/firedoor, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "vYX" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /turf/open/floor/plating, @@ -78364,7 +78699,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/iron/checker, /area/station/hallway/primary/port) "vZH" = ( /obj/machinery/space_heater, @@ -78429,8 +78764,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/checker, /area/station/engineering/storage/tech) "wat" = ( /obj/machinery/door/poddoor{ @@ -78440,14 +78774,14 @@ /turf/open/floor/engine, /area/station/engineering/main) "wau" = ( -/obj/machinery/firealarm/directional/east, /obj/effect/turf_decal/siding/dark{ dir = 8 }, -/obj/structure/reagent_dispensers/watertank, /obj/machinery/camera/autoname/engineering/directional/east{ dir = 6 }, +/obj/machinery/light/warm/directional/east, +/obj/structure/sign/warning/electric_shock/directional/east, /turf/open/floor/engine, /area/station/engineering/main) "way" = ( @@ -78495,14 +78829,14 @@ /obj/machinery/door/airlock/maintenance, /obj/structure/disposalpipe/segment, /turf/open/floor/catwalk_floor, -/area/station/maintenance/aft) +/area/station/maintenance/starboard/aft) "wbg" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/firedoor, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/starboard/aft) "wbs" = ( /obj/effect/mapping_helpers/airlock/access/all/security/brig, /obj/machinery/door/airlock/security/glass{ @@ -78568,13 +78902,13 @@ "wbS" = ( /obj/effect/spawner/random/decoration/statue, /turf/open/floor/wood, -/area/station/engineering/lobby) +/area/station/engineering/break_room) "wcq" = ( /obj/structure/extinguisher_cabinet/directional/north, /obj/structure/table, /obj/item/construction/plumbing/engineering, /turf/open/floor/wood, -/area/station/engineering/lobby) +/area/station/engineering/break_room) "wcG" = ( /obj/structure/table, /obj/effect/spawner/random/food_or_drink/cake_ingredients, @@ -78602,14 +78936,9 @@ /turf/open/floor/plating, /area/station/maintenance/evac_maintenance) "wcX" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/engine, -/area/station/engineering/gravity_generator) +/obj/structure/disposalpipe/segment, +/turf/open/floor/catwalk_floor, +/area/station/maintenance/department/engine) "wcZ" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -78618,16 +78947,14 @@ /turf/open/floor/iron/dark, /area/station/security/checkpoint/science/research) "wdf" = ( +/obj/machinery/door/airlock/engineering/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/spawner/random/maintenance, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/navigate_destination/autoname, /turf/open/floor/plating, -/area/station/maintenance/port/aft) +/area/station/construction) "wdp" = ( /obj/structure/table, /obj/item/book/manual/wiki/plumbing, @@ -78682,7 +79009,7 @@ }, /obj/machinery/light/warm/directional/west, /turf/open/floor/wood, -/area/station/engineering/lobby) +/area/station/engineering/break_room) "wdN" = ( /turf/open/floor/iron/checker, /area/station/hallway/primary/port) @@ -79047,7 +79374,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "wjb" = ( /obj/effect/mapping_helpers/airlock/access/all/security/brig, /obj/machinery/door/airlock/security/glass{ @@ -79071,12 +79398,14 @@ /turf/open/floor/plating, /area/station/maintenance/aft) "wjg" = ( -/obj/structure/table/optable, -/obj/item/circuitboard/computer/operating, -/obj/effect/spawner/random/medical/injector, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, -/area/station/maintenance/abandon_exam) +/obj/structure/table, +/obj/machinery/computer/records/medical/laptop, +/obj/effect/turf_decal/tile/blue, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/white/corner{ + dir = 4 + }, +/area/station/medical/abandoned) "wjq" = ( /obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 1 @@ -79092,7 +79421,7 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) "wjy" = ( -/turf/open/chasm/moonstation, +/turf/open/openspace/moonstation, /area/moonstation/surface) "wjz" = ( /obj/effect/spawner/random/burgerstation/loot, @@ -79187,10 +79516,12 @@ /turf/open/floor/iron/dark, /area/station/science/ordnance) "wkz" = ( -/obj/effect/mapping_helpers/broken_floor, -/obj/effect/spawner/random/burgerstation/liquid, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/closet/secure_closet/engineering_electrical, +/turf/open/floor/engine, +/area/station/engineering/engine_smes) "wkA" = ( /obj/effect/turf_decal/siding/wood/corner, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -79261,7 +79592,7 @@ /area/ruin/unpowered/ash_walkers) "wlm" = ( /obj/structure/lattice, -/turf/open/chasm/moonstation, +/turf/open/openspace/moonstation, /area/moonstation/underground) "wlB" = ( /obj/machinery/photocopier, @@ -79486,6 +79817,9 @@ /turf/open/floor/plating, /area/station/engineering/supermatter/room) "wpI" = ( +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, /turf/open/floor/iron/white, /area/station/medical/chemistry) "wpV" = ( @@ -79561,7 +79895,7 @@ /obj/effect/decal/cleanable/cobweb, /obj/item/radio/intercom/directional/north, /turf/open/floor/wood, -/area/station/maintenance/console_room) +/area/moonstation/surface/unexplored) "wrb" = ( /obj/effect/turf_decal/stripes/red/line, /obj/structure/showcase/cyborg/old{ @@ -79644,7 +79978,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/iron/dark/corner, +/turf/open/floor/iron/checker, /area/station/hallway/primary/starboard) "wsu" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, @@ -79695,11 +80029,13 @@ /turf/open/floor/iron/white, /area/station/science/ordnance/storage) "wtb" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/computer/security/telescreen/engine{ + pixel_y = 32 + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/item/grown/rockfruit, -/turf/open/floor/engine, -/area/station/engineering/gravity_generator) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "wtd" = ( /turf/open/floor/engine, /area/station/engineering/supermatter/room) @@ -79845,7 +80181,7 @@ dir = 10 }, /turf/open/floor/engine, -/area/station/construction) +/area/station/maintenance/department/engine) "wvE" = ( /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, @@ -79866,6 +80202,7 @@ /area/station/service/chapel) "wwe" = ( /obj/effect/landmark/start/chief_engineer, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet/orange, /area/station/command/heads_quarters/ce) "wwf" = ( @@ -79994,15 +80331,8 @@ /turf/open/floor/plating, /area/station/maintenance/port) "wyd" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/command/heads_quarters/ce) +/turf/closed/wall/r_wall, +/area/station/engineering/engine_smes) "wyf" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 1 @@ -80037,7 +80367,7 @@ /obj/structure/sign/warning/radiation/directional/west, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, -/area/station/construction) +/area/station/maintenance/department/engine) "wyH" = ( /obj/structure/barricade/wooden, /turf/open/misc/moonstation_rock, @@ -80056,26 +80386,18 @@ /area/station/common/wrestling/arena) "wyU" = ( /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/iron, -/area/station/engineering/hallway) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/start/telecomms_specialist, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/grimy, +/area/station/tcommsat/computer) "wyX" = ( /obj/effect/spawner/random/trash/graffiti, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "wzh" = ( -/obj/effect/mapping_helpers/broken_floor, -/obj/effect/spawner/random/trash/bacteria, -/obj/item/assembly/mousetrap/armed{ - dir = 4 - }, +/obj/effect/spawner/random/medical/patient_stretcher, /turf/open/floor/plating, /area/station/maintenance/aft) "wzy" = ( @@ -80279,17 +80601,10 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "wCP" = ( -/obj/structure/rack/shelf, -/obj/item/stock_parts/subspace/amplifier, -/obj/item/stock_parts/subspace/analyzer, -/obj/item/stock_parts/subspace/ansible, -/obj/item/stock_parts/subspace/crystal, -/obj/item/stock_parts/subspace/filter, -/obj/item/stock_parts/subspace/transmitter, -/obj/item/stock_parts/subspace/treatment, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/iron/dark, -/area/station/engineering/storage/tcomms) +/obj/effect/spawner/random/burgerstation/loot, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "wCT" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -80639,16 +80954,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/sign/poster/random/directional/west, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, +/turf/open/floor/iron/checker, /area/station/hallway/primary/central/aft) "wHe" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/airalarm/directional/south, -/mob/living/simple_animal/bot/floorbot, -/turf/open/floor/iron, -/area/station/engineering/power_station) +/obj/structure/closet/secure_closet/engineering_welding, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/machinery/incident_display/delam/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/storage) "wHo" = ( /obj/structure/stone_tile/surrounding_tile/cracked{ dir = 5 @@ -80763,10 +81076,9 @@ /turf/open/lava/smooth/lava_land_surface, /area/ruin/unpowered/ash_walkers) "wII" = ( -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/effect/spawner/random/burgerstation/loot, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) +/obj/machinery/light/warm/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "wIL" = ( /obj/effect/turf_decal/siding/blue{ dir = 1 @@ -80798,7 +81110,7 @@ /area/station/medical/medbay/lobby) "wIV" = ( /obj/structure/sign/warning/directional/south, -/turf/open/chasm/moonstation, +/turf/open/openspace/moonstation, /area/moonstation/surface) "wIW" = ( /obj/effect/turf_decal/stripes/line{ @@ -80872,10 +81184,9 @@ /turf/open/floor/carpet/purple, /area/station/command/heads_quarters/rd) "wKd" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/siding/dark/corner, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/checker, /area/station/engineering/storage/tech) "wKu" = ( /obj/structure/window/reinforced/spawner/directional/south, @@ -80915,6 +81226,7 @@ /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/cargo/lobby) "wLp" = ( @@ -80957,16 +81269,13 @@ /turf/open/floor/grass, /area/station/service/hydroponics/garden) "wMc" = ( -/obj/structure/table/wood, -/obj/machinery/microwave, -/obj/machinery/light/warm/directional/west, -/obj/effect/spawner/random/food_or_drink/donkpockets, -/obj/effect/spawner/random/food_or_drink/donkpockets, -/obj/effect/spawner/random/food_or_drink/donkpockets, -/obj/effect/spawner/random/food_or_drink/donkpockets, -/obj/structure/extinguisher_cabinet/directional/west, -/turf/open/floor/iron/grimy, -/area/station/tcommsat/computer) +/obj/machinery/keycard_auth/directional/west, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/command/heads_quarters/ce) "wMh" = ( /obj/effect/turf_decal/stripes/corner, /obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted{ @@ -80976,9 +81285,11 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/command/nuke_storage) "wMn" = ( -/obj/effect/spawner/random/trash/mess, +/obj/structure/table, +/obj/item/flashlight/lamp, +/obj/machinery/vending/wallmed/directional/west, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/medical/abandoned) "wMo" = ( /obj/effect/landmark/start/scientist, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -81172,6 +81483,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/mapping_helpers/broken_floor, /obj/machinery/light/small/directional/north, +/obj/structure/sign/poster/random/directional/north, /turf/open/floor/wood, /area/station/service/library/abandoned) "wPv" = ( @@ -81245,12 +81557,23 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/half, /area/station/cargo/storage) +"wQm" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "wQo" = ( -/obj/machinery/suit_storage_unit/engine, -/obj/effect/turf_decal/siding/yellow, -/obj/machinery/incident_display/delam/directional/north, -/turf/open/floor/engine, -/area/station/engineering/storage/eva) +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/construction) "wQJ" = ( /obj/structure/table/wood, /obj/structure/window/reinforced/spawner/directional/south, @@ -81310,7 +81633,7 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/turf/open/floor/catwalk_floor/iron, +/turf/open/floor/iron/checker, /area/station/hallway/primary/aft) "wRx" = ( /obj/machinery/light/warm/directional/south, @@ -81419,6 +81742,12 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plating, /area/station/engineering/main) "wSM" = ( @@ -81495,13 +81824,11 @@ /turf/open/floor/iron, /area/station/common/pool) "wTI" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/engineering/storage) +/obj/effect/turf_decal/tile/holiday/rainbow/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/checker, +/area/station/hallway/secondary/exit) "wTR" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/spawner/costume/nyangirl, @@ -81654,9 +81981,13 @@ /area/station/command/cc_dock) "wWs" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/tcommsat/computer) +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "wWt" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -81672,7 +82003,7 @@ }, /area/station/cargo/miningdock) "wWw" = ( -/obj/structure/girder, +/obj/effect/spawner/random/trash/grille_or_waste, /turf/open/floor/plating, /area/station/maintenance/evac_maintenance) "wWx" = ( @@ -81681,14 +82012,12 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "wWC" = ( -/obj/machinery/button/door/directional/north{ - id = "Secure Storage"; - name = "Engineering Secure Storage"; - req_access = list("engine_equip") - }, /obj/effect/turf_decal/stripes/corner{ - dir = 4 + dir = 1 }, +/obj/machinery/incident_display/delam/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/engineering/main) "wWF" = ( @@ -81781,14 +82110,12 @@ /turf/open/floor/catwalk_floor/rust, /area/station/cargo/miningelevators) "wYt" = ( -/obj/structure/disposalpipe/junction{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/engineering/storage) +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/ce) "wYv" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/extinguisher_cabinet/directional/south, @@ -82198,13 +82525,11 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, /obj/structure/disposalpipe/segment{ dir = 10 }, /turf/open/floor/wood, -/area/station/engineering/lobby) +/area/station/engineering/break_room) "xeJ" = ( /obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ @@ -82237,8 +82562,8 @@ /turf/open/floor/plating, /area/station/maintenance/starboard) "xfa" = ( -/obj/structure/rack/shelf, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cargo_shelf, /turf/open/floor/catwalk_floor/iron, /area/station/cargo/storage) "xff" = ( @@ -82307,7 +82632,7 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/item/radio/intercom/directional/north, /turf/open/floor/wood, -/area/station/maintenance/console_room) +/area/moonstation/surface/unexplored) "xfP" = ( /turf/closed/wall/rust, /area/station/commons/public_mining) @@ -82390,6 +82715,9 @@ }, /obj/structure/window/reinforced/spawner/directional/east, /obj/item/kirbyplants/random, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, /turf/open/floor/iron/white, /area/station/medical/chemistry) "xig" = ( @@ -82451,6 +82779,7 @@ /obj/structure/table/wood, /obj/machinery/light_switch/directional/north, /obj/machinery/digital_clock/directional/west, +/obj/effect/spawner/random/entertainment/plushie, /turf/open/floor/wood, /area/station/commons/dorms/room1) "xiL" = ( @@ -82487,13 +82816,10 @@ /turf/closed/wall, /area/station/maintenance/abandon_arcade) "xje" = ( +/obj/effect/spawner/random/burgerstation/liquid, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/open/floor/catwalk_floor/iron_dark, +/obj/structure/sign/poster/official/moth_delam/directional/north, +/turf/open/floor/iron/dark, /area/station/engineering/main) "xjr" = ( /obj/effect/turf_decal/siding/yellow{ @@ -82544,7 +82870,6 @@ /area/station/engineering/atmos/hallway) "xkn" = ( /obj/machinery/holopad, -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor/iron_dark, @@ -82588,8 +82913,15 @@ /turf/open/floor/plating, /area/station/cargo/miningelevators) "xlo" = ( -/turf/closed/wall, -/area/station/engineering/power_station) +/obj/machinery/door/airlock/engineering/glass{ + name = "Power Monitoring" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/machinery/door/firedoor, +/obj/effect/landmark/navigate_destination/autoname, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/engineering/storage) "xlq" = ( /obj/effect/turf_decal/trimline/yellow/filled/warning, /obj/effect/turf_decal/stripes/white/line, @@ -82666,9 +82998,12 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos/asteroid) "xmM" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/engineering/storage/tcomms) +/obj/item/radio/intercom/directional/west, +/obj/machinery/computer/message_monitor{ + dir = 4 + }, +/turf/open/floor/iron/grimy, +/area/station/tcommsat/computer) "xmP" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -82765,9 +83100,10 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "xog" = ( -/obj/effect/spawner/random/burgerstation/odd, +/obj/effect/spawner/random/burgerstation/loot, +/obj/effect/decal/cleanable/cobweb, /turf/open/floor/plating, -/area/station/construction) +/area/station/maintenance/starboard/aft) "xok" = ( /obj/machinery/portable_atmospherics/scrubber/huge/movable, /obj/effect/turf_decal/stripes/line{ @@ -82963,9 +83299,11 @@ /turf/open/floor/plating, /area/station/maintenance/starboard) "xrr" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/station/cargo/miningdock) +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/checker, +/area/station/hallway/primary/aft) "xrs" = ( /obj/structure/stone_tile/block/burnt{ dir = 4 @@ -83106,12 +83444,6 @@ /obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron/dark/corner, /area/station/common/wrestling/arena) -"xtx" = ( -/obj/item/assembly/mousetrap/armed{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) "xtC" = ( /obj/structure/table, /obj/structure/closet/mini_fridge{ @@ -83143,6 +83475,18 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/cargo/sorting) +"xuf" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/spawner/random/trash/mess, +/obj/machinery/iv_drip, +/obj/item/reagent_containers/blood/random, +/obj/structure/sign/poster/contraband/random/directional/west, +/turf/open/floor/iron/white/corner{ + dir = 8 + }, +/area/station/medical/abandoned) "xuq" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, @@ -83248,11 +83592,14 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "xvD" = ( -/obj/machinery/door/airlock/maintenance_hatch, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, -/turf/open/floor/plating, -/area/station/tcommsat/computer) +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/checker, +/area/station/hallway/primary/central/aft) "xvU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -83263,11 +83610,12 @@ /turf/closed/wall/r_wall, /area/station/maintenance/radshelter) "xwf" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, /turf/open/floor/iron/dark, -/area/station/engineering/gravity_generator) +/area/station/engineering/storage/eva) "xwk" = ( /obj/effect/turf_decal/tile/blue/anticorner/contrasted, /obj/structure/closet/crate/medical{ @@ -83301,15 +83649,12 @@ /turf/open/floor/plating, /area/station/maintenance/eva_shed) "xwn" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 }, -/obj/machinery/computer/station_alert{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) +/obj/machinery/holopad, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) "xwM" = ( /turf/open/floor/iron/large, /area/station/hallway/secondary/exit) @@ -83348,7 +83693,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/turf/open/floor/iron/dark/corner, +/turf/open/floor/iron/checker, /area/station/hallway/primary/starboard) "xxt" = ( /obj/structure/bed/double{ @@ -83522,13 +83867,12 @@ /turf/open/floor/iron, /area/station/science/robotics/lab) "xze" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/airalarm/directional/east, -/obj/machinery/vending/wardrobe/engi_wardrobe, -/obj/structure/extinguisher_cabinet/directional/south, -/obj/machinery/camera/autoname/engineering/directional/east, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/spawner/random/burgerstation/liquid, +/turf/open/floor/plating, +/area/station/construction) "xzi" = ( /obj/effect/turf_decal/tile/red/anticorner/contrasted, /obj/structure/disposalpipe/segment, @@ -83578,11 +83922,19 @@ /turf/open/floor/iron, /area/station/cargo/storage) "xzw" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/vending/tool, +/obj/structure/rack/shelf, +/obj/item/stock_parts/subspace/amplifier, +/obj/item/stock_parts/subspace/analyzer, +/obj/item/stock_parts/subspace/ansible, +/obj/item/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/transmitter, +/obj/item/stock_parts/subspace/treatment, /obj/item/radio/intercom/directional/south, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) +/obj/machinery/airalarm/directional/east, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/engineering/storage/tcomms) "xzx" = ( /obj/item/kirbyplants/random, /obj/item/radio/intercom/directional/west, @@ -83639,6 +83991,11 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/asteroid_lobby) +"xAd" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/structure/girder, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "xAp" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -83669,12 +84026,15 @@ /turf/open/floor/plating/rust/moonstation, /area/moonstation/surface) "xAB" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/camera/autoname/engineering/directional/north, -/turf/open/floor/engine, -/area/station/engineering/gravity_generator) +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/all/engineering/engine_equipment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/station/engineering/storage/eva) "xAE" = ( /obj/machinery/computer/atmos_control/nocontrol/master{ dir = 4 @@ -83748,7 +84108,7 @@ /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/catwalk_floor, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "xBn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /obj/effect/turf_decal/stripes/asteroid/line{ @@ -83848,7 +84208,6 @@ /area/station/cargo/miningdock) "xDc" = ( /obj/effect/turf_decal/stripes/line, -/obj/structure/sign/poster/random/directional/south, /obj/machinery/atmospherics/components/binary/pump/off/general/visible{ dir = 8 }, @@ -83970,12 +84329,15 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "xEo" = ( -/obj/effect/turf_decal/siding/dark, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment{ - dir = 10 + dir = 9 }, -/turf/open/floor/iron/grimy, -/area/station/tcommsat/computer) +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/department/engine) "xEs" = ( /obj/structure/bookcase/random/reference, /turf/open/floor/iron/grimy, @@ -84003,11 +84365,12 @@ /turf/open/floor/plating, /area/station/maintenance/port) "xEN" = ( -/obj/effect/turf_decal/stripes/white/line, -/obj/effect/turf_decal/trimline/yellow/filled/warning, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) +/obj/effect/turf_decal/siding/dark_green/corner{ + dir = 1 + }, +/obj/machinery/telecomms/broadcaster/preset_right, +/turf/open/floor/circuit/green/telecomms/mainframe, +/area/station/tcommsat/server) "xEQ" = ( /obj/machinery/newscaster/directional/north, /obj/machinery/firealarm/directional/east, @@ -84029,6 +84392,9 @@ "xFl" = ( /obj/machinery/vending/tool, /obj/machinery/firealarm/directional/west, +/obj/machinery/camera/autoname/engineering/directional/west{ + dir = 10 + }, /turf/open/floor/engine, /area/station/engineering/storage_shared) "xFn" = ( @@ -84173,9 +84539,11 @@ /turf/open/floor/plating, /area/station/maintenance/starboard) "xGV" = ( -/obj/effect/spawner/random/trash/bacteria, -/turf/open/floor/plating, -/area/station/maintenance/aft) +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/checker, +/area/station/hallway/primary/port) "xHc" = ( /obj/structure/stone_tile/surrounding, /obj/structure/stone_tile/center/cracked, @@ -84196,6 +84564,10 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, +/obj/machinery/button/door/directional/west{ + id = "commissary_shutters"; + name = "Commissary Shutter Control" + }, /turf/open/floor/wood, /area/station/commons/vacant_room/commissary) "xHR" = ( @@ -84337,7 +84709,7 @@ /area/station/maintenance/abandon_cafeteria) "xKj" = ( /turf/open/floor/engine, -/area/station/construction) +/area/station/maintenance/department/engine) "xKq" = ( /obj/effect/spawner/random/trash/grille_or_waste, /turf/open/floor/plating, @@ -84406,7 +84778,7 @@ }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "xLa" = ( /obj/machinery/atmospherics/components/trinary/filter/flipped{ dir = 4 @@ -84799,12 +85171,7 @@ /turf/open/floor/wood, /area/station/service/abandoned_gambling_den) "xQU" = ( -/obj/structure/closet/toolcloset, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/effect/decal/cleanable/cobweb, -/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/random/structure/grille, /turf/open/floor/plating, /area/station/maintenance/department/engine) "xRd" = ( @@ -84860,11 +85227,10 @@ /turf/open/floor/catwalk_floor, /area/station/engineering/supermatter/room) "xRx" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible/layer1, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) +/obj/machinery/suit_storage_unit/ce, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron, +/area/station/command/heads_quarters/ce) "xRU" = ( /obj/docking_port/stationary{ dir = 2; @@ -85039,10 +85405,9 @@ /turf/open/floor/iron/large, /area/station/hallway/secondary/recreation) "xUa" = ( -/obj/structure/rack, /obj/machinery/light_switch/directional/east, -/obj/effect/spawner/random/engineering/vending_restock, /obj/machinery/camera/autoname/directional/east, +/obj/machinery/power/floodlight, /turf/open/floor/iron, /area/station/commons/storage) "xUd" = ( @@ -85162,7 +85527,7 @@ /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, /turf/open/floor/plating, -/area/station/construction) +/area/station/maintenance/department/engine) "xVi" = ( /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 8 @@ -85290,10 +85655,10 @@ /turf/open/floor/iron/dark, /area/station/security/brig) "xWS" = ( -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/stripes/line, +/obj/structure/cable, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "xXf" = ( @@ -85357,8 +85722,9 @@ "xXH" = ( /obj/structure/cable, /obj/item/relic, +/obj/structure/sign/poster/random/directional/north, /turf/open/floor/catwalk_floor, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "xXL" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -85382,7 +85748,7 @@ dir = 1 }, /turf/open/floor/engine, -/area/station/construction) +/area/station/maintenance/department/engine) "xYa" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/door/window/brigdoor/left/directional/south, @@ -85397,7 +85763,7 @@ dir = 1 }, /turf/open/floor/catwalk_floor, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "xYe" = ( /obj/machinery/firealarm/directional/south, /obj/machinery/airalarm/directional/west, @@ -85418,11 +85784,11 @@ "xYJ" = ( /obj/machinery/light/warm/directional/east, /turf/open/floor/plating, -/area/station/construction) +/area/station/maintenance/department/engine) "xYR" = ( /obj/machinery/light/small/directional/west, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/starboard/aft) "xYT" = ( /obj/effect/turf_decal/tile/yellow/fourcorners, /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ @@ -85456,7 +85822,9 @@ }, /obj/structure/sign/warning/docking/directional/north, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, +/turf/open/floor/iron/dark/side{ + dir = 9 + }, /area/station/cargo/miningdock) "xZl" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -85516,7 +85884,7 @@ dir = 1 }, /turf/open/floor/wood, -/area/station/engineering/lobby) +/area/station/engineering/break_room) "xZX" = ( /obj/effect/spawner/random/trash/bin, /obj/effect/turf_decal/stripes/corner{ @@ -85529,6 +85897,9 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/structure/window/reinforced/spawner/directional/east, /obj/item/kirbyplants/random, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, /turf/open/floor/iron/white, /area/station/medical/chemistry) "yan" = ( @@ -85688,6 +86059,15 @@ }, /turf/open/floor/iron/dark, /area/station/security/prison) +"ybR" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/obj/item/kirbyplants/random, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/exit) "ybW" = ( /obj/machinery/portable_atmospherics/pump, /obj/effect/turf_decal/box/blue, @@ -85735,12 +86115,13 @@ }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, -/area/station/maintenance/aft) +/area/station/maintenance/department/engine) "ycG" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/engineering/power_station) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/engineering/storage) "ycI" = ( /turf/closed/wall/r_wall, /area/station/maintenance/starboard/fore) @@ -85820,7 +86201,7 @@ pixel_x = 32; pixel_y = -40 }, -/turf/open/floor/iron/dark/corner, +/turf/open/floor/iron/checker, /area/station/hallway/primary/starboard) "ydL" = ( /obj/structure/cable, @@ -85835,6 +86216,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/port/aft) "ydO" = ( @@ -85888,7 +86270,7 @@ "yed" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/engine, -/area/station/construction) +/area/station/maintenance/department/engine) "yee" = ( /obj/effect/mapping_helpers/airlock/unres{ dir = 1 @@ -86002,10 +86384,10 @@ /turf/closed/wall, /area/station/service/hydroponics/garden) "ygg" = ( -/obj/effect/decal/cleanable/cobweb, -/obj/effect/spawner/random/burgerstation/loot, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) +/obj/structure/extinguisher_cabinet/directional/south, +/obj/item/kirbyplants/random, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/tcommsat/computer) "ygp" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/flora/bush/fullgrass/style_random, @@ -86069,10 +86451,10 @@ /turf/open/misc/moonstation_sand, /area/moonstation/surface) "yhC" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/sign/poster/contraband/random/directional/west, -/turf/open/floor/iron, -/area/station/maintenance/abandon_exam) +/obj/structure/table/optable, +/obj/effect/spawner/random/medical/medkit, +/turf/open/floor/plating, +/area/station/medical/abandoned) "yhL" = ( /obj/structure/closet/crate/engineering{ name = "signaller crate" @@ -86349,6 +86731,9 @@ /obj/effect/spawner/random/medical/medkit, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +"ylo" = ( +/turf/closed/wall/r_wall, +/area/moonstation/underground/unexplored) "ylq" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -179873,15 +180258,15 @@ jnN jnN jnN jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +gTx +gTx +gTx +gTx +gTx +gTx +gTx +gTx +gTx jnN jnN jnN @@ -180130,15 +180515,15 @@ jnN jnN jnN jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +gTx +ahy +mpE +mpE +mpE +mpE +mpE +mpE +gTx jnN jnN jnN @@ -180387,15 +180772,15 @@ jnN jnN jnN jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +gTx +mpE +mpE +mpE +mpE +mpE +mpE +mpE +gTx jnN jnN jnN @@ -180644,15 +181029,15 @@ jnN jnN jnN jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +gTx +mpE +mpE +mpE +mpE +mpE +mpE +mpE +gTx jnN jnN jnN @@ -180901,15 +181286,15 @@ jnN jnN jnN jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +gTx +mpE +mpE +mpE +mpE +mpE +mpE +mpE +gTx jnN jnN jnN @@ -181158,15 +181543,15 @@ jnN jnN jnN jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +gTx +mpE +mpE +mpE +mpE +mpE +mpE +mpE +gTx jnN jnN jnN @@ -181415,15 +181800,15 @@ jnN jnN jnN jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +gTx +mpE +mpE +mpE +mpE +mpE +mpE +mpE +gTx jnN jnN jnN @@ -181672,15 +182057,15 @@ jnN jnN jnN jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +gTx +mpE +mpE +mpE +mpE +mpE +mpE +mpE +gTx jnN jnN jnN @@ -181929,15 +182314,15 @@ jnN jnN jnN jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +gTx +gTx +gTx +gTx +tjR +gTx +gTx +ddj +gTx jnN jnN jnN @@ -182188,13 +182573,13 @@ jnN jnN jnN jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +gTx +iEI +rYF +rYF +gTx +gTx +gTx jnN jnN jnN @@ -182445,11 +182830,11 @@ jnN jnN jnN jnN -jnN -jnN -jnN -jnN -jnN +gTx +gTx +cIA +gTx +gTx jnN jnN jnN @@ -182703,10 +183088,10 @@ jnN jnN jnN jnN -jnN -jnN -jnN -jnN +iNL +bjQ +yaG +sSg jnN jnN jnN @@ -182960,10 +183345,10 @@ jnN jnN jnN jnN -jnN -jnN -jnN -jnN +sSg +sSg +sSg +sSg jnN jnN jnN @@ -183216,11 +183601,11 @@ jnN jnN jnN jnN -jnN -jnN -jnN -jnN -jnN +sSg +sSg +sSg +sSg +sSg jnN jnN jnN @@ -183473,11 +183858,11 @@ jnN jnN jnN jnN -jnN -jnN -jnN -jnN -jnN +sSg +sSg +sSg +sSg +sSg jnN jnN jnN @@ -183729,11 +184114,11 @@ jnN jnN jnN jnN -jnN -jnN -jnN -jnN -jnN +sSg +sSg +sSg +sSg +sSg jnN jnN jnN @@ -183986,11 +184371,11 @@ jnN jnN jnN jnN -jnN -jnN -jnN -jnN -jnN +sSg +sSg +sSg +sSg +sSg jnN jnN jnN @@ -184243,11 +184628,11 @@ jnN jnN jnN jnN -jnN -jnN -jnN -jnN -jnN +sSg +sSg +sSg +sSg +sSg jnN jnN jnN @@ -184500,10 +184885,10 @@ jnN jnN jnN jnN -jnN -jnN -jnN -jnN +sSg +sSg +sSg +sSg jnN jnN jnN @@ -184757,6 +185142,10 @@ jnN jnN jnN jnN +sSg +sSg +sSg +sSg jnN jnN jnN @@ -184788,6 +185177,7 @@ jnN jnN jnN jnN +ylo jnN jnN jnN @@ -184807,13 +185197,8 @@ jnN jnN jnN jnN -jnN -jnN -jnN -jnN -jnN -"} -(129,1,2) = {" +"} +(129,1,2) = {" jnN jnN jnN @@ -185014,10 +185399,10 @@ sSg sSg sSg jnN -jnN -jnN -jnN -jnN +sSg +sSg +sSg +sSg jnN jnN jnN @@ -185272,9 +185657,9 @@ sSg sSg sSg sSg -jnN -jnN -jnN +sSg +sSg +sSg jnN jnN jnN @@ -185531,6 +185916,183 @@ sSg sSg sSg sSg +sSg +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +"} +(132,1,2) = {" +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +sSg +kJH +kJH +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +bfV +tFE +aDr +iaA +kJH +kJH +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN jnN jnN jnN @@ -185568,6 +186130,86 @@ jnN jnN jnN jnN +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN +jnN jnN jnN jnN @@ -185584,7 +186226,7 @@ jnN jnN jnN "} -(132,1,2) = {" +(133,1,2) = {" jnN jnN jnN @@ -185656,10 +186298,15 @@ jnN sSg kJH kJH +kJH sSg sSg sSg sSg +tFE +kJH +kJH +kJH sSg sSg sSg @@ -185667,15 +186314,9 @@ sSg sSg sSg sSg -sSg -sSg -sSg -sSg -bfV tFE -aDr -iaA kJH +tFE kJH jnN jnN @@ -185759,7 +186400,7 @@ sSg sSg sSg sSg -jnN +sSg jnN jnN jnN @@ -185777,6 +186418,7 @@ jnN jnN sSg sSg +tFE sSg sSg sSg @@ -185784,7 +186426,7 @@ sSg sSg sSg sSg -sSg +tFE sSg sSg sSg @@ -185841,7 +186483,7 @@ jnN jnN jnN "} -(133,1,2) = {" +(134,1,2) = {" jnN jnN jnN @@ -185911,27 +186553,27 @@ jnN jnN jnN sSg -kJH -kJH +sSg kJH sSg sSg sSg sSg -tFE +sSg +kJH +kJH +kJH kJH kJH kJH sSg sSg sSg -sSg -sSg -sSg -sSg -tFE kJH -tFE +kJH +kJH +kJH +kJH kJH jnN jnN @@ -186027,13 +186669,8 @@ jnN jnN jnN jnN -jnN -jnN -jnN -jnN sSg sSg -tFE sSg sSg sSg @@ -186041,12 +186678,17 @@ sSg sSg sSg sSg -tFE +sSg +sSg +jnN +jnN +sSg +sSg +sSg sSg sSg sSg sSg -jnN jnN jnN jnN @@ -186098,7 +186740,7 @@ jnN jnN jnN "} -(134,1,2) = {" +(135,1,2) = {" jnN jnN jnN @@ -186169,7 +186811,7 @@ jnN jnN sSg sSg -kJH +sSg sSg sSg sSg @@ -186181,8 +186823,7 @@ kJH kJH kJH kJH -sSg -sSg +kJH sSg kJH kJH @@ -186258,6 +186899,7 @@ jnN jnN jnN jnN +jnN sSg sSg sSg @@ -186272,8 +186914,6 @@ sSg sSg sSg sSg -sSg -jnN jnN jnN jnN @@ -186283,8 +186923,6 @@ jnN jnN jnN jnN -jnN -sSg sSg sSg sSg @@ -186297,6 +186935,10 @@ sSg sSg jnN jnN +jnN +jnN +jnN +jnN sSg sSg sSg @@ -186355,8 +186997,7 @@ jnN jnN jnN "} -(135,1,2) = {" -jnN +(136,1,2) = {" jnN jnN jnN @@ -186432,6 +187073,7 @@ sSg sSg sSg sSg +sSg kJH kJH kJH @@ -186439,7 +187081,6 @@ kJH kJH kJH kJH -sSg kJH kJH kJH @@ -186515,9 +187156,8 @@ jnN jnN jnN jnN -sSg -sSg -sSg +jnN +jnN sSg sSg sSg @@ -186537,9 +187177,6 @@ jnN jnN jnN jnN -jnN -sSg -sSg sSg sSg sSg @@ -186547,6 +187184,10 @@ sSg sSg sSg sSg +jnN +jnN +jnN +jnN sSg jnN jnN @@ -186554,6 +187195,8 @@ jnN jnN jnN jnN +jnN +jnN sSg sSg sSg @@ -186610,9 +187253,8 @@ jnN jnN jnN jnN -jnN "} -(136,1,2) = {" +(137,1,2) = {" jnN jnN jnN @@ -186689,6 +187331,7 @@ sSg sSg sSg sSg +sSg kJH kJH kJH @@ -186699,9 +187342,9 @@ kJH kJH kJH kJH -kJH -kJH -kJH +jnN +jnN +jnN jnN jnN jnN @@ -186784,12 +187427,8 @@ sSg sSg sSg sSg -jnN -jnN -jnN -jnN -jnN -jnN +sSg +sSg jnN jnN sSg @@ -186803,7 +187442,11 @@ jnN jnN jnN jnN -sSg +jnN +jnN +jnN +jnN +jnN jnN jnN jnN @@ -186819,8 +187462,7 @@ sSg sSg sSg sSg -jnN -jnN +sSg jnN jnN jnN @@ -186869,7 +187511,7 @@ jnN jnN jnN "} -(137,1,2) = {" +(138,1,2) = {" jnN jnN jnN @@ -186954,9 +187596,9 @@ kJH kJH kJH kJH -kJH -kJH -kJH +jnN +jnN +jnN jnN jnN jnN @@ -187038,17 +187680,14 @@ sSg sSg sSg sSg +jnN +jnN sSg sSg sSg sSg sSg sSg -jnN -jnN -sSg -sSg -sSg sSg sSg sSg @@ -187070,7 +187709,11 @@ jnN jnN jnN jnN -sSg +jnN +jnN +jnN +jnN +jnN sSg sSg sSg @@ -187124,10 +187767,8 @@ jnN jnN jnN jnN -jnN "} -(138,1,2) = {" -jnN +(139,1,2) = {" jnN jnN jnN @@ -187204,8 +187845,8 @@ sSg sSg sSg sSg -kJH -kJH +sSg +sSg kJH kJH kJH @@ -187288,13 +187929,6 @@ jnN jnN jnN jnN -sSg -sSg -sSg -sSg -sSg -sSg -sSg jnN jnN sSg @@ -187303,6 +187937,11 @@ sSg sSg sSg sSg +jnN +jnN +jnN +jnN +jnN sSg sSg sSg @@ -187329,6 +187968,11 @@ jnN jnN jnN jnN +jnN +jnN +jnN +sSg +sSg sSg sSg sSg @@ -187336,8 +187980,6 @@ sSg sSg sSg sSg -jnN -jnN jnN jnN jnN @@ -187383,7 +188025,7 @@ jnN jnN jnN "} -(139,1,2) = {" +(140,1,2) = {" jnN jnN jnN @@ -187453,16 +188095,15 @@ jnN sSg sSg sSg +kJH sSg sSg sSg sSg +tFE sSg sSg sSg -sSg -sSg -kJH kJH kJH kJH @@ -187546,7 +188187,8 @@ jnN jnN jnN jnN -sSg +jnN +jnN sSg sSg sSg @@ -187557,10 +188199,11 @@ jnN jnN jnN jnN -sSg -sSg -sSg -sSg +jnN +jnN +jnN +jnN +jnN jnN jnN jnN @@ -187638,9 +188281,8 @@ jnN jnN jnN jnN -jnN "} -(140,1,2) = {" +(141,1,2) = {" jnN jnN jnN @@ -187711,11 +188353,11 @@ sSg sSg sSg kJH +kJH sSg sSg sSg sSg -tFE sSg sSg sSg @@ -187804,8 +188446,8 @@ jnN jnN jnN jnN -sSg -sSg +jnN +jnN sSg sSg sSg @@ -187844,9 +188486,10 @@ jnN jnN jnN jnN +jnN +jnN sSg -sSg -sSg +tFE sSg sSg sSg @@ -187895,9 +188538,9 @@ jnN jnN jnN jnN -jnN "} -(141,1,2) = {" +(142,1,2) = {" +jnN jnN jnN jnN @@ -187964,13 +188607,11 @@ jnN jnN jnN jnN -sSg sSg sSg kJH kJH -sSg -sSg +kJH sSg sSg sSg @@ -188063,7 +188704,7 @@ jnN jnN jnN jnN -sSg +jnN sSg sSg jnN @@ -188104,7 +188745,8 @@ jnN jnN jnN sSg -tFE +sSg +sSg sSg sSg sSg @@ -188154,7 +188796,7 @@ jnN jnN jnN "} -(142,1,2) = {" +(143,1,2) = {" jnN jnN jnN @@ -188231,7 +188873,7 @@ sSg sSg sSg sSg -sSg +kJH kJH kJH kJH @@ -188358,7 +189000,7 @@ jnN jnN jnN jnN -jnN +sSg sSg sSg sSg @@ -188411,7 +189053,8 @@ jnN jnN jnN "} -(143,1,2) = {" +(144,1,2) = {" +jnN jnN jnN jnN @@ -188480,14 +189123,13 @@ jnN jnN jnN sSg -sSg -kJH kJH kJH sSg sSg sSg sSg +sSg kJH kJH kJH @@ -188624,7 +189266,7 @@ sSg sSg sSg sSg -sSg +jnN jnN jnN jnN @@ -188668,7 +189310,7 @@ jnN jnN jnN "} -(144,1,2) = {" +(145,1,2) = {" jnN jnN jnN @@ -188738,8 +189380,8 @@ jnN jnN jnN sSg -kJH -kJH +sSg +sSg sSg sSg sSg @@ -188872,8 +189514,7 @@ jnN jnN jnN jnN -sSg -sSg +jnN sSg sSg sSg @@ -188924,8 +189565,9 @@ jnN jnN jnN jnN +jnN "} -(145,1,2) = {" +(146,1,2) = {" jnN jnN jnN @@ -189002,7 +189644,7 @@ sSg sSg sSg sSg -kJH +sSg kJH kJH kJH @@ -189092,265 +189734,8 @@ jnN jnN jnN sSg -sSg -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -sSg -sSg -sSg -sSg -sSg -sSg -sSg -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -"} -(146,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -sSg -sSg -sSg -sSg -sSg -sSg -sSg -sSg -sSg -kJH -kJH -kJH -kJH -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -sSg -jnN -jnN +jnN +jnN jnN jnN jnN @@ -234830,7 +235215,7 @@ ckk ckk wCf kPE -bCp +nim tCA sfN tMa @@ -235378,7 +235763,7 @@ stM stM stM stM -stM +iVN stM stM stM @@ -237108,7 +237493,7 @@ hvA kmn mdn oFB -rCe +xGV rCe rCe edh @@ -237621,7 +238006,7 @@ lFb cYb bQp vZt -hvA +wdN qsC ndQ ndQ @@ -237667,9 +238052,9 @@ bzR voS vCJ wLw -xrr +aIy hLu -xrr +aIy wLw qNr qIg @@ -237927,7 +238312,7 @@ jHQ sNi lLP haP -wLw +aIy ojk qcs qcs @@ -238184,7 +238569,7 @@ mbd jJl fxN haP -wLw +aIy cRn bjf baU @@ -238704,9 +239089,9 @@ jAO dgX lhQ xlM -hwz +lhQ dgX -hwz +lhQ dgX jAO bjf @@ -238961,9 +239346,9 @@ jAO sHr lhQ lvp -hwz +lhQ fqy -hwz +lhQ fDh jAO bjf @@ -239724,7 +240109,7 @@ qqt diK hta uzQ -lOw +qqt mXD taT iOj @@ -239752,7 +240137,7 @@ lXl rdH aFl sKH -vqk +eBC rdH hZR aBd @@ -239981,9 +240366,9 @@ qqt gDc qqt ixz -qqt -lRX -iZC +lOw +mXD +mWF tgm bjf aFI @@ -240270,14 +240655,14 @@ jfS lxU rdH oPI -tRl -fQJ -sKH -tRl -sKH -sKH -sKH -qDI +awT +vDU +qDk +awT +qDk +qDk +qDk +wWs qBf wYP stM @@ -240523,10 +240908,10 @@ mOk qDk qDk oYg -sKH -sKH -cop -sKH +qDk +qDk +mOk +ndp prL lxU uVn @@ -240534,7 +240919,7 @@ kHG uVn lxU iZb -qDI +tlH qBf qBf qBf @@ -240752,8 +241137,8 @@ qqt gDc qqt ulD -qqt -lRX +qjD +mXD hRK bjf bjf @@ -240768,7 +241153,7 @@ lqe kID iMw opP -tOR +bLy rdH tNi tNi @@ -240780,19 +241165,19 @@ rdH mDA iZb tOR -itb -itb -itb -itb -itb -itb -itb -itb -itb -itb -itb -tdl +fLq +lxU +rdH +kAk +rdH +rdH +rdH +rdH +rdH +rdH rdH +tdl +fmV vZH qBf qBf @@ -240999,7 +241384,7 @@ ckk ckk ckk ckk -tAw +xrM ckk jlk jGN @@ -241036,20 +241421,20 @@ xKI rdH rdH rdH -wdf -itb -vXD -wpV -bys -hPo -oaU -hPo -clF -soY -cPE -itb +tOR +uVn +rdH +rdH +xoR +ujT +fLq +nmB +iZb +ujT +xoR +kAk qDI -jKl +oie lfd kAk ujT @@ -241294,19 +241679,19 @@ gCh sRB rdH tOR -itb -juw -tWT -pvv -hPo -dfJ -hPo -gDT -qQe +lxU +rdH +tbD pPG -itb +lxU +xoR +aBy +xoR +pTy +pPG +rdH lnh -ydN +rmG qvC rdH mJD @@ -241551,20 +241936,20 @@ rpq iIy lmb tOR -itb -pQk -mnR -mZQ -hPo -aGH -hPo -mza -xEw -sBY -itb -aFl -ydN +lZt +dlQ +xoR +xoR +lxU +ujT +kvt +fLq +pRM +xoR rdH +aFl +rmG +jTR rdH rdH xNG @@ -241808,27 +242193,27 @@ xKA gUD rdH tOR -itb -rXR -gDo -wMr -hEm -uoI -hPo -msb -pge -sBY -itb +lxU +rdH +xoR +xoR +lxU +xoR +nyN +ujT +rHy +xoR +rdH lLc -qDI +tlH mYj rdH uLd wlB pGJ xMr -xzV -xzV +iYt +iYt cZX cNU uoL @@ -242064,17 +242449,17 @@ daj daj rdH rdH -lBu +mcl +itb +itb +itb +itb +itb +itb +itb +itb +itb itb -rrc -iAL -wIn -hEm -aqx -hPo -hBO -dsK -nGf itb rdH cxW @@ -242096,7 +242481,7 @@ iBa oeX qBf qBf -qBf +jch qBf stM stM @@ -242323,18 +242708,18 @@ rdH qVN tOR itb -pQk -ilD -vML -lNl +vXD +wpV +bys +hPo fqJ -lNl -lTP -rZm -sBY +hPo +clF +soY +cPE itb -jKl -qDI +nch +cku rdH fTI pyR @@ -242580,17 +242965,17 @@ bWM sGu uIJ itb -hJa -rKl -wnp -lPu -upw -lPu -aGq -rKl -aBy +pQk +tWT +pvv +hPo +oaU +hPo +gDT +qQe +sBY itb -qDI +tlH iZb rdH qSN @@ -242837,15 +243222,15 @@ rdH jXD tOR itb -lPu -lPu -lNl -lNl -rkW -lNl -lNl -lPu -lPu +pQk +mnR +mZQ +hPo +dfJ +hPo +mza +xEw +sBY itb rmG sVs @@ -242855,8 +243240,8 @@ tXd kee uFl qbt -xzV -xzV +bao +bao rdH bML rNv @@ -243018,7 +243403,7 @@ pbU pbU pbU uWR -fnH +aaF pDK tYP bAP @@ -243092,19 +243477,19 @@ uwk xdh rdH pTI -tOR +tSl +itb +rXR +gDo +wMr +unS +aGH +hPo +msb +pge +sBY itb -czh -wMc tlH -pmQ -dCX -wWs -nby -vVS -bJB -xvD -muq vqk rdH kyH @@ -243351,24 +243736,24 @@ rdH qrm ndp itb -pol -akw -xEo -itV -ckB -cMo -rnF -klh -qjD +rrc +iAL +wIn +hEm +uoI +hPo +hBO +dsK +nGf itb -qDI -rdH +tlH +iZb rdH rdH gcM rdH rdH -pGF +dkU dkU uzs dkU @@ -243377,7 +243762,7 @@ dkU eDQ bIp nGF -xoR +ujT jfS txW gNZ @@ -243530,11 +243915,11 @@ wtN lYt fPp whB -fnH +aaF aaF wyj tAp -fnH +aaF lvs nEY nEY @@ -243564,7 +243949,7 @@ rkT rkT rkT wrJ -lEn +wVn ldH dhQ eev @@ -243606,26 +243991,26 @@ ygL pVt rdH xoe -sVs +clb itb -nCl -lOk -cIB -cAz -maI -lqM -sFq -tKS -uQo +pQk +ilD +vML +hEm +aqx +hPo +lTP +rZm +sBY itb jKl -qDI +oKV ydN -qDI -pGF -dkU -dkU -dkU +oKV +hft +wQm +vAC +bJB itb itb itb @@ -243639,7 +244024,7 @@ itb itb itb uOU -jqG +qBf rDY stM stM @@ -243821,7 +244206,7 @@ mRH lYK iCJ iCJ -iCJ +xvD buj vsH nFS @@ -243863,21 +244248,21 @@ cYP wHE rdH lBu -rdH +sVs itb -lPu -lPu -lPu -lPu +pQk +pge +pge lNl -lPu -qTH -lPu +rmL lNl +pge +pge +sBY itb -ujT -iZb -rdH +hBF +fLq +uVn lxU lxU xci @@ -244045,9 +244430,9 @@ rOk rOk rOk hak -bLh -fnH -vgd +arH +aaF +cop mDt kOS kOS @@ -244079,9 +244464,9 @@ omt tFX nDb ddG -kAg -lEn -wPD +czh +wVn +lHC emU iNB oyW @@ -244108,7 +244493,7 @@ oea dTs dxH rhT -amd +tRw wLh pTU nSw @@ -244120,25 +244505,25 @@ rdH rdH rdH tOR -rdH -clb +lxU +itb guy -wCP -tEU -rPa -oLm -hLj -mpE -lIO +rKl +wnp +fHR +juw +fHR +aGq +rKl xEN -kTl -xmp -xci -rdH -rdH -rdH -rdH -rdH +itb +lxU +wCP +itb +itb +itb +itb +itb wSI itb sWu @@ -244374,24 +244759,24 @@ rdH rdH rdH rdH -ygg -iNE -tOR -rdH -ntF -mRp +lxU +uVn +dmx +itb +itb fHR -tEU -uly -oLm -gXL -mpE -bXC -tEU -rdH -rdH -rdH -npK +fHR +lNl +lNl +iUA +lNl +lNl +fHR +fHR +onm +onm +onm +onm deg jDI pQs @@ -244400,16 +244785,16 @@ iwJ ujG uoK tJx -qUh -qUh +iMH +uKe kxC -qUh -qUh -qUh -qUh -qUh -qUh -qUh +muq +muq +muq +muq +muq +muq +muq dMy jXm xxk @@ -244620,7 +245005,7 @@ oea oea oea dTs -daJ +iju mnG pEi cgw @@ -244630,24 +245015,24 @@ qPU asm vDU qDk -mOk qDk vAC -tOR -rdH -xmM +vAC +itV +itb +cQp elF xmM -tEU +usy gcc -snQ -dFU -mpE +pol +jik +sMI jmo -tEU -rHy +ygg +onm pwG -cLy +cAz onm jFa cLy @@ -244655,20 +245040,20 @@ hDi cLy dje ify -bQG -rWi +wtd rWi +gDg rWi bQG bQG bQG bQG bQG +nur bQG bQG bQG -bQG -bQG +nur nPc wVC wVC @@ -244877,44 +245262,44 @@ lIx hZl wHW cSG -daJ +iju mnG tMF etm hZE iBW rdH -mjM -tRw -vZH -rdH -wII -kIO +eDQ +jfS +xAd +lxU +lxU +jfS gOK ibs wyU roW emr -tEU +tZx uaM -oLm -kSZ +lIO +bZR +bZR +bZR bZR -wTI -flw dik +sFq snB -snB -oLl +onm xje -aXA +ezj aXA aXA tiB ujG xFg wtd -wtd +fmB wtd wtd wtd @@ -245134,7 +245519,7 @@ sgV kwp vcv aeS -daJ +iju mnG gFg yja @@ -245142,36 +245527,36 @@ hku ciS rdH fuR +lxU rdH rdH -rdH -rdH -tZx -rdH -rdH +uVn +iNE +uVn +itb nQK -gfE +hLj gWY -tEU +kbe diP -oLm +amq jik -snQ +fqU pND -tEU -dXU +jik +onm mOc -oXq -oXq -oXq +xzw +onm +cWK oXq vpw -oXq +nbK ioc tlq fTg wtd -wtd +fmB lYW nFX fxU @@ -245200,7 +245585,7 @@ stM stM stM stM -vmO +stM vmO kUC kUC @@ -245398,37 +245783,37 @@ rdH rdH rdH rdH -mjM +eDQ +uVn rdH -mZa nWj -nch -wyd -lHC -atY -usy +lxU +ujT +lxU +itb +lNl ecN -leq -rmL -wYt -qFS +lNl gTx -bAu -xzw -tEU -oDq -jeX -jeX -jeX +gTx +gTx +gTx +gTx +gTx +gTx +onm +onm +onm +onm cWK -oXq +wII vpw -oXq +nbK lrp qNq ePl wtd -wtd +fmB tiO dNU uHs @@ -245457,7 +245842,7 @@ stM stM stM stM -vmO +stM vmO kUC kUC @@ -245656,36 +246041,36 @@ uat vdc rdH mjM -rdH +sHG nOb -wwe +oKV skr -deR -ieB -atY +jfS +xmp +mRp eAg -dFQ +fHC orJ -tEU +jCk ndJ kdQ rlU -snQ +dMh xze -fdv -grz +xze +cMo grz +rnF grz grz grz -tbD -vpw -oXq +wtb +nbK ioc lnx wtd wtd -wtd +fmB xNF hBt uHs @@ -245714,7 +246099,7 @@ stM stM stM stM -vmO +stM vmO kUC kUC @@ -245914,35 +246299,35 @@ xIl siP mJZ rdH -jpe -tBM +rdH +rdH bSc -nFp -ieB -atY -eAg -dFQ +rdH +rdH +rdH +hAD +ioa uYI -oOJ -oOJ -dBr -hAw -dBr -oOJ -oOJ +ckB +cbT +mpE +mpE +qbW +rYF +rYF +nPC +grz iHF -ruj -ruj tme +ruj grz -wWC -vpw -oXq +bVu +thN bMb ujG qDR wtd -wtd +fmB wtd uHs uHs @@ -245953,7 +246338,7 @@ uHs uHs wtd gWw -bQG +nur aly fpw gvA @@ -245971,7 +246356,7 @@ stM stM stM stM -vmO +stM vmO kUC kUC @@ -246172,34 +246557,34 @@ rdH atd rdH fMW -wwe +wMc mEV deR -ieB -rMZ -eAg -dFQ +cIB +izP +rsq +ioa dbN -oOJ -oKj -fFM -qgB -vKC -jBQ -oOJ +jCk +cbT +rYF +rYF +qbW +rYF +rYF +nPC +grz iHF ruj ruj -gOz wat -dMh -vpw +eRR nFV vjn uSo uSo xLD -wtd +fmB wtd dig fWW @@ -246210,7 +246595,7 @@ wxS dig wtd gWw -bQG +nur mEc gpn rpH @@ -246228,7 +246613,7 @@ stM stM stM stM -vmO +stM vmO vmO kUC @@ -246427,36 +246812,36 @@ rdH rdH rdH tZG -izP +rdH sZb -ieB +wwe fYk env ieB -jfJ -fbY -dFQ -dbN -oOJ +atY +eAg +fFM +jBQ +wdf wQo pyi lwK -qbW -vzz -oOJ +cjf +rYF +rYF +nPC +grz iHF wxk wxk -gOz wat -dMh -vpw +eRR fco dvy uyP kZr wtd -wtd +fmB sei vuw foh @@ -246485,7 +246870,7 @@ stM stM stM stM -vmO +stM vmO vmO kUC @@ -246686,34 +247071,34 @@ xFl moq izP lFk -qJW -fap -wDy -jRW -izP -cQp -dFQ -dbN -oOJ -iju -pyi -uxS -cEO -pVl -oOJ +tBM +msI +bAu +ieB +atY +fbY +fFM +klh +jCk +iva +rYF +rYF +rYF +rYF +rYF nPC +grz +iHF wxk wxk -dlQ wat -dMh eRR fco dvy uyP kZr wtd -wtd +fmB sei uHs uqI @@ -246726,7 +247111,7 @@ nsx fEk aHl wJK -hUV +ukn hUV cRt wRS @@ -246742,7 +247127,7 @@ stM stM stM stM -vmO +stM vmO vmO vmO @@ -246942,35 +247327,35 @@ qZh fQj odl izP -izP -rIo -rIo -rIo -izP -izP -oie -dFQ -cbT -oOJ +xRx +wwe +oLl +env +ieB +aOw +eAg +fFM +dbN +ckB bDN -bVu -lZt -vxz -cve -oOJ -gOz -gOz -gOz +rYF +rYF +rYF +rYF +rYF +nPC +grz +eDr +eDr gOz wat -dMh -vpw +eRR fco dvy uyP kZr wtd -sei +lpS sei vuw foh @@ -246983,8 +247368,8 @@ hai srP cYu aly -ekL -ekL +iYR +iYR lPP qdp qdp @@ -246999,7 +247384,7 @@ stM stM stM stM -vmO +stM vmO vmO vmO @@ -247180,8 +247565,8 @@ vCU gnH cUl obL -xmP -gpA +gXs +leq dMa sJc lgy @@ -247198,36 +247583,36 @@ gLZ gLZ gLZ qIt -bDs +izP rUJ jzf -akt +wYt akt mLe -ewL +jfJ eAg -dFQ -dbN -oOJ +fFM +kkV +jCk sfE qTw -ibe +tKK tKK gok -oOJ +gok +lOk +grz tgK xal lBY -lBY wat -dMh -vpw +eRR xmk boO uSo qaW qQW -sei +lpS wtd dig pSI @@ -247238,7 +247623,7 @@ sLA dig sei gWw -kkV +jqr bRC dTj uem @@ -247256,7 +247641,7 @@ stM stM stM stM -vmO +stM vmO vmO vmO @@ -247435,7 +247820,7 @@ jxo tNM ofn uzr -uzr +xrr lpN lpB gFt @@ -247455,36 +247840,36 @@ tRv dlr lzr iav -bDs +izP mmo -tVi -gXs -awT +qJW +fap +wDy adB -woE +izP eAg -dFQ -uYI -oOJ -oOJ -oOJ -oOJ -oOJ -oOJ -oOJ +gfE +dbN +gTx +gTx +gTx +gTx +gTx +gTx +gTx +fIA +grz qkc -fmV -eDr -eDr +dCX +lBY grz -fyF -vpw -oXq +wWC +jEA oBO ujG qDR wtd -sei +lpS wtd uHs uHs @@ -247513,7 +247898,7 @@ stM stM stM stM -vmO +stM vmO vmO vmO @@ -247692,10 +248077,10 @@ fOn wKw eAF wKw -fOn -fOn +pVl +pVl wRw -gpA +leq eIE tsw xQt @@ -247712,36 +248097,36 @@ hoV bDs bDs bDs -bDs -qGx -hft -hAD -hAD -ebL -ewL -eAg -tjR +izP +izP +rIo +rIo +rIo +izP +izP +aYX +gfE uQt -xlo +tEU gGh rqG pag tPl fjw -mBS +fdv grz grz grz grz grz -oXq -vpw -oXq +grz +vnX +nbK ioc sZP wtd wtd -sei +lpS lYW nkI uHs @@ -247770,7 +248155,7 @@ stM stM stM stM -vmO +stM vmO vmO vmO @@ -247949,8 +248334,8 @@ eNY qyk wEF uEi -uEi -oqG +dtY +qgB uvu tiE eIE @@ -247970,35 +248355,35 @@ jlc wSP ndm pZr -pTy -aLK -aLK -aLK -aLK +pZr +pZr +pZr +pZr +pZr oOv pfB -jNn -bKL +gfE +dbN edN -gGh +upw rzQ nra -dtY +snQ wHe -xlo +tEU cSx mtB mtB npK onG -oXq +vxz vpw -oXq +nbK lrp ujG lHU wtd -sei +lpS kAA jWl uHs @@ -248027,7 +248412,7 @@ stM stM stM stM -vmO +stM vmO vmO vmO @@ -248208,8 +248593,8 @@ crh mee rsV sLp -qbd -gpA +tKS +leq dMa cfs lgy @@ -248234,15 +248619,15 @@ eXq ebz pdj fHC -dFQ -bKL +gfE +uYI edN -gGh -rzQ -aOw -dtY +upw +oLm +nra +snQ cDg -xlo +tEU kYg ogP kYg @@ -248250,12 +248635,12 @@ npK okA oXq vpw -oXq +nbK ioc tlq lHU wtd -sei +lpS mcd nFX bCF @@ -248284,7 +248669,7 @@ stM stM stM stM -vmO +stM vmO vmO vmO @@ -248491,16 +248876,16 @@ hIh cSb fQs wBj -dFQ -bKL -edN -gGh -rzQ -sMI -miS +gfE +dbN +tEU +oQV +oLm +nra +snQ miS tXq -ezj +oXq xkn sEn rMJ @@ -248512,7 +248897,7 @@ kXv ujG yaL wtd -sei +lpS byr cQf cQf @@ -248541,7 +248926,7 @@ stM stM stM stM -vmO +stM vmO vmO kUC @@ -248746,23 +249131,23 @@ rSG xeE bEs xZQ -fRt +ewL czq -dFQ +gua bKL xlo pQr -dtY +dFU ycG jiF iIt -xlo +tEU iBf lrQ sSt npK vkY -nYS +txL eLh vkY ukp @@ -248798,7 +249183,7 @@ stM stM stM stM -vmO +stM vmO vmO kUC @@ -249003,17 +249388,17 @@ umE aLJ iXG mRq -fRt +woE fbY dFQ -ioa -vzU +dbN +tEU kOq poT eqH ktG mXF -xlo +tEU rQF nMr lHg @@ -249055,7 +249440,7 @@ stM stM stM stM -vmO +stM vmO vmO kUC @@ -249260,25 +249645,25 @@ uLQ uLQ uLQ bLI -fRt +woE ocA tIs vWv -txL -dnP -fKv +oOJ +oOJ +dBr dnP -mhK -mhK -mhK -mhK -mhK -mhK -mhK +dBr +oOJ +vih +vih +fNS +vih +wyd +cEO +dXU +cEO vih -xCq -xCq -xCq mpg vih afF @@ -249312,7 +249697,7 @@ stM stM stM stM -vmO +stM vmO vmO kUC @@ -249521,21 +249906,21 @@ xCq xCq lXH xCq -xCq +vih pMk pkz cgg lmC -mhK -oKV -aRl -gua -wcX +tVi +vih +tAr +eIR +vih mAy +vKC +qGx +uQo vih -rTI -aXn -wkz epQ vih oPd @@ -249569,7 +249954,7 @@ gKF stM stM stM -vmO +stM vmO vmO kUC @@ -249778,21 +250163,21 @@ xCq oTD gYD ktO -xCq +vih rBR ezL -uUq +qdJ ePm -mhK -kvt +vzz +vih tAr -gQF -kwL -bIn +eIR +vih +jpe +qFS +ebL +hoY vih -xCq -xCq -bxT iYw vih pZH @@ -249963,7 +250348,7 @@ vgo kqk ltA gHQ -cNO +ltA ltA jbw ltA @@ -250035,21 +250420,21 @@ xCq oTD pUe ktO -pFT +vih inX mvs qdJ xwf hzx -tLe -trx +vih +tAr eIR -wtb -pTi vih +pTi +unz rKh -lsK -xtx +wkz +vih gpY vih hli @@ -250220,7 +250605,7 @@ hJF hYS ltA gHQ -wTh +vVS rrl rqc wTh @@ -250292,21 +250677,21 @@ xCq fvF pUe ktO -xCq +vih eZN hpp kGT vDi -mhK +cve xAB caS gQF tKU bIn -vih +rkW rnD pFh -ila +vih dJn idq kvI @@ -250549,21 +250934,21 @@ xCq xCq quK xCq -xCq -xCq -tSl -xCq -xCq vih -ksJ +vih +vih +vih +vih +vih +vih aQr -neZ -msI -jqH +bxT vih +jqH +rPa lUo -bAK -aoY +fRt +vih oFd vih pUU @@ -250805,22 +251190,22 @@ aBA aBA aBA iXp -aBA +jNn aBA aBA asH -aBA -fqU +jeX +caS +gQF +gQF +mBS +mhK +vih +vih vih vih -mhK -mhK -mhK vih vih -xCq -bxT -xCq sCK vih jRI @@ -251066,18 +251451,18 @@ eMz eMz eMz eMz -aHP -dyQ -eVI -xCq +kMq +nFp +wcX +tLe ozl iRj -dmx xCq +fyF cKq -iVN -rnD -xCq +add +pFT +lsK sCK vih ayn @@ -251241,8 +251626,8 @@ bsQ caI iVq csS -bLh -fnH +arH +aaF azN nvq hJF @@ -251276,7 +251661,7 @@ ptx ptx lIM srx -lEn +wVn ePa naw xAV @@ -251327,15 +251712,15 @@ xCq vol xCq xCq -hoY -rsq -xCq -xCq xCq xCq xCq +maI +ntF +ryG xCq -xRx +xaq +sCK vih xnR nIN @@ -251501,7 +251886,7 @@ oSL deG aaF vyE -cTy +kTl noA cTy cTy @@ -251587,11 +251972,11 @@ wqU byi pUT xCq -xQU -xwn -add -xCq -lsK +mxO +dLf +plB +vvd +pks sCK vih fIc @@ -251758,7 +252143,7 @@ bsQ deG fJN rYW -pRM +tAp sjo fnH vZK @@ -251788,7 +252173,7 @@ rkT rkT rkT tsP -lEn +wVn ldH kBe wVn @@ -251844,11 +252229,11 @@ dEv mPG lJt xCq -mWF -iUA -ryG +gvt +gTz +eny xCq -lsK +xaq sCK vih cWe @@ -252045,7 +252430,7 @@ wGX dND dND fXn -dND +hJa iKW gWc lQu @@ -252101,11 +252486,11 @@ iCj ejF lJt xCq -mxO -dLf -plB -vvd -pks +xCq +xCq +xCq +xCq +xCq fRc vih ayn @@ -252270,7 +252655,7 @@ bsQ bsQ bsQ oSO -fnH +aaF eqv eWe tYP @@ -252358,11 +252743,11 @@ xfL ffl nml xCq -gvt -gTz -eny -xCq -aHP +rTI +aRl +aRl +aRl +aXn sCK vih nsv @@ -252608,17 +252993,17 @@ aVX hCj oZt eMz -xCq +bxT ggS xCq xCq xCq xCq xCq -xCq -xCq -xCq -xCq +xQU +xQU +xQU +xQU xCq blr vih @@ -253067,7 +253452,7 @@ xUZ frd jDQ cAp -pEY +oKj gMx aCv vkg @@ -253324,7 +253709,7 @@ xUZ frd jDQ cAp -pEY +oKj gMx lpj hvl @@ -253581,7 +253966,7 @@ xUZ frd jDQ cAp -pEY +oKj gMx qeA rdi @@ -253642,19 +254027,19 @@ hCj hCj hCj wlm -unz -unz -cku -unz +eMz +eMz +pFT +eMz eMz xCq ftr vih -pZH -pZH +vih +vih bZo -pZH -pFD +vih +qTH wYP stM stM @@ -253838,7 +254223,7 @@ xUZ frd ofS cAp -pEY +oKj knV ura vos @@ -253899,9 +254284,9 @@ vUf vUf hCj dKZ -unz +eMz iNZ -rYF +bAK rPC gKc xVh @@ -253911,7 +254296,7 @@ rvO wyw pyI uOi -cku +pFT wYP stM stM @@ -254156,19 +254541,19 @@ kqr noI fMi dKZ -cku +pFT fHf aDA gva gva wvC -qBd +hVi aDA gva dEq jVH uOi -unz +eMz wYP stM stM @@ -254413,19 +254798,19 @@ vUf vUf hCj dKZ -unz +eMz jYj xXZ xKj xKj hht -qBd +hVi xXZ xKj yed hLM kUl -cku +pFT wYP stM stM @@ -254670,19 +255055,19 @@ fos fos hCj wlm -unz +eMz fie xXZ xKj xKj hht -qBd +hVi xXZ xKj xKj hLM dad -unz +eMz wYP stM stM @@ -254927,20 +255312,20 @@ dlz dlz hCj dKZ -unz +eMz qky xXZ xKj xKj hht -qBd -xXZ +hVi +rPM xKj xKj bbx -jCk -unz -unz +xCq +eMz +eMz krx stM stM @@ -255184,8 +255569,8 @@ urk vKL fMi dKZ -cku -xog +pFT +rTI xXZ xKj xKj @@ -255441,20 +255826,20 @@ dlz dlz hCj dKZ -unz -kbe +eMz +uOi xXZ xKj xKj hht -qBd +hVi xXZ xKj xKj eCL -jCk -unz -unz +xCq +eMz +eMz rDY stM stM @@ -255646,9 +256031,9 @@ cUf bTp xNj vwm -oQV -oQV -sHG +jFm +jFm +jFm vwm xNj yln @@ -255698,19 +256083,19 @@ fos fos hCj wlm -unz +eMz uOi rHo xKj xKj hht -qBd +hVi xXZ xKj xKj hht oIX -unz +eMz wYP stM stM @@ -255955,19 +256340,19 @@ bIg bIg hCj dKZ -unz +eMz pLC rHo yed xKj hht -qBd +hVi xXZ xKj xKj hLM kUl -cku +pFT wYP stM stM @@ -256212,19 +256597,19 @@ ujm vqG fMi dKZ -cku +pFT dns qBb hvF lUt vqE -qBd +hVi epX lUt lUt dNZ dns -unz +eMz wYP stM stM @@ -256469,19 +256854,19 @@ bIg bIg hCj dKZ -unz +eMz kUl niK hXj nyZ pcw -qBd -kMq +hVi +bAK cHr xYJ ikn dns -cku +pFT wYP stM stM @@ -256726,19 +257111,19 @@ hCj hCj hCj wlm -unz -unz -cku -unz -jfW -cKG +eMz +eMz +pFT +eMz +eMz +xCq ftr -cKG -cKG -jfW +xCq +xCq +eMz vuO -unz -unz +eMz +eMz jDU stM stM @@ -256932,7 +257317,7 @@ fgf qnS vvh qrD -qrD +xwn qrD sdZ gKZ @@ -256987,12 +257372,12 @@ dKZ dKZ dKZ ltP -jfW -hPO -qFK +eMz +eVI +hVi aaZ pzI -jfW +eMz hql xmZ xmZ @@ -257244,12 +257629,12 @@ wlF hEp hEp hEp -xlH -jvi -qFK +qTH +vih +hVi hEZ -jvi -xlH +vih +qTH sHa gqG vUw @@ -257502,10 +257887,10 @@ wpf vss tqP hLS -gKw -qFK +pFT +hVi sxa -jvi +vih hvb jOF kPZ @@ -257693,7 +258078,7 @@ eUD hPq xhz wpI -jgW +rMZ wpI wpI wpI @@ -257759,10 +258144,10 @@ wzL wzL wzL vwV -jvi +vih tNY uqA -jvi +vih xFS xdR xdR @@ -258016,8 +258401,8 @@ cOM vlA wzL tIu -gKw -qFK +pFT +hVi pJe jUg jLf @@ -258273,10 +258658,10 @@ mdU cOM wzL kVM -jvi +vih jUY lVz -jvi +vih uVW xdR xdR @@ -258760,7 +259145,7 @@ dfL dfL dfL khf -xCU +ftX ona sCw xCU @@ -258787,10 +259172,10 @@ pHQ aez aAr bCy -jvi +vih mwZ xKY -cKG +xCq ivt tyA fVU @@ -259044,10 +259429,10 @@ cOM yfJ aAr jru -gKw -nOs +pFT +aoY ycC -gKw +pFT jTf fVU pRH @@ -259265,7 +259650,7 @@ aOC gbo hvk cWG -rUh +oxu sYq oxu oKF @@ -259273,8 +259658,8 @@ jvi jvi jvi jvi -ekz -xlH +jvi +jvi xUV oQZ xlH @@ -259301,10 +259686,10 @@ tXv tXv pDF dXv -jvi +vih sQw -qFK -cKG +hVi +xCq qhN tyA mdZ @@ -259523,18 +259908,18 @@ pxF qFK wsh cKG -iGh -nOs -oxu -oxu +cKG +cKG +cKG +cKG aQh -oxu -hDh +wMn +cKG pQb -xlH -xlH -xlH -xlH +jvi +jvi +jvi +jvi tus hjw bHh @@ -259543,7 +259928,7 @@ oYH cKG iGh rti -iGh +pQb xVd wBB ljs @@ -259558,10 +259943,10 @@ koD qQS aHt vvk -gKw +pFT pVd -qFK -gKw +hVi +pFT qhN tyA tyA @@ -259780,18 +260165,18 @@ mhf qFK iGh cKG +gQA +xuf +lNv +mZz +sQz +aoF cKG +noW cKG -cKG -cKG -cKG -aoF -nOs -wsh iGh -cKG iGh -nOs +cKG kln nBv ssK @@ -259801,24 +260186,24 @@ cKG noW cKG noW -jvi -jvi -jvi -jvi -jvi -jvi -jvi -jvi -jvi -jvi -jvi -jvi -jvi -jvi -jvi -nQJ -qFK -cKG +vih +vih +vih +vih +vih +vih +vih +vih +vih +vih +vih +vih +vih +vih +vih +ksJ +hVi +xCq lJe wBz wBz @@ -260035,22 +260420,22 @@ wdE eFX mhf qFK -hIs -cKG +iGh +fMh nYZ ixm yhC liY plU -oxu -oxu -gwN +ekL +rUh +sFk qzg -ghC lKm lKm +fVd +lKm lKm -lSM lKm lKm lKm @@ -260058,7 +260443,7 @@ lqv lKm dtZ iGh -cKG +xCq hBr fAS cdc @@ -260069,13 +260454,13 @@ wiV oRl jdb vYR -qzg +cNO tMf -lKm -lSM -lKm -cyS -gKw +ibe +trx +ibe +xEo +pFT vYc mqO nBm @@ -260292,22 +260677,22 @@ cKG cKG cKG qFK -nOs -cKG -cKG +hIs +vkz +ghC gkv pvF fDu -cKG -cKG -cKG -nOs +hDh +pzz +iqD +ubL qFK -cKG -iGh +nOs iGh -xob cKG +xob +nOs iGh iGh iGh @@ -260325,18 +260710,18 @@ pot xYc uIi iKs -cKG +xCq dfR -bln -bln -cKG -cKG -cKG -cKG +xaq +xaq +xCq +xCq +xCq +xCq +fte fte fte fte -iUJ iUJ iUJ vDs @@ -260544,20 +260929,20 @@ nOs csQ nIq nIq -jqr +nIq lKm akN lKm fYw -dtZ -iGh +gwN cKG +lSM ejo wjg qAr uuA +ekz cKG -ubL wzh fsy cKG @@ -260572,7 +260957,7 @@ cKG dAb mHS iGh -cKG +xCq fJJ fbf pwJ @@ -260582,11 +260967,11 @@ qTf mHP dTW mjH -cKG +xCq fFp -cKG -cKG -cKG +xCq +xCq +xCq dvu hgk tcL @@ -260594,7 +260979,7 @@ dPI iqg gSV bWh -uOQ +nYS wYP stM stM @@ -260801,21 +261186,21 @@ ybt lkx aUm bln -cKG +wsh pxG dvx -wMn -wsh -qFK -iGh +nOs +nOs +dvx cKG fMh -vkz -fVd +fMh +fMh +cKG qiY cKG -pzz -hDh +cKG +nOs qFK cKG tFV @@ -260829,17 +261214,17 @@ cKG nQJ mHS wsh -cKG -cKG -cKG -cKG +xCq +xCq +xCq +xCq cAo flr mXp fwo exD tIg -cKG +xCq bOj xpt npT @@ -261063,22 +261448,22 @@ iGh dvx sFk ncB -qFK +dvx +wsh +iGh +iGh +iGh nOs -cKG -cKG -cKG -cKG -cKG -cKG -lNv rhR +cbg +pxG +sFk qFK -cKG -dQL +gKw +txU uIm xDc -cKG +gKw ltq jio qrr @@ -261089,12 +261474,12 @@ nIq jqv qCM usI -cKG -cKG -cKG -cKG -cKG -cKG +xCq +xCq +xCq +xCq +xCq +xCq lAV ovi ktB @@ -261325,8 +261710,8 @@ otE wjf lKm lKm -mZz -ghC +lKm +lKm lKm lKm qhA @@ -261351,9 +261736,9 @@ cSz cSz vgx vgx -cKG +xCq mYT -cKG +xCq oNH xpt txV @@ -261365,7 +261750,7 @@ uGm aZs uZD pdh -uOQ +nYS wYP stM stM @@ -261602,17 +261987,17 @@ jCP hXS eZD jvi -egw +vzU tzv paA kNy -kNy +uUq kNy xBg mbB -cKG -fFp -cKG +xCq +kwL +vWI bCu kin nNc @@ -261621,9 +262006,9 @@ lyA pIN nfl lHc -jfW -jfW -jfW +vWI +nWn +nWn stM stM stM @@ -261865,22 +262250,22 @@ lIT bGR nZc nZc -cKG +xCq nfX -cKG +xCq oax -cKG -cKG -cKG -cKG -cKG -cKG -cKG -cKG -cKG -jfW +vWI +vWI +vWI +vWI +vWI +vWI +vWI +vWI +vWI +vWI xYR -jfW +nWn krx stM stM @@ -262119,10 +262504,10 @@ kHH unu iUX aEi -cKG -gKw -gKw -cKG +vWI +rer +rer +xCq xXH muQ bRG @@ -262136,7 +262521,7 @@ quo nop iNM eiA -amq +pcT qvs agd stM @@ -262376,25 +262761,25 @@ jvi nly caA adt -cKG -iGh -iGh -cKG -gKw -cKG +vWI +dST +dST +xCq +pFT +xCq gtn -wsh +gZS fHE veI ise -cKG -cKG -cKG +vWI +vWI +vWI fdb -cKG -cKG +vWI +vWI hMD -jfW +nWn rDY stM stM @@ -262640,18 +263025,18 @@ okn hBf hBf nNW -cKG -cKG -fNS -cKG -cKG +vWI +vWI +nut +vWI +vWI sco bij qkB pzY -jfW -jfW -jfW +nWn +nWn +nWn wBG wBG wBG @@ -262890,18 +263275,18 @@ jvi jvi uZh jvi -jvi -jvi -jvi +yiB +yiB +yiB lCp -cKG +vWI hII oMQ -gKw -wot +rer +xog aNp kPM -cKG +vWI rMn sog bqT @@ -263149,16 +263534,16 @@ bRJ eJC amt amt -jvi +yiB gHI -cKG -xGV +vWI +hwe jHr -cKG -xGV +vWI +hwe pLo -xGV -cKG +hwe +vWI rxl tOK tbX @@ -263406,16 +263791,16 @@ vKD eJC mbc amt -gKw +rer gHI -noW -iGh -iGh -cKG -cKG -cKG -cKG -cKG +bXC +dST +dST +vWI +vWI +vWI +vWI +vWI xCa xCa tNm @@ -263654,7 +264039,7 @@ lui kvS lWf vRX -hxk +hAw lEf ufJ ioY @@ -263663,12 +264048,12 @@ mrJ uit sfY rTw -jvi +yiB gXU -cKG -gKw -cKG -cKG +vWI +rer +vWI +vWI bIy aEX gpv @@ -263855,8 +264240,8 @@ hdJ blK tEn grD -lhj -sbo +rau +kis wsp twe lSy @@ -263877,8 +264262,8 @@ vHF xpP bFM tCk -isx -xwM +oDq +cCf fyO kNJ ncb @@ -263911,7 +264296,7 @@ luN ils mfO mfO -grs +ila lWf ird lui @@ -264133,7 +264518,7 @@ vPK vPK vPK uAk -vPK +lqM dRA arL iIq @@ -264372,7 +264757,7 @@ hii cAT iga pHI -sbo +kis dzZ kfr qmi @@ -264390,7 +264775,7 @@ soU lDA xwM rCx -xwM +cCf cCf nrN iIq @@ -264859,7 +265244,7 @@ stM stM stM stM -stM +esg esg esg esg @@ -264883,8 +265268,8 @@ luX rVS tEn kiq -lhj -sbo +rau +kis ydK pdp bFM @@ -264899,14 +265284,14 @@ nuS nuS nuS nuS -eYo +ybR nCy ggm aqd bFM aHs lAK -xwM +cCf uns bdk wsJ @@ -265115,12 +265500,12 @@ stM stM stM stM -stM pXD esg veY pqO nyr +nyr pqO ekc nfQ @@ -265373,10 +265758,10 @@ stM stM stM mUK -agd axQ dQX lQw +uLw geA pqO qwy @@ -265629,18 +266014,18 @@ sMo stM stM stM -kYE -pXD +etH esg wfZ -esg +pqO +sMg jsY pqO pqO pdZ pqO pqO -dQX +cKJ pqO fGt fGt @@ -265679,7 +266064,7 @@ ovB dEM soU gUU -ngL +kSZ iyh mPU mwB @@ -265887,12 +266272,12 @@ stM stM stM kYE -stM esg esg -pqO +esg +nyr sUN -dQX +tLW mQg uVw uVw @@ -265932,7 +266317,7 @@ prM qlJ ejT ezN -vnX +kdt dEM soU gUU @@ -266193,7 +266578,7 @@ uEo dEM soU gUU -ngL +gXL pvR edA oau @@ -267967,9 +268352,9 @@ nTQ pqO pqO cwu -arH -sbo -sjU +hvL +kis +lPu aQD bFM xCo @@ -268442,7 +268827,7 @@ jTL txw eQa eay -rHr +eay nso tAl tAl @@ -268484,7 +268869,7 @@ bEG hvL rRC kis -sbo +kis oym xwM lDA @@ -268502,7 +268887,7 @@ soU qmi xwM doY -xwM +cCf mPO nZr mhY @@ -268754,12 +269139,12 @@ okd okd okd okd -lpS +nnr ybw nnr kFq vZd -odX +wTI mAO dVn aVr @@ -268768,7 +269153,7 @@ nsm rZN qmL quB -rZN +hjG qwl nWR uJk @@ -268995,9 +269380,9 @@ hXu iTL iTL pmk -arH -sbo -sjU +hvL +kis +lPu cXY bFM fyH @@ -269018,7 +269403,7 @@ dWi dWi cwC sqj -xwM +cCf aiA iBD rZt @@ -269063,7 +269448,7 @@ vWI vWI vWI vWI -vWI +nWn nWn nWn stM @@ -270290,7 +270675,7 @@ lZD tFg wcN obu -guj +dEb igm asY neu @@ -270343,7 +270728,7 @@ iDF iDF iDF iDF -uJk +gwT hCM aIu rxX @@ -271060,7 +271445,7 @@ ptZ vgT tFg gTY -iEL +qHW vLR sPU til @@ -271572,10 +271957,10 @@ lWL tFg yeR mWj -tFg -yeR +wWw +cNa iEL -gwT +vLR mGZ dBM fnT @@ -271829,11 +272214,11 @@ jQV nJz guj nCC -uLw +guj guj tiG -gwT -dEb +vLR +mGZ cKF tHT dFa @@ -272039,7 +272424,7 @@ stM stM stM stM -ncq +iYg eyV cdF waf @@ -272086,9 +272471,9 @@ bHg vLR dpS cyv -vLR -cNa gTY +cNa +wWw vLR mGZ qRx @@ -272343,9 +272728,9 @@ rmc vLR vLR vLR -vLR -aGp -vLR +gTY +svT +gTY vLR mGZ qKa @@ -272600,9 +272985,9 @@ fCN ssG sta vLR -rYp -jRg -jRg +vLR +aGp +vLR vLR mGZ rdx @@ -272810,7 +273195,7 @@ stM stM stM stM -ncq +iYg qVL aFb wuZ @@ -272856,11 +273241,11 @@ rSH chc umc eTE -lRU -lRU -oir -lRU -lRU +vLR +rYp +jRg +flR +vLR dxT vcf tMx @@ -272893,7 +273278,7 @@ mbE mbE gBc mbE -pPr +mbE lOE phs nAi @@ -273067,7 +273452,7 @@ stM stM stM stM -ncq +iYg qVL gfI nVB @@ -273113,11 +273498,11 @@ qir uIY uMA lkQ -chB -kgY -agd -dgn -duE +lRU +lRU +oir +lRU +lRU dRX qHK eeo @@ -273148,7 +273533,7 @@ vDs vDs vDs vDs -vDs +dEg vDs xqV hsF @@ -273324,7 +273709,7 @@ stM stM stM stM -ncq +iYg qVL vbi nVB @@ -273357,23 +273742,23 @@ vmO vmO stM fYz -aKA -aKA +fYz aKA aKA aKA aKA fYz +fYz jkm -jkm +rHr lGO chB chB chB chB -wBG -wBG -wBG +kgY +agd +dgn duE eMT eMT @@ -273613,13 +273998,13 @@ vmO vmO vmO stM -stM -stM -stM -stM -stM -stM -stM +alh +vDs +vDs +vDs +vDs +vDs +vDs mpP qth qth @@ -274352,7 +274737,7 @@ stM stM stM stM -ncq +iYg rQs moZ nVB @@ -274608,265 +274993,265 @@ stM stM stM stM -stM -ncq -rQs -gfI -nVB -nVB -prD -uXC -fUF -nVB -nVB -qgL -jpA -vjY +stM +iYg +rQs +gfI +nVB +nVB +prD +uXC +fUF +nVB +nVB +qgL +jpA +vjY +iYg +lnq +wgB +wgB +wgB +hHU +sMo +stM +stM +stM +stM +stM +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +kUC +kUC +kUC +kUC +kUC +kUC +kUC +stM +stM +stM +stM +sin +sMo +stM +stM +sSp +stM +wBG +stM +wYP +stM +stM +sMo +sin +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +vmO +vmO +vmO +vmO +vmO +vmO +vmO +kUC +kUC +kUC +kUC +kUC +kUC +"} +(224,1,3) = {" +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +stM +stM +stM +vmO +vmO +vmO +vmO +stM +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +vmO +stM +stM +stM +stM iYg -lnq -wgB -wgB -wgB -hHU -sMo -stM -stM -stM -stM -stM -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -stM -stM -stM -stM -stM -stM -stM -stM -stM -stM -stM -stM -stM -stM -stM -stM -stM -stM -stM -stM -stM -stM -stM -stM -stM -stM -stM -stM -stM -stM -stM -stM -stM -kUC -kUC -kUC -kUC -kUC -kUC -kUC -stM -stM -stM -stM -sin -sMo -stM -stM -sSp -stM -wBG -stM -wYP -stM -stM -sMo -sin -stM -stM -stM -stM -stM -stM -stM -stM -stM -stM -stM -stM -stM -stM -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -stM -stM -stM -stM -stM -stM -stM -stM -stM -stM -stM -stM -stM -stM -stM -vmO -vmO -vmO -vmO -vmO -vmO -vmO -kUC -kUC -kUC -kUC -kUC -kUC -"} -(224,1,3) = {" -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -stM -stM -stM -vmO -vmO -vmO -vmO -stM -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -stM -stM -stM -stM -ncq rQs aFb rnM @@ -275637,7 +276022,7 @@ stM stM stM stM -ncq +iYg rQs jap rSc diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index ba8b14b7962bf..a4cfd7a0b20d0 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -39,7 +39,6 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list( GLOBAL_LIST_INIT(turfs_openspace, typecacheof(list( /turf/open/openspace, /turf/open/space/openspace, - /turf/open/chasm/moonstation //BUBBERSTATION ADDITION ))) #define isopenspaceturf(A) (is_type_in_typecache(A, GLOB.turfs_openspace)) diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index 13d0f1c9063ea..a366843155585 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -186,16 +186,16 @@ #define JOB_DISPLAY_ORDER_DETECTIVE 37 #define JOB_DISPLAY_ORDER_SECURITY_OFFICER 38 #define JOB_DISPLAY_ORDER_PRISONER 39 -#define JOB_DISPLAY_ORDER_SECURITY_MEDIC 100 //SKYRAT EDIT ADDITON -#define JOB_DISPLAY_ORDER_CORRECTIONS_OFFICER 101 //SKYRAT EDIT ADDITON -#define JOB_DISPLAY_ORDER_NANOTRASEN_CONSULTANT 102 //SKYRAT EDIT ADDITON -#define JOB_DISPLAY_ORDER_BLUESHIELD 103 //SKYRAT EDIT ADDITON -#define JOB_DISPLAY_ORDER_ORDERLY 104 //SKYRAT EDIT ADDITION -#define JOB_DISPLAY_ORDER_SCIENCE_GUARD 105 //SKYRAT EDIT ADDITION -#define JOB_DISPLAY_ORDER_BOUNCER 106 //SKYRAT EDIT ADDITION -#define JOB_DISPLAY_ORDER_ENGINEER_GUARD 107 //SKYRAT EDIT ADDITION -#define JOB_DISPLAY_ORDER_CUSTOMS_AGENT 108 //SKYRAT EDIT ADDITION -#define JOB_DISPLAY_ORDER_EXP_CORPS 109 //SKYRAT EDIT ADDITON +#define JOB_DISPLAY_ORDER_SECURITY_MEDIC 41 //SKYRAT EDIT ADDITON +#define JOB_DISPLAY_ORDER_CORRECTIONS_OFFICER 42 //SKYRAT EDIT ADDITON +#define JOB_DISPLAY_ORDER_NANOTRASEN_CONSULTANT 43 //SKYRAT EDIT ADDITON +#define JOB_DISPLAY_ORDER_BLUESHIELD 44 //SKYRAT EDIT ADDITON +#define JOB_DISPLAY_ORDER_ORDERLY 45 //SKYRAT EDIT ADDITION +#define JOB_DISPLAY_ORDER_SCIENCE_GUARD 46 //SKYRAT EDIT ADDITION +#define JOB_DISPLAY_ORDER_BOUNCER 47 //SKYRAT EDIT ADDITION +#define JOB_DISPLAY_ORDER_ENGINEER_GUARD 48 //SKYRAT EDIT ADDITION +#define JOB_DISPLAY_ORDER_CUSTOMS_AGENT 49 //SKYRAT EDIT ADDITION +#define JOB_DISPLAY_ORDER_EXP_CORPS 50 //SKYRAT EDIT ADDITON #define JOB_DISPLAY_ORDER_TELECOMMS_SPECIALIST 51 //SKYRAT EDIT ADDITION #define DEPARTMENT_UNASSIGNED "No Department" diff --git a/code/__DEFINES/maintenance_loot.dm b/code/__DEFINES/maintenance_loot.dm index 666c66f72e4bc..18989b164aec0 100644 --- a/code/__DEFINES/maintenance_loot.dm +++ b/code/__DEFINES/maintenance_loot.dm @@ -1,5 +1,5 @@ #define maint_trash_weight 2100 //BUBBERSTATION CHANGE: 4200 TO 2100. -#define maint_common_weight 2250 //BUBBERSTATION CHANGE: 4500 TO 2250. +#define maint_common_weight 4500 #define maint_uncommon_weight 1100 #define maint_rarity_weight 199 #define maint_oddity_weight 1 diff --git a/code/_globalvars/arcade.dm b/code/_globalvars/arcade.dm index 4143ce5fa765f..a76306937bb42 100644 --- a/code/_globalvars/arcade.dm +++ b/code/_globalvars/arcade.dm @@ -1,4 +1,5 @@ ///List of all things that can be dispensed by an arcade cabinet and the weight of them being picked. +/* BUBBERSTATION CHANGE: MODULAR OVERRIDE GLOBAL_LIST_INIT(arcade_prize_pool, list( /obj/item/storage/box/snappops = 2, /obj/item/toy/talking/ai = 2, @@ -71,3 +72,4 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( /obj/item/clothing/mask/party_horn = 2, /obj/item/storage/box/party_poppers = 2, )) +BUBBERSTATION CHANGE END */ diff --git a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm index 1d2be465b3026..be7ed60707f30 100644 --- a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm +++ b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm @@ -29,12 +29,12 @@ /// Evil organs we can put in people var/static/list/grantable_organs = list( /obj/item/organ/internal/appendix/corrupt, - /obj/item/organ/internal/eyes/corrupt, + // /obj/item/organ/internal/eyes/corrupt, BUBBERSTATION REMOVAL. AWFUL OVERLAY EFFECT THAT PULSATES. JESUS CHRIST. /obj/item/organ/internal/heart/corrupt, - /obj/item/organ/internal/liver/corrupt, - /obj/item/organ/internal/lungs/corrupt, + // /obj/item/organ/internal/liver/corrupt, BUBBERSTATION REMOVAL. SURE LETS OD PEOPLE WHILE THEY'RE BEING TREATED OK. + // /obj/item/organ/internal/lungs/corrupt, BUBBERSTATION REMOVAL. HEY REMEMBER ABDUCTORS? HEY REMEMBER WE REMOVED PLASMA GENERATION FROM ABDUCTOR LUNGS? HEY LETS RE-ADD THAT BACK TO HERETIC LUNGS BECAUSE ???? /obj/item/organ/internal/stomach/corrupt, - /obj/item/organ/internal/tongue/corrupt, + // /obj/item/organ/internal/tongue/corrupt, BUBBERSTATION REMOVAL. LETS SLUR PEOPLE'S SPEECH AND NOT UNDERSTAND WHY THEY'RE DOING IT BECAUSE WE'RE NOT A GAME BASED ON COMMUNICATION OK. ) /datum/heretic_knowledge/hunt_and_sacrifice/Destroy(force) @@ -319,7 +319,7 @@ if (isplasmaman(sac_target)) usable_organs -= /obj/item/organ/internal/lungs/corrupt // Their lungs are already more cursed than anything I could give them - var/total_implant = rand(2, 4) + var/total_implant = 1 //BUBBERSTATION CHANGE: ALWAYS 1 INSTEAD OF 2 TO 4. var/gave_any = FALSE for (var/i in 1 to total_implant) diff --git a/code/modules/surgery/bodyparts/wounds.dm b/code/modules/surgery/bodyparts/wounds.dm index 93d61b091d9c0..8d47b0704467d 100644 --- a/code/modules/surgery/bodyparts/wounds.dm +++ b/code/modules/surgery/bodyparts/wounds.dm @@ -75,7 +75,7 @@ injury_roll += check_woundings_mods(woundtype, damage, wound_bonus, bare_wound_bonus) var/list/series_wounding_mods = check_series_wounding_mods() - if(injury_roll > WOUND_DISMEMBER_OUTRIGHT_THRESH && prob(get_damage() / max_damage * 100) && can_dismember()) + if(damage_source && injury_roll > WOUND_DISMEMBER_OUTRIGHT_THRESH && prob(get_damage() / max_damage * 100) && can_dismember()) //BUBBERSTATION CHANGE: You can only dismember with melee weapons. var/datum/wound/loss/dismembering = new dismembering.apply_dismember(src, woundtype, outright = TRUE, attack_direction = attack_direction) return diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_teshari.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_teshari.png index 2bf863348c039..1f888e57c5856 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_teshari.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_teshari.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_vox.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_vox.png index dbee83aaba7aa..ce404cc1deba6 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_vox.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_vox.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_vox_primalis.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_vox_primalis.png index 73dff7a644878..163347515fed2 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_vox_primalis.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_vox_primalis.png differ diff --git a/html/changelogs/AutoChangeLog-pr-1539.yml b/html/changelogs/AutoChangeLog-pr-1539.yml new file mode 100644 index 0000000000000..a6bdbda9cbea0 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1539.yml @@ -0,0 +1,5 @@ +author: "BurgerBB" +delete-after: True +changes: + - balance: "You only get 1 corrupt organ when sacrificed, instead of 2 to 4." + - qol: "Removes some corruption options because they are extremely annoying / don't even work properly." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1544.yml b/html/changelogs/AutoChangeLog-pr-1544.yml new file mode 100644 index 0000000000000..782a7a1440e06 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1544.yml @@ -0,0 +1,4 @@ +author: "BurgerBB" +delete-after: True +changes: + - rscadd: "Adds Big Bertha, a unique one-of-a-kind two-handed shield for security that blocks literally everything. It spawns in the Armory." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1696.yml b/html/changelogs/AutoChangeLog-pr-1696.yml new file mode 100644 index 0000000000000..e9df26c6c980c --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1696.yml @@ -0,0 +1,4 @@ +author: "LT3" +delete-after: True +changes: + - bugfix: "Hypospray right click works again" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1707.yml b/html/changelogs/AutoChangeLog-pr-1707.yml new file mode 100644 index 0000000000000..f9a3fa00c717d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1707.yml @@ -0,0 +1,4 @@ +author: "LT3" +delete-after: True +changes: + - qol: "Crew monitor now has sort options and a search box" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1720.yml b/html/changelogs/AutoChangeLog-pr-1720.yml new file mode 100644 index 0000000000000..278924ab2b3b2 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1720.yml @@ -0,0 +1,4 @@ +author: "BurgerB" +delete-after: True +changes: + - rscadd: "Overhauls the design of Moonstation Engineering" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1732.yml b/html/changelogs/AutoChangeLog-pr-1732.yml new file mode 100644 index 0000000000000..21eba09e9fed3 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1732.yml @@ -0,0 +1,4 @@ +author: "thegrb93" +delete-after: True +changes: + - bugfix: "Tajaran photocopier booty sprite fixed" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1736.yml b/html/changelogs/AutoChangeLog-pr-1736.yml new file mode 100644 index 0000000000000..1b23febd829b4 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1736.yml @@ -0,0 +1,4 @@ +author: "Majkl-J" +delete-after: True +changes: + - bugfix: "Fixes maps failing unit tests" \ No newline at end of file diff --git a/modular_skyrat/modules/better_vox/code/vox_species.dm b/modular_skyrat/modules/better_vox/code/vox_species.dm index 76a7e13643ef4..261443499a214 100644 --- a/modular_skyrat/modules/better_vox/code/vox_species.dm +++ b/modular_skyrat/modules/better_vox/code/vox_species.dm @@ -37,7 +37,7 @@ ) custom_worn_icons = list( OFFSET_HEAD = VOX_PRIMALIS_HEAD_ICON, - OFFSET_MASK = VOX_PRIMALIS_MASK_ICON, + OFFSET_FACEMASK = VOX_PRIMALIS_MASK_ICON, LOADOUT_ITEM_SUIT = VOX_PRIMALIS_SUIT_ICON, LOADOUT_ITEM_UNIFORM = VOX_PRIMALIS_UNIFORM_ICON, LOADOUT_ITEM_GLOVES = VOX_PRIMALIS_GLOVES_ICON, diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/vox.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/vox.dm index 2937cfccdc87d..e4dc07e10220a 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/vox.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/vox.dm @@ -34,7 +34,7 @@ ) custom_worn_icons = list( OFFSET_HEAD = VOX_HEAD_ICON, - OFFSET_MASK = VOX_MASK_ICON, + OFFSET_FACEMASK = VOX_MASK_ICON, LOADOUT_ITEM_SUIT = VOX_SUIT_ICON, LOADOUT_ITEM_UNIFORM = VOX_UNIFORM_ICON, LOADOUT_ITEM_HANDS = VOX_HANDS_ICON, diff --git a/modular_skyrat/modules/exp_corps/code/gear.dm b/modular_skyrat/modules/exp_corps/code/gear.dm index 07b1b99244b6b..43c747d09465e 100644 --- a/modular_skyrat/modules/exp_corps/code/gear.dm +++ b/modular_skyrat/modules/exp_corps/code/gear.dm @@ -26,7 +26,7 @@ righthand_file = 'modular_skyrat/modules/exp_corps/icons/bonesaw_r.dmi' inhand_icon_state = "bonesaw" hitsound = 'sound/weapons/bladeslice.ogg' - toolspeed = 0.2 + toolspeed = 2 throw_range = 3 w_class = WEIGHT_CLASS_SMALL diff --git a/modular_skyrat/modules/reagent_forging/code/mindless_killer.dm b/modular_skyrat/modules/reagent_forging/code/mindless_killer.dm index 16986d2db9fe4..cb50f76b9b185 100644 --- a/modular_skyrat/modules/reagent_forging/code/mindless_killer.dm +++ b/modular_skyrat/modules/reagent_forging/code/mindless_killer.dm @@ -16,32 +16,19 @@ mindless_multiplier = mindless_multiplier_override RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(examine)) - RegisterSignal(parent, COMSIG_ITEM_PRE_ATTACK, PROC_REF(do_force)) - RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, PROC_REF(undo_force)) + RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, PROC_REF(deal_smite)) /datum/component/mindless_killer/proc/examine(datum/source, mob/user, list/examine_list) SIGNAL_HANDLER examine_list += span_danger("It has an awful gleam against those who cannot think.") -/datum/component/mindless_killer/proc/do_force(datum/source, atom/target, mob/user, params) +/datum/component/mindless_killer/proc/deal_smite(datum/source, mob/living/target_mob, mob/user, params) SIGNAL_HANDLER - - var/mob/target_mob = target - if(!istype(target_mob)) - return - if(target_mob.mind) - return - obj_parent.force += mindless_force - obj_parent.force *= mindless_multiplier - -/datum/component/mindless_killer/proc/undo_force(datum/source, atom/target, mob/user, params) - SIGNAL_HANDLER - - var/mob/target_mob = target if(!istype(target_mob)) return if(target_mob.mind) return - obj_parent.force /= mindless_multiplier - obj_parent.force -= mindless_force + var/extra_damage = (obj_parent.force + mindless_force) * mindless_multiplier + target_mob.apply_damage(extra_damage, forced = TRUE, spread_damage = TRUE) + return diff --git a/modular_skyrat/modules/teshari/code/_teshari.dm b/modular_skyrat/modules/teshari/code/_teshari.dm index 0cb21f0e32a23..455fd8cfcec4d 100644 --- a/modular_skyrat/modules/teshari/code/_teshari.dm +++ b/modular_skyrat/modules/teshari/code/_teshari.dm @@ -20,7 +20,7 @@ mutanttongue = /obj/item/organ/internal/tongue/teshari custom_worn_icons = list( OFFSET_HEAD = TESHARI_HEAD_ICON, - OFFSET_MASK = TESHARI_MASK_ICON, + OFFSET_FACEMASK = TESHARI_MASK_ICON, OFFSET_NECK = TESHARI_NECK_ICON, LOADOUT_ITEM_SUIT = TESHARI_SUIT_ICON, LOADOUT_ITEM_UNIFORM = TESHARI_UNIFORM_ICON, diff --git a/modular_zubbers/code/_globalvars/lists/maintenance_loot_common.dm b/modular_zubbers/code/_globalvars/lists/maintenance_loot_common.dm index 00fdec70f9a0b..609012c5d9f97 100644 --- a/modular_zubbers/code/_globalvars/lists/maintenance_loot_common.dm +++ b/modular_zubbers/code/_globalvars/lists/maintenance_loot_common.dm @@ -1,4 +1,5 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items + GLOB.arcade_prize_pool = 150, /obj/item/relic = 100, /obj/item/air_refresher = 25, list( @@ -102,7 +103,7 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items ) = 250, list( /obj/item/stack/arcadeticket/thirty = 25, - /obj/item/stack/cable_coil = 50, + /obj/item/stack/cable_coil/thirty = 50, /obj/item/stack/pipe_cleaner_coil/random = 25, /obj/item/stack/conveyor/thirty = 5, /obj/item/stack/ducts/fifty = 5, @@ -126,14 +127,6 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items /obj/item/stack/rods/twentyfive = 25, /obj/item/stack/rods/ten = 100, /obj/item/stack/rods/two = 50, - /obj/item/stack/sheet/animalhide/cat = 10, - /obj/item/stack/sheet/animalhide/corgi = 10, - /obj/item/stack/sheet/animalhide/gondola = 10, - /obj/item/stack/sheet/animalhide/human = 10, - /obj/item/stack/sheet/animalhide/lizard = 10, - /obj/item/stack/sheet/animalhide/monkey = 10, - /obj/item/stack/sheet/animalhide/mothroach = 10, - /obj/item/stack/sheet/animalhide/xeno = 10, /obj/item/stack/sheet/bluespace_crystal = 1, /obj/item/stack/sheet/bone = 25, /obj/item/stack/sheet/bronze = 25, @@ -209,6 +202,23 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items /obj/item/stack/sheet/titaniumglass/fifty = 1, /obj/item/stack/sheet/xenochitin = 15 ) = 300, + list( + /obj/item/stack/sheet/animalhide/cat = 10, + /obj/item/stack/sheet/animalhide/corgi = 10, + /obj/item/stack/sheet/animalhide/gondola = 10, + /obj/item/stack/sheet/animalhide/human = 10, + /obj/item/stack/sheet/animalhide/lizard = 10, + /obj/item/stack/sheet/animalhide/monkey = 10, + /obj/item/stack/sheet/animalhide/mothroach = 10, + /obj/item/stack/sheet/animalhide/xeno = 10, + /obj/item/stack/sheet/animalhide/carp = 10, + /obj/item/stack/sheet/animalhide/goliath_hide = 5, + /obj/item/stack/sheet/animalhide/goliath_hide/polar_bear_hide = 5, + /obj/item/stack/sheet/animalhide/ashdrake = 1, + /obj/item/stack/sheet/animalhide/bileworm = 5, + /obj/item/stack/sheet/sinew = 10, + /obj/item/stack/sheet/sinew/wolf = 10 + ) = 50, list( /obj/item/stack/tile/carpet/black/fifty = 100, /obj/item/stack/tile/carpet/blue/fifty = 100, @@ -270,7 +280,7 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items /obj/item/paint_palette = 1, /obj/item/pipe_painter = 1, /obj/item/rcl/pre_loaded = 1 - ) = 75, + ) = 100, list( /obj/item/paper_bin = 50, /obj/item/paper_bin/construction = 25, @@ -326,7 +336,7 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items /obj/item/sticker/syndicate/op = 1, /obj/item/sticker/syndicate/trap = 1, /obj/item/sticker/toolbox = 1 - ) = 75, + ) = 100, list( /obj/item/analyzer = 5, /obj/item/crowbar = 75, @@ -384,7 +394,7 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items /obj/item/wirecutters = 50, /obj/item/wrench = 50, /obj/item/fish_analyzer = 10 - ) = 200, + ) = 250, list( /obj/item/hatchet = 1, /obj/item/hatchet/wooden = 1, @@ -407,7 +417,7 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items /obj/item/scythe = 15, /obj/item/shield/buckler = 15, /obj/item/spear = 30 - ) = 50, + ) = 100, list( /obj/item/lighter = 400, /obj/item/storage/fancy/cigarettes = 400, @@ -427,7 +437,7 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items /obj/item/storage/fancy/cigarettes/cigpack_xeno = 50, /obj/item/storage/fancy/cigarettes/dromedaryco = 25, /obj/item/storage/fancy/cigarettes/khi = 25 - ) = 50, + ) = 100, list( /obj/item/perfume/amber = 1, /obj/item/perfume/cherry = 1, @@ -439,7 +449,7 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items /obj/item/perfume/strawberry = 1, /obj/item/perfume/vanilla = 1, /obj/item/perfume/wood = 1 - ) = 10, + ) = 25, list( /obj/item/assembly/health = 25, /obj/item/assembly/igniter = 100, @@ -460,148 +470,13 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items /obj/item/fishing_hook = 10, /obj/item/fishing_line = 5, /obj/item/fishing_rod = 5 - ) = 25, + ) = 50, list( /obj/effect/spawner/random/bedsheet = 10, /obj/effect/spawner/random/bedsheet/double = 1 - ) = 10, - list( - /obj/item/ammo_box/foambox = 5, - /obj/item/bikehorn = 50, - /obj/item/bikehorn/airhorn = 25, - /obj/item/bikehorn/rubberducky = 50, - /obj/item/bikehorn/rubberducky/plasticducky = 25, - /obj/item/clothing/accessory/badge/sheriff = 10, - /obj/item/clothing/accessory/clown_enjoyer_pin = 25, - /obj/item/clothing/accessory/mime_fan_pin = 25, - /obj/item/clothing/accessory/pocketprotector = 5, - /obj/item/clothing/accessory/pocketprotector/cosmetology = 10, - /obj/item/clothing/accessory/pocketprotector/full = 25, - /obj/item/clothing/accessory/pride = 10, - /obj/item/clothing/gloves/boxing = 5, - /obj/item/clothing/gloves/boxing/blue = 5, - /obj/item/clothing/gloves/boxing/green = 5, - /obj/item/clothing/gloves/boxing/yellow = 5, - /obj/item/clothing/mask/facehugger/toy = 5, - /obj/item/clothing/mask/gas/larpswat = 5, - /obj/item/clothing/mask/gas/prop = 10, - /obj/item/clothing/mask/whistle = 5, - /obj/item/clothing/shoes/kindle_kicks = 5, - /obj/item/clothing/shoes/wheelys = 15, - /obj/item/clothing/shoes/wheelys/rollerskates = 5, - /obj/item/clothing/shoes/wheelys/skishoes = 10, - /obj/item/clothing/suit/hooded/flashsuit = 25, - /obj/item/clothing/under/syndicate/tacticool = 50, - /obj/item/clothing/under/syndicate/tacticool/skirt = 50, - /obj/item/disk/nuclear/fake = 1, - /obj/item/disk/nuclear/fake/obvious = 5, - /obj/item/dualsaber/toy = 5, - /obj/item/extendohand = 25, - /obj/item/fakeartefact = 50, - /obj/item/gavelhammer = 25, - /obj/item/gun/ballistic/automatic/c20r/toy/unrestricted = 5, - /obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted = 1, - /obj/item/gun/ballistic/automatic/pistol/toy = 10, - /obj/item/gun/ballistic/automatic/toy/unrestricted = 5, - /obj/item/gun/ballistic/shotgun/toy/unrestricted = 25, - /obj/item/gun/ballistic/shotgun/toy/crossbow = 25, - /obj/item/gun/magic/wand/nothing = 5, - /obj/item/hairbrush = 20, - /obj/item/hairbrush/comb = 10, - /obj/item/bouquet = 5, - /obj/item/bouquet/poppy = 5, - /obj/item/bouquet/rose = 5, - /obj/item/bouquet/sunflower = 5, - /obj/item/hhmirror = 5, - /obj/item/hot_potato/harmless/toy = 25, - /obj/item/hourglass = 10, - /obj/item/inspector = 10, - /obj/item/inspector/clown = 20, - /obj/item/laser_pointer/red = 5, - /obj/item/laser_pointer/green = 5, - /obj/item/laser_pointer/purple = 5, - /obj/item/laser_pointer/blue = 5, - /obj/item/latexballoon = 25, - /obj/item/lipstick/quantum = 5, - /obj/item/lipstick/random = 20, - /obj/item/melee/skateboard = 10, - /obj/item/melee/skateboard/improvised = 40, - /obj/item/melee/skateboard/pro = 5, - /obj/item/melee/skateboard/hoverboard = 1, - /obj/item/reagent_containers/spray/chemsprayer/party = 15, - /obj/item/reagent_containers/spray/waterflower = 25, - /obj/item/reagent_containers/spray/waterflower/lube = 10, - /obj/item/reagent_containers/spray/waterflower/superlube = 5, - /obj/item/restraints/handcuffs/fake = 25, - /obj/item/skub = 200, - /obj/item/sord = 100, - /obj/item/sparkler = 25, - /obj/item/storage/box/snappops = 75, - /obj/item/storage/box/sparklers = 75, - /obj/item/storage/box/stickers = 75, - /obj/item/storage/box/stickers/googly = 75, - /obj/item/storage/card_binder = 50, - /obj/item/storage/crayons = 200, - /obj/item/storage/dice = 100, - /obj/item/storage/dice/hazard = 25, - /obj/item/throwing_star/toy = 50, - /obj/item/towel = 150, - /obj/item/toy/ammo/gun = 50, - /obj/item/toy/balloon = 25, - /obj/item/toy/balloon/arrest = 25, - /obj/item/toy/balloon/corgi = 25, - /obj/item/toy/balloon/syndicate = 25, - /obj/item/toy/basketball = 75, - /obj/item/toy/beach_ball/branded = 50, - /obj/item/toy/beach_ball/baseball = 100, - /obj/item/toy/braintoy = 25, - /obj/item/toy/captainsaid = 25, - /obj/item/toy/captainsaid/collector = 5, - /obj/item/toy/cattoy = 5, - /obj/item/toy/clockwork_watch = 25, - /obj/item/toy/crayon/spraycan = 100, - /obj/item/toy/crayon/spraycan/lubecan = 25, - /obj/item/toy/crayon/spraycan/mimecan = 25, - /obj/item/toy/darksabre = 10, - /obj/item/toy/dodgeball = 50, - /obj/item/toy/dummy = 25, - /obj/item/toy/eightball = 75, - /obj/item/toy/eightball/broken = 25, - /obj/item/toy/eightball/haunted = 25, - /obj/item/toy/eldritch_book = 25, - /obj/item/toy/foamblade = 25, - /obj/item/toy/foamfinger = 10, - /obj/item/toy/gun = 25, - /obj/item/toy/intento = 5, - /obj/item/toy/katana = 5, - /obj/item/toy/minimeteor = 50, - /obj/item/toy/nuke = 25, - /obj/item/toy/plush/carpplushie = 25, - /obj/item/toy/redbutton = 5, - /obj/item/toy/snappop = 10, - /obj/item/toy/snappop/phoenix = 1, - /obj/item/toy/sprayoncan = 1, - /obj/item/toy/sword = 100, - /obj/item/toy/talking/ai = 50, - /obj/item/toy/talking/codex_gigas = 50, - /obj/item/toy/talking/griffin = 50, - /obj/item/toy/talking/owl = 50, - /obj/item/toy/tennis = 10, - /obj/item/toy/tennis/blue = 10, - /obj/item/toy/tennis/cyan = 10, - /obj/item/toy/tennis/green = 10, - /obj/item/toy/tennis/purple = 10, - /obj/item/toy/tennis/rainbow = 1, - /obj/item/toy/tennis/red = 10, - /obj/item/toy/tennis/yellow = 10, - /obj/item/toy/toy_dagger = 25, - /obj/item/toy/toy_xeno = 25, - /obj/item/toy/waterballoon = 10, - /obj/item/toy/windup_toolbox = 25, - /obj/item/training_toolbox = 10, - /obj/item/wheelchair = 50 - ) = 100, - /obj/item/blank_coffee_cartridge = 10, + ) = 25, + /obj/item/wheelchair = 50, + /obj/item/blank_coffee_cartridge = 30, list( /obj/item/bodybag = 10, /obj/item/bodybag/bluespace = 1, @@ -619,19 +494,15 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items /obj/item/burner = 5, /obj/item/burner/fuel = 1, /obj/item/burner/oil = 1 - ) = 25, + ) = 50, list( /obj/item/camera = 10, /obj/item/camera/detective = 1, /obj/item/camera/spooky = 1, /obj/item/camera_film = 5 ) = 25, - list( - /obj/item/cardpack/resin = 1, - /obj/item/cardpack/series_one = 1 - ) = 10, /obj/item/chair/plastic = 50, - /obj/item/chisel = 5, + /obj/item/chisel = 15, /obj/item/clothing/ears/earmuffs = 50, /obj/item/clothing/ears/headphones = 5, /obj/item/clothing/gloves/fingerless = 50, @@ -639,7 +510,7 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items /obj/item/clothing/gloves/latex = 5, /obj/item/clothing/gloves/latex/nitrile = 1, /obj/item/clothing/mask/surgical = 10 - ) = 25, + ) = 50, /obj/item/clothing/gloves/tackler/offbrand = 50, list( /obj/item/clothing/mask/balaclava = 50, @@ -736,7 +607,7 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items /obj/item/extinguisher/mini = 25, /obj/item/extinguisher/mini/empty = 10 ) = 150, - /obj/item/extinguisher_refill = 20, + /obj/item/extinguisher_refill = 30, list( /obj/item/flashlight = 25, /obj/item/flashlight/flare = 50, @@ -901,9 +772,9 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items /obj/item/storage/fancy/nugget_box = 10, /obj/item/storage/fancy/pickles_jar = 200, /obj/item/storage/fish_case/random = 100, - /obj/item/storage/fish_case/syndicate = 10, - /obj/item/storage/wallet/random = 200 + /obj/item/storage/fish_case/syndicate = 10 ) = 150, + /obj/item/storage/wallet/random = 50, list( /obj/item/food/meat/slab/bear = 10, /obj/item/food/meat/slab/bugmeat = 50, @@ -949,7 +820,7 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items /obj/item/food/raw_patty/human = 25, /obj/item/food/raw_patty/xeno = 25, /obj/item/food/raw_sausage = 50 - ) = 150, + ) = 100, list( /obj/item/food/grown/aloe = 25, /obj/item/food/grown/ambrosia/deus = 1, @@ -1082,5 +953,49 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items /obj/item/soap/homemade = 100, /obj/item/soap/nanotrasen = 25, /obj/item/soap/syndie = 10 - ) = 50 + ) = 50, + list( + /obj/item/food/drug/moon_rock = 1, + /obj/item/food/drug/saturnx = 1, + /obj/item/reagent_containers/blacktar = 1, + /obj/item/reagent_containers/cocaine = 1, + /obj/item/reagent_containers/crack = 1, + /obj/item/reagent_containers/cup/blastoff_ampoule = 1, + /obj/item/reagent_containers/hash = 1, + /obj/item/reagent_containers/hash/dabs = 1, + /obj/item/reagent_containers/heroin = 1, + /obj/item/reagent_containers/hypospray/medipen/pumpup = 100, + /obj/item/reagent_containers/pill/cyanide = 1, + /obj/item/reagent_containers/pill/happy = 5, + /obj/item/reagent_containers/pill/happinesspsych = 5, + /obj/item/reagent_containers/pill/lsd = 5, + /obj/item/reagent_containers/pill/lsdpsych = 5, + /obj/item/reagent_containers/pill/maintenance/achievement = 200, + /obj/item/reagent_containers/pill/nanite_slurry = 5, + /obj/item/reagent_containers/pill/zoom = 5, + /obj/item/reagent_containers/syringe/contraband/bath_salts = 1, + /obj/item/reagent_containers/syringe/contraband/fentanyl = 1, + /obj/item/reagent_containers/syringe/contraband/krokodil = 1, + /obj/item/reagent_containers/syringe/contraband/methamphetamine = 1, + /obj/item/reagent_containers/syringe/contraband/morphine = 1, + /obj/item/reagent_containers/syringe/contraband/saturnx = 1, + /obj/item/reagent_containers/syringe/contraband/space_drugs = 1, + /obj/item/reagent_containers/vapecart/bluekush = 1, + /obj/item/reagent_containers/vapecart/cheese = 1, + /obj/item/reagent_containers/vapecart/pwrgame = 1, + /obj/item/reagent_containers/vapecart/reddiesel = 1, + /obj/item/reagent_containers/vapecart/syndicate = 1, + /obj/item/storage/pill_bottle/happinesspsych = 1, + /obj/item/storage/pill_bottle/happy = 1, + /obj/item/storage/pill_bottle/lsd = 1, + /obj/item/storage/pill_bottle/lsdpsych = 1, + /obj/item/storage/pill_bottle/maintenance_pill = 25, + /obj/item/storage/pill_bottle/zoom = 1, + /obj/item/tattoo_kit = 75, + /obj/item/reagent_containers/crackbrick = 1, + /obj/item/reagent_containers/cocainebrick = 1, + /obj/item/reagent_containers/heroinbrick = 1, + /obj/item/reagent_containers/hashbrick = 1 + ) = 50, + /obj/item/rack_parts = 75 )) diff --git a/modular_zubbers/code/_globalvars/lists/maintenance_loot_oddity.dm b/modular_zubbers/code/_globalvars/lists/maintenance_loot_oddity.dm index 8c4b34142a401..0953516af4b21 100644 --- a/modular_zubbers/code/_globalvars/lists/maintenance_loot_oddity.dm +++ b/modular_zubbers/code/_globalvars/lists/maintenance_loot_oddity.dm @@ -1,14 +1,13 @@ GLOBAL_LIST_INIT(oddity_loot, list(//oddity: strange or crazy items - /obj/item/ai_module/toy_ai = 100, + /obj/item/ai_module/toy_ai = 50, /obj/item/anomaly_releaser = 25, /obj/item/bombcore/training = 10, list( /obj/item/book/granter/action/spell/smoke/lesser = 1, /obj/item/book/granter/action/spell/blind/wgw = 1, - /obj/item/book/granter/crafting_recipe/combat_baking = 1, - /obj/item/book/granter/crafting_recipe/regal_condor = 1 + /obj/item/book/granter/crafting_recipe/combat_baking = 1 ) = 25, - /obj/item/bountytrap = 50, + /obj/item/bountytrap = 25, /obj/item/cardboard_cutout/adaptive = 25, /obj/item/chainsaw = 5, /obj/item/claymore/weak/weaker = 10, @@ -49,27 +48,24 @@ GLOBAL_LIST_INIT(oddity_loot, list(//oddity: strange or crazy items /obj/item/clothing/mask/gas/syndicate = 5, /obj/item/clothing/shoes/bhop = 5, /obj/item/clothing/shoes/bhop/rocket = 1, - /obj/item/clothing/shoes/gunboots/disabler = 5, /obj/item/chameleon_scanner = 1 - ) = 100, - /obj/item/clothing/glasses/nightmare_vision = 5, + ) = 50, + /obj/item/clothing/glasses/nightmare_vision = 25, /obj/item/clothing/head/helmet/monkey_sentience = 25, /obj/item/clothing/head/soft/grey/jolly = 5, - /obj/item/crowbar/large/heavy = 5, - /obj/item/device/traitor_announcer = 1, - /obj/item/dice/d20/fate/stealth/one_use = 1, - /obj/item/dnainjector/h2m = 1, - /obj/item/flashlight/flashdark = 1, + /obj/item/crowbar/large/heavy = 5,, + /obj/item/dnainjector/h2m = 5, + /obj/item/flashlight/flashdark = 5, /obj/item/food/burger/ghost = 1, /obj/item/food/burger/crazy = 1, - /obj/item/food/grown/banana/bunch = 1, - /obj/item/food/grown/banana/bombanana = 1, - /obj/item/food/grown/citrus/orange_3d = 1, - /obj/item/food/grown/firelemon = 1, - /obj/item/food/grown/kudzupod = 1, + list( + /obj/item/food/grown/banana/bombanana = 1, + /obj/item/food/grown/citrus/orange_3d = 1, + /obj/item/food/grown/firelemon = 1, + /obj/item/food/grown/kudzupod = 1, + ) = 25, /obj/item/food/monkeycube/gorilla = 5, /obj/item/food/monkeycube/syndicate = 5, - /obj/item/greentext = 10, /obj/item/grenade/chem_grenade/teargas/moustache = 10, list( /obj/item/grenade/clusterbuster/antiweed = 1, @@ -78,23 +74,15 @@ GLOBAL_LIST_INIT(oddity_loot, list(//oddity: strange or crazy items /obj/item/grenade/clusterbuster/smoke = 1, /obj/item/grenade/clusterbuster/soap = 1, /obj/item/grenade/clusterbuster/teargas = 1 - ) = 10, - /obj/item/gun/ballistic/revolver/russian = 25, - /obj/item/gun/energy/gravity_gun = 5, - /obj/item/gun/energy/laser/practice/sc_laser = 5, - /obj/item/gun/energy/meteorgun/pen = 1, - /obj/item/hot_potato = 10, - /obj/item/lazarus_injector = 25, - /obj/item/lighter/bright = 1, + ) = 15, /obj/item/pinata/syndie = 1, list( /obj/item/pizzabox/bomb = 1, /obj/item/pizzabox/bomb/armed = 3 ) = 10, - /obj/item/reagent_containers/hypospray/medipen/snail = 1, - /obj/item/seeds/kudzu = 1, + /obj/item/reagent_containers/hypospray/medipen/snail = 5, + /obj/item/seeds/kudzu = 5, /obj/item/sharpener = 1, - /obj/item/smelling_salts = 1, /obj/item/spider_egg = 5, /obj/item/stack/telecrystal = 5, /obj/item/storage/belt/champion/wrestling = 1, @@ -111,21 +99,28 @@ GLOBAL_LIST_INIT(oddity_loot, list(//oddity: strange or crazy items /obj/item/storage/box/syndie_kit/sleepytime = 10, /obj/item/storage/box/syndie_kit/space = 1, /obj/item/storage/box/syndie_kit/stickers = 10, - /obj/item/taster = 10, /obj/item/toy/crayon/spraycan/hellcan = 1, /obj/item/toy/plush/carpplushie/dehy_carp = 5, - /obj/item/watertank/pepperspray = 1, + /obj/item/watertank/pepperspray = 5, /obj/item/gravity_harness = 5, - /obj/item/wheelchair/gold = 1, /obj/item/spellpacket/lightningbolt = 10, //These do no damage, but they stun. - /obj/item/modular_computer/pda/clear = 30, /obj/item/chair/musical = 10, - /obj/item/transfer_valve/fake = 1, - /obj/item/tailclub = 5, + /obj/item/transfer_valve/fake = 5, /obj/item/hot_potato/harmless = 1, - list( - /obj/item/dice/d20/fate/one_use = 1 - ) = 10, /obj/item/grenade/stingbang/mega = 1, - /obj/item/card/emag/one_shot = 1 + /obj/item/card/emag/one_shot = 5, + /obj/item/stack/sticky_tape/pointy = 10, + /obj/item/stack/sticky_tape/pointy/super = 1, + /obj/item/dnainjector/timed/hulk = 1, + /obj/item/extinguisher/anti = 5, + /obj/item/gift/anything = 50, + /obj/item/v8_engine = 20, + /obj/item/melee/skateboard/hoverboard = 30, + /obj/item/katana = 1, + /obj/item/defibrillator/compact = 1, + /obj/item/melee/baton = 1, + /obj/item/seeds/firelemon = 1, + /obj/item/clothing/head/helmet/abductor = 20, + /obj/item/disk/surgery/advanced_plastic_surgery = 10, + )) diff --git a/modular_zubbers/code/_globalvars/lists/maintenance_loot_one_of_a_kind.dm b/modular_zubbers/code/_globalvars/lists/maintenance_loot_one_of_a_kind.dm new file mode 100644 index 0000000000000..3b2ae85c4579c --- /dev/null +++ b/modular_zubbers/code/_globalvars/lists/maintenance_loot_one_of_a_kind.dm @@ -0,0 +1,13 @@ +GLOBAL_LIST_INIT(one_of_a_kind_loot, list( + /obj/item/clothing/suit/armor/reactive/table, + /obj/item/clothing/shoes/jackboots/fast, + /obj/item/melee/energy/sword/bananium, + /obj/item/dice/d20/fate/one_use, + /obj/item/modular_computer/pda/clear, + /obj/item/gun/energy/meteorgun/pen, + /obj/item/hot_potato, + /obj/item/clothing/shoes/gunboots/disabler, + /obj/item/spear/grey_tide, + /obj/item/shadowcloak, + /obj/item/disk/nuclear/fake, +)) \ No newline at end of file diff --git a/modular_zubbers/code/_globalvars/lists/maintenance_loot_rare.dm b/modular_zubbers/code/_globalvars/lists/maintenance_loot_rare.dm index 22454df812ff5..dacfdbb1f2604 100644 --- a/modular_zubbers/code/_globalvars/lists/maintenance_loot_rare.dm +++ b/modular_zubbers/code/_globalvars/lists/maintenance_loot_rare.dm @@ -1,6 +1,6 @@ GLOBAL_LIST_INIT(rarity_loot, list(//rare: really good items - TODO: FIND THE NEW PATHS FROM THE COMMENTED PARTS /obj/item/aicard/aitater = 10, - /obj/item/ammo_box/foambox/riot = 50, + /obj/item/ammo_box/foambox/riot = 25, list( /obj/item/survivalcapsule = 100, /obj/item/survivalcapsule/luxury = 10, @@ -8,35 +8,8 @@ GLOBAL_LIST_INIT(rarity_loot, list(//rare: really good items - TODO: FIND THE NE /obj/item/survivalcapsule/sauna = 5, /obj/item/survivalcapsule/bathroom = 1 ) = 25, - /obj/item/table_clock = 50, - /obj/item/storage/briefcase/coderbus = 25, - list( - /obj/item/ammo_casing/shotgun/antitide = 1, - /obj/item/ammo_casing/shotgun/beanbag = 1, - /obj/item/ammo_casing/shotgun/beehive = 1, - /obj/item/ammo_casing/shotgun/buckshot = 50, - /obj/item/ammo_casing/shotgun/dart = 1, - /obj/item/ammo_casing/shotgun/dragonsbreath = 1, - /obj/item/ammo_casing/shotgun/express = 1, - /obj/item/ammo_casing/shotgun/flechette = 1, - /obj/item/ammo_casing/shotgun/frag12 = 1, -// /obj/item/ammo_casing/shotgun/honk = 25, -// /obj/item/ammo_casing/shotgun/hp = 1, - /obj/item/ammo_casing/shotgun/hunter = 1, -// /obj/item/ammo_casing/shotgun/iceblox = 1, - /obj/item/ammo_casing/shotgun/improvised = 200, - /obj/item/ammo_casing/shotgun/incapacitate = 1, - /obj/item/ammo_casing/shotgun/incendiary = 1, - /obj/item/ammo_casing/shotgun/ion = 1, - /obj/item/ammo_casing/shotgun/laserslug = 1, - /obj/item/ammo_casing/shotgun/magnum = 1, -// /obj/item/ammo_casing/shotgun/pt20 = 1, - /obj/item/ammo_casing/shotgun/pulverizer = 1, -// /obj/item/ammo_casing/shotgun/rip = 1, - /obj/item/ammo_casing/shotgun/rubbershot = 100, - /obj/item/ammo_casing/shotgun/stunslug = 25, - /obj/item/ammo_casing/shotgun/techshell = 75 - ) = 100, + /obj/item/table_clock = 25, + /obj/item/storage/briefcase/coderbus = 10, /obj/item/analyzer/ranged = 1, list( /obj/item/autosurgeon/organ/nif/disposable = 10, @@ -107,7 +80,7 @@ GLOBAL_LIST_INIT(rarity_loot, list(//rare: really good items - TODO: FIND THE NE /obj/item/rsf = 10, /obj/item/rsf/cookiesynth = 5, /obj/item/rwd/loaded = 10 - ) = 10, + ) = 20, /obj/item/cortical_cage = 5, /obj/item/detective_scanner = 15, list( @@ -135,7 +108,7 @@ GLOBAL_LIST_INIT(rarity_loot, list(//rare: really good items - TODO: FIND THE NE /obj/item/dnainjector/antenna = 1 ) = 25, /obj/item/dog_bone = 5, - /obj/item/door_seal = 5, + /obj/item/door_seal = 10, list( /obj/item/language_manual/roundstart_species = 1 ) = 10, @@ -169,12 +142,12 @@ GLOBAL_LIST_INIT(rarity_loot, list(//rare: really good items - TODO: FIND THE NE /obj/item/pizzabox/pineapple = 1, /obj/item/pizzabox/vegetable = 1, /obj/item/pizzabox/random = 3 //Mothic. - ) = 30, + ) = 20, list( /obj/item/quickdeploy/barricade = 50, /obj/item/quickdeploy/barricade/plasteel = 10, /obj/item/storage/barricade = 5 - ) = 10, + ) = 20, list( /obj/item/restraints/legcuffs/beartrap = 10, /obj/item/restraints/legcuffs/beartrap/prearmed = 1 @@ -191,17 +164,17 @@ GLOBAL_LIST_INIT(rarity_loot, list(//rare: really good items - TODO: FIND THE NE /obj/item/storage/medkit/o2 = 25, /obj/item/storage/medkit/surgery = 5, /obj/item/storage/medkit/toxin = 25 - ) = 75, + ) = 50, /obj/item/crucifix = 5, list( /obj/item/hairbrush/switchblade = 5, /obj/item/hairbrush/tactical = 1 ) = 5, - /obj/item/geneshears = 10, + /obj/item/geneshears = 5, /obj/item/sign/flag/usa = 5, /obj/item/spess_knife = 5, /obj/item/borg_restart_board = 5, - /obj/item/switchblade = 5, + /obj/item/switchblade = 1, /obj/item/throwing_star = 5, /obj/item/grenade/primer/stingbang = 1, list( @@ -209,5 +182,44 @@ GLOBAL_LIST_INIT(rarity_loot, list(//rare: really good items - TODO: FIND THE NE /obj/item/tank/internals/emergency_oxygen/engi/clown/n2o = 1, /obj/item/tank/internals/emergency_oxygen/engi/clown/bz = 1, /obj/item/tank/internals/emergency_oxygen/engi/clown/helium = 1 - ) = 5 + ) = 5, + list( + /obj/item/stack/sheet/mineral/adamantine = 1, + /obj/item/stack/sheet/mineral/runite = 1, + /obj/item/stack/sheet/mineral/mythril = 5, + /obj/item/stack/sheet/mineral/abductor = 1, + /obj/item/stack/sheet/runed_metal/five = 5, + /obj/item/stack/sheet/hauntium/five = 25, + /obj/item/stack/sheet/cobolterium/three = 50, + /obj/item/stack/sheet/copporcitite/three = 50, + /obj/item/stack/sheet/tinumium/three = 50, + /obj/item/stack/sheet/brussite/three = 50, + ) = 20, + /obj/item/reagent_containers/cup/soda_cans/shamblers/eldritch = 1, + list( + /obj/item/reagent_containers/spray/mister/pepperspray = 1, + /obj/item/reagent_containers/spray/pepper = 10, + /obj/item/reagent_containers/spray/pepper/empty = 100, + /obj/item/reagent_containers/spray/medical = 50, + /obj/item/reagent_containers/spray = 100, + ) = 50, + /obj/item/implanter/toaster = 10, + /obj/item/plunger/reinforced = 5, + /obj/item/upgradescroll = 1, + list( + /obj/item/stake = 100, + /obj/item/stake/hardened = 50, + /obj/item/stake/hardened/silver = 25 + ) = 10, + /obj/item/lazarus_injector = 5, + /obj/item/tailclub = 5, + /obj/item/bikehorn/airhorn = 5, + /obj/item/toy/snappop/phoenix = 5, + /obj/item/melee/skateboard/pro = 5, + list( + /obj/item/book/granter/crafting_recipe/dusting/pipegun_prime = 1, + /obj/item/book/granter/crafting_recipe/dusting/laser_musket_prime = 1 + ) = 10, + /obj/item/skillchip/intj = 5, + )) diff --git a/modular_zubbers/code/_globalvars/lists/maintenance_loot_trash.dm b/modular_zubbers/code/_globalvars/lists/maintenance_loot_trash.dm index 514c7e1001cb2..89575dcb42837 100644 --- a/modular_zubbers/code/_globalvars/lists/maintenance_loot_trash.dm +++ b/modular_zubbers/code/_globalvars/lists/maintenance_loot_trash.dm @@ -105,7 +105,38 @@ GLOBAL_LIST_INIT(trash_loot, list(//junk: useless, very easy to get, or ghetto c /obj/item/trash/vendor_trash/mothmallow = 5, /obj/item/trash/vendor_trash/rice_crackers = 5, /obj/item/trash/waffles = 5, - /obj/item/popsicle_stick = 20 + /obj/item/popsicle_stick = 20, + /obj/item/trash/candy/hundred_credit_bar = 5, + /obj/item/trash/candy/coconut_joy = 5, + /obj/item/trash/candy/hurr_bar = 5, + /obj/item/trash/candy/laughter_bar = 5, + /obj/item/trash/candy/kit_catgirl_metaclique_bar = 5, + /obj/item/trash/candy/twink_bar = 5, + /obj/item/trash/candy/elon_musk_bar = 5, + /obj/item/trash/candy/malf_way = 5, + /obj/item/trash/candy/triggerfinger = 5, + /obj/item/trash/popcorn/caramel = 5, + /obj/item/trash/popcorn/salty = 5, + /obj/item/trash/fleet_ration = 5, + /obj/item/trash/semki/healthy = 5, + /obj/item/trash/can/food/squid_ink = 5, + /obj/item/trash/can/food/chap = 5, + /obj/item/trash/hot_shots = 5, + /obj/item/trash/sticko = 5, + /obj/item/trash/sticko/matcha = 5, + /obj/item/trash/sticko/nutty = 5, + /obj/item/trash/sticko/pineapple = 5, + /obj/item/trash/sticko/yuyake = 5, + /obj/item/trash/shok_roks = 5, + /obj/item/trash/shok_roks/citrus = 5, + /obj/item/trash/shok_roks/berry = 5, + /obj/item/trash/shok_roks/tropical = 5, + /obj/item/trash/shok_roks/lanternfruit = 5, + /obj/item/trash/champagne_cork = 5, + /obj/item/trash/champagne_cork/sabrage = 5, + /obj/item/trash/pljeskavica = 5, + /obj/item/trash/nachos = 5, + /obj/item/trash/blins = 5 ) = 300, /obj/item/broken_missile = 1, /obj/item/c_tube = 100, @@ -151,49 +182,6 @@ GLOBAL_LIST_INIT(trash_loot, list(//junk: useless, very easy to get, or ghetto c /obj/item/food/spiderling = 50, /obj/item/food/spiderlollipop = 25 ) = 200, - list( - /obj/item/food/drug/moon_rock = 1, - /obj/item/food/drug/saturnx = 1, - /obj/item/reagent_containers/blacktar = 1, - /obj/item/reagent_containers/cocaine = 1, - /obj/item/reagent_containers/crack = 1, - /obj/item/reagent_containers/cup/blastoff_ampoule = 1, - /obj/item/reagent_containers/hash = 1, - /obj/item/reagent_containers/hash/dabs = 1, - /obj/item/reagent_containers/heroin = 1, - /obj/item/reagent_containers/hypospray/medipen/pumpup = 100, - /obj/item/reagent_containers/pill/cyanide = 1, - /obj/item/reagent_containers/pill/happy = 5, - /obj/item/reagent_containers/pill/happinesspsych = 5, - /obj/item/reagent_containers/pill/lsd = 5, - /obj/item/reagent_containers/pill/lsdpsych = 5, - /obj/item/reagent_containers/pill/maintenance/achievement = 200, - /obj/item/reagent_containers/pill/nanite_slurry = 5, - /obj/item/reagent_containers/pill/zoom = 5, - /obj/item/reagent_containers/syringe/contraband/bath_salts = 1, - /obj/item/reagent_containers/syringe/contraband/fentanyl = 1, - /obj/item/reagent_containers/syringe/contraband/krokodil = 1, - /obj/item/reagent_containers/syringe/contraband/methamphetamine = 1, - /obj/item/reagent_containers/syringe/contraband/morphine = 1, - /obj/item/reagent_containers/syringe/contraband/saturnx = 1, - /obj/item/reagent_containers/syringe/contraband/space_drugs = 1, - /obj/item/reagent_containers/vapecart/bluekush = 1, - /obj/item/reagent_containers/vapecart/cheese = 1, - /obj/item/reagent_containers/vapecart/pwrgame = 1, - /obj/item/reagent_containers/vapecart/reddiesel = 1, - /obj/item/reagent_containers/vapecart/syndicate = 1, - /obj/item/storage/pill_bottle/happinesspsych = 1, - /obj/item/storage/pill_bottle/happy = 1, - /obj/item/storage/pill_bottle/lsd = 1, - /obj/item/storage/pill_bottle/lsdpsych = 1, - /obj/item/storage/pill_bottle/maintenance_pill = 25, - /obj/item/storage/pill_bottle/zoom = 1, - /obj/item/tattoo_kit = 75, - /obj/item/reagent_containers/crackbrick = 1, - /obj/item/reagent_containers/cocainebrick = 1, - /obj/item/reagent_containers/heroinbrick = 1, - /obj/item/reagent_containers/hashbrick = 1 - ) = 50, list( /obj/item/inflatable = 3, /obj/item/inflatable/door = 1, diff --git a/modular_zubbers/code/_globalvars/lists/maintenance_loot_uncommon.dm b/modular_zubbers/code/_globalvars/lists/maintenance_loot_uncommon.dm index 0c0d8ef2ad07e..bb82942deee94 100644 --- a/modular_zubbers/code/_globalvars/lists/maintenance_loot_uncommon.dm +++ b/modular_zubbers/code/_globalvars/lists/maintenance_loot_uncommon.dm @@ -1,24 +1,45 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items - /obj/item/airbag = 25, + list( + /obj/item/ammo_casing/shotgun/antitide = 1, + /obj/item/ammo_casing/shotgun/beanbag = 1, + /obj/item/ammo_casing/shotgun/beehive = 1, + /obj/item/ammo_casing/shotgun/buckshot = 50, + /obj/item/ammo_casing/shotgun/dart = 1, + /obj/item/ammo_casing/shotgun/dragonsbreath = 1, + /obj/item/ammo_casing/shotgun/express = 1, + /obj/item/ammo_casing/shotgun/flechette = 1, + /obj/item/ammo_casing/shotgun/frag12 = 1, + /obj/item/ammo_casing/shotgun/hunter = 1, + /obj/item/ammo_casing/shotgun/improvised = 300, + /obj/item/ammo_casing/shotgun/incapacitate = 1, + /obj/item/ammo_casing/shotgun/incendiary = 1, + /obj/item/ammo_casing/shotgun/ion = 1, + /obj/item/ammo_casing/shotgun/laserslug = 1, + /obj/item/ammo_casing/shotgun/magnum = 1, + /obj/item/ammo_casing/shotgun/pulverizer = 1, + /obj/item/ammo_casing/shotgun/rubbershot = 100, + /obj/item/ammo_casing/shotgun/stunslug = 25, + /obj/item/ammo_casing/shotgun/techshell = 75 + ) = 75, /obj/item/anesthetic_machine_kit = 10, /obj/item/anomaly_neutralizer = 25, /obj/item/aquarium_kit = 10, /obj/item/assembly/flash = 10, /obj/item/assembly/shock_kit = 25, /obj/item/autopsy_scanner = 10, - /obj/item/ballistic_broken = 1, - /obj/item/corpsman_broken = 1, - /obj/item/pointman_broken = 1, - /obj/item/banhammer = 5, - /obj/item/barcode = 5, - /obj/item/barcodescanner = 25, + list( + /obj/item/ballistic_broken = 1, + /obj/item/corpsman_broken = 1, + /obj/item/pointman_broken = 1, + ) = 1, + /obj/item/barcodescanner = 10, /obj/item/dest_tagger = 10, /obj/item/sales_tagger = 5, - /obj/item/binoculars = 10, + /obj/item/binoculars = 25, /obj/item/biopsy_tool = 25, /obj/item/pai_card = 10, - /obj/item/reagent_containers/spray/cleaner = 50, - /obj/item/clothing/neck/stethoscope = 40, + /obj/item/reagent_containers/spray/cleaner = 25, + /obj/item/clothing/neck/stethoscope = 30, list( /obj/item/vending_refill/assist = 1, /obj/item/vending_refill/autodrobe = 1, @@ -72,8 +93,14 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items /obj/item/vending_refill/wardrobe/sec_wardrobe = 1, /obj/item/vending_refill/wardrobe/syndie_wardrobe = 1, /obj/item/vending_refill/wardrobe/viro_wardrobe = 1, - /obj/item/vending_refill/youtool = 1 - ) = 100, + /obj/item/vending_refill/youtool = 1, + /obj/item/vending_refill/hotdog = 1, + /obj/item/vending_refill/snack/imported/tiziran = 1, + /obj/item/vending_refill/medical_deforest = 1, + /obj/item/vending_refill/lustwish = 1, + /obj/item/vending_refill/halloween_chocolate = 1, + /obj/item/vending_refill/vacation = 1 + ) = 50, list( /obj/item/storage/box/actionfigure = 100, /obj/item/storage/box/aquarium_props = 25, @@ -153,7 +180,13 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items /obj/item/storage/box/zipties = 25, /obj/item/storage/fancy/candle_box = 200, /obj/item/storage/inflatable = 200, - /obj/item/storage/lockbox/dueling = 25 + /obj/item/storage/lockbox/dueling = 25, + /obj/item/storage/box/skub = 5, + /obj/item/storage/box/stickers/anti_skub = 5, + /obj/item/storage/box/fishing_hooks = 1, + /obj/item/storage/box/fishing_lines = 1, + /obj/item/storage/box/utensils = 5, + /obj/item/storage/fancy/egg_box/fertile = 1 ) = 200, list( /obj/item/blood_filter = 10, @@ -184,14 +217,13 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items /obj/item/surgical_processor = 25, /obj/item/surgicaldrill = 25 ) = 100, - /obj/item/book/codex_gigas = 10, list( /obj/item/book/granter/crafting_recipe/boneyard_notes = 1, - /obj/item/book/granter/crafting_recipe/cooking_sweets_101 = 5, + /obj/item/book/granter/crafting_recipe/cooking_sweets_101 = 1, /obj/item/book/granter/crafting_recipe/death_sandwich = 1, - /obj/item/book/granter/crafting_recipe/trash_cannon = 1, - /obj/item/book/granter/sign_language = 5 - ) = 100, + /obj/item/book/granter/crafting_recipe/trash_cannon = 5, + /obj/item/book/granter/sign_language = 1 + ) = 50, list( /obj/item/bot_assembly/cleanbot = 100, /obj/item/bot_assembly/ed209 = 25, @@ -212,7 +244,7 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items /obj/item/clothing/glasses/blindfold = 25, /obj/item/clothing/mask/muzzle = 25, /obj/item/clothing/suit/jacket/straight_jacket = 1, - /obj/item/electropack = 5, + /obj/item/electropack = 10, /obj/item/restraints/handcuffs = 50, /obj/item/restraints/handcuffs/cable/zipties = 25, /obj/item/restraints/legcuffs/bola = 50 @@ -271,7 +303,7 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items list( /obj/item/clothing/head/helmet/toggleable/justice = 1, /obj/item/clothing/head/helmet/toggleable/justice/escape = 1 - ) = 20, + ) = 10, list( /obj/item/clothing/head/utility/welding = 10, /obj/item/clothing/glasses/welding = 5, @@ -320,7 +352,7 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items /obj/item/megaphone/clown = 5, /obj/item/megaphone/command = 1, /obj/item/megaphone/sec = 1 - ) = 25, + ) = 10, /obj/item/mending_globule = 5, list( /obj/item/mod/core/ethereal = 25, @@ -395,13 +427,11 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items /obj/item/nifsoft_remover = 5, /obj/item/pet_carrier = 20, /obj/item/petri_dish/random = 40, - /obj/item/rack_parts = 75, /obj/item/reagent_containers/blood/random = 50, list( - /obj/item/reagent_containers/cup/bottle/acidic_buffer = 200, + /obj/item/reagent_containers/cup/bottle/random_buffer = 300, /obj/item/reagent_containers/cup/bottle/amanitin = 10, /obj/item/reagent_containers/cup/bottle/ammonia = 25, - /obj/item/reagent_containers/cup/bottle/basic_buffer = 200, /obj/item/reagent_containers/cup/bottle/chlorine = 25, /obj/item/reagent_containers/cup/bottle/clownstears = 10, /obj/item/reagent_containers/cup/bottle/diethylamine = 50, @@ -428,8 +458,42 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items /obj/item/reagent_containers/cup/bottle/toxin = 5, /obj/item/reagent_containers/cup/bottle/traitor = 25, /obj/item/reagent_containers/cup/bottle/water = 75, - /obj/item/reagent_containers/cup/bottle/welding_fuel = 100 - ) = 150, + /obj/item/reagent_containers/cup/bottle/welding_fuel = 25, + /obj/item/reagent_containers/cup/bottle/cyanide = 1, + /obj/item/reagent_containers/cup/bottle/morphine = 10, + /obj/item/reagent_containers/cup/bottle/chloralhydrate = 5, + /obj/item/reagent_containers/cup/bottle/mannitol = 5, + /obj/item/reagent_containers/cup/bottle/multiver = 50, + /obj/item/reagent_containers/cup/bottle/phlogiston = 1, + /obj/item/reagent_containers/cup/bottle/ammoniated_mercury = 1, + /obj/item/reagent_containers/cup/bottle/syriniver = 5, + /obj/item/reagent_containers/cup/bottle/synaptizine = 5, + /obj/item/reagent_containers/cup/bottle/facid = 5, + /obj/item/reagent_containers/cup/bottle/capsaicin = 50, + /obj/item/reagent_containers/cup/bottle/potass_iodide = 10, + /obj/item/reagent_containers/cup/bottle/atropine = 1, + /obj/item/reagent_containers/cup/bottle/thermite = 1, + /obj/item/reagent_containers/cup/bottle/saltpetre = 50, + /obj/item/reagent_containers/cup/bottle/leadacetate = 5, + /obj/item/reagent_containers/cup/bottle/rezadone = 1 + ) = 200, + list( + /obj/item/reagent_containers/cup/bottle/hydrogen = 100, + /obj/item/reagent_containers/cup/bottle/carbon = 100, + /obj/item/reagent_containers/cup/bottle/nitrogen = 100, + /obj/item/reagent_containers/cup/bottle/oxygen = 100, + /obj/item/reagent_containers/cup/bottle/sodium = 100, + /obj/item/reagent_containers/cup/bottle/aluminium = 100, + /obj/item/reagent_containers/cup/bottle/silicon = 100, + /obj/item/reagent_containers/cup/bottle/phosphorus = 100, + /obj/item/reagent_containers/cup/bottle/sulfur = 100, + /obj/item/reagent_containers/cup/bottle/iron = 100, + /obj/item/reagent_containers/cup/bottle/copper = 100, + /obj/item/reagent_containers/cup/bottle/radium = 100, + /obj/item/reagent_containers/cup/bottle/sacid = 100, + /obj/item/reagent_containers/cup/bottle/silver = 100, + /obj/item/reagent_containers/cup/bottle/bromine = 100 + ) = 100, list( /obj/item/skillchip/appraiser = 100, /obj/item/skillchip/basketweaving = 100, @@ -443,7 +507,7 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items /obj/item/skillchip/job/roboticist = 10, /obj/item/skillchip/light_remover = 100, /obj/item/skillchip/sabrage = 100, - /obj/item/skillchip/useless_adapter = 200, + /obj/item/skillchip/useless_adapter = 100, /obj/item/skillchip/wine_taster = 100, /obj/item/skillchip/xenoarch_magnifier = 25, /obj/item/skillchip/master_angler = 25, @@ -495,5 +559,53 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items /obj/item/fishing_rod/telescopic/master = 1, /obj/item/fishing_rod/tech = 1, /obj/item/bait_can = 20 - ) = 10 + ) = 20, + list( + /obj/item/storage/pill_bottle = 200, + /obj/item/storage/pill_bottle/multiver = 50, + /obj/item/storage/pill_bottle/multiver/less = 75, + /obj/item/storage/pill_bottle/epinephrine = 50, + /obj/item/storage/pill_bottle/mutadone = 25, + /obj/item/storage/pill_bottle/potassiodide = 10, + /obj/item/storage/pill_bottle/probital = 10, + /obj/item/storage/pill_bottle/iron = 50, + /obj/item/storage/pill_bottle/mannitol = 25, + /obj/item/storage/pill_bottle/stimulant = 1, + /obj/item/storage/pill_bottle/sansufentanyl = 10, + /obj/item/storage/pill_bottle/mining = 5, + /obj/item/storage/pill_bottle/aranesp = 5, + /obj/item/storage/pill_bottle/psicodine = 50, + /obj/item/storage/pill_bottle/penacid = 5, + /obj/item/storage/pill_bottle/neurine = 5, + /obj/item/storage/pill_bottle/maintenance_pill/full = 100, + /obj/item/storage/pill_bottle/paxpsych = 5, + /obj/item/storage/pill_bottle/naturalbait = 100, + /obj/item/storage/pill_bottle/ondansetron = 5, + /obj/item/storage/pill_bottle/prescription_stimulant = 5, + /obj/item/storage/pill_bottle/painkiller = 20, + /obj/item/storage/pill_bottle/liquid_solder = 20, + /obj/item/storage/pill_bottle/liquid_solder/braintumor = 20, + /obj/item/storage/pill_bottle/nanite_slurry = 20, + /obj/item/storage/pill_bottle/system_cleaner = 20 + ) = 40, + list( + /obj/item/storage/lunchbox = 100, + /obj/item/storage/lunchbox/nanotrasen = 200, + /obj/item/storage/lunchbox/medical = 50, + /obj/item/storage/lunchbox/bunny = 50, + /obj/item/storage/lunchbox/corgi = 50, + /obj/item/storage/lunchbox/heart = 50, + /obj/item/storage/lunchbox/safetymoth = 50, + /obj/item/storage/lunchbox/amongus = 10 + ) = 20, + /obj/item/roulette_wheel_beacon = 10, + list( + /obj/item/stack/cannonball = 10, + /obj/item/stack/cannonball/trashball/four = 50, + ) = 20, + /obj/item/reagent_containers/cup/soda_cans/random = 10, + /obj/item/reagent_containers/spray/mister/janitor = 5, + /obj/item/clothing/shoes/jackboots = 20, + + )) diff --git a/modular_zubbers/code/game/Items/big_bertha_shield.dm b/modular_zubbers/code/game/Items/big_bertha_shield.dm new file mode 100644 index 0000000000000..75b3c7f9da5e5 --- /dev/null +++ b/modular_zubbers/code/game/Items/big_bertha_shield.dm @@ -0,0 +1,56 @@ +/obj/item/shield/big_bertha + name = "Big Bertha" + desc = "A shield so fat and heavy, it should block just about anything, as long as you have the stamina for it." + icon = 'modular_zubbers/icons/obj/big_bertha_shield.dmi' + lefthand_file = 'modular_zubbers/icons/mob/inhands/big_bertha_both.dmi' + righthand_file = 'modular_zubbers/icons/mob/inhands/big_bertha_both.dmi' + icon_state = "big_bertha" + block_chance = 100 + slot_flags = null + force = 12 + throwforce = 3 + throw_speed = 1 + throw_range = 2 + w_class = WEIGHT_CLASS_HUGE + attack_verb_continuous = list("shoves", "bashes","berthas") + attack_verb_simple = list("shove", "bash","bertha") + armor_type = /datum/armor/big_bertha + block_sound = 'sound/weapons/block_shield.ogg' + breakable_by_damage = FALSE + item_flags = IMMUTABLE_SLOW | SLOWS_WHILE_IN_HAND + slowdown = 2 + transparent = FALSE + +/obj/item/shield/big_bertha/Initialize(mapload) + . = ..() + AddComponent(/datum/component/two_handed, require_twohands = TRUE) + RemoveElement(/datum/element/disarm_attack) + +/obj/item/shield/big_bertha/on_shield_block(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", damage = 0, attack_type = MELEE_ATTACK, damage_type = BRUTE) + + . = ..() + + if(damage < 10) //Most things that deal 10 or more damage are heavy, like toolboxes. + return + + if(prob(owner.getStaminaLoss())) + owner.visible_message( + span_warning("The force of [attack_text] from [hitby] knocks down [owner]!"), + span_userdanger("The force of [attack_text] from [hitby] knocks you down!"), + span_notice("You hear a loud thud!"), + COMBAT_MESSAGE_RANGE + ) + owner.Knockdown(2 SECONDS) //The shield saved you, but at what cost? + + owner.adjustStaminaLoss(damage*0.5) + owner.set_jitter_if_lower(1 SECONDS) + owner.Immobilize(1 SECONDS) + + +/datum/armor/big_bertha + melee = 100 + bullet = 100 + laser = 75 + bomb = 50 + fire = 80 + acid = 70 diff --git a/modular_zubbers/code/game/objects/items/bulldog.dm b/modular_zubbers/code/game/objects/items/bulldog.dm index 2f9c294e68d7f..e784b711eb5dd 100644 --- a/modular_zubbers/code/game/objects/items/bulldog.dm +++ b/modular_zubbers/code/game/objects/items/bulldog.dm @@ -1,3 +1,3 @@ /obj/item/gun/ballistic/shotgun/bulldog - burst_size = NULL + burst_size = 1 fire_delay = 1 diff --git a/modular_zubbers/code/game/objects/structures/trash_pile.dm b/modular_zubbers/code/game/objects/structures/trash_pile.dm index 5fe047b4a7112..c85889ecc44d9 100644 --- a/modular_zubbers/code/game/objects/structures/trash_pile.dm +++ b/modular_zubbers/code/game/objects/structures/trash_pile.dm @@ -16,8 +16,8 @@ var/list/searched_by_ckeys = list() //Assoc list of people who searched this trash pile (value is 1), or started searching (value is 0) - var/trash_delay = 0.25 SECONDS - var/funny_sound_delay = 0.1 SECONDS + var/trash_delay = 0.5 SECONDS + var/funny_sound_delay = 0.2 SECONDS COOLDOWN_DECLARE(trash_cooldown) COOLDOWN_DECLARE(funny_sound_cooldown) @@ -63,6 +63,7 @@ /obj/structure/trash_pile/Initialize(mapload) . = ..() AddElement(/datum/element/climbable) + AddElement(/datum/element/elevation, pixel_shift = 12) icon_state = pick( "pile1", "pile2", @@ -118,7 +119,8 @@ if(searched_by_ckeys[user.ckey]) balloon_alert(user, "empty...") return TRUE - var/obj/item/spawned_item = produce_item_from_list(get_turf(src),GLOB.trash_pile_loot) + var/obj/item/spawned_item = prob(25) ? pick_weight_recursive(GLOB.common_loot) : pick_weight_recursive(GLOB.trash_pile_loot) + spawned_item = new spawned_item(get_turf(src)) if(spawned_item) balloon_alert(user, "found [spawned_item.name]!") else @@ -186,13 +188,6 @@ /obj/structure/trash_pile/relaymove(mob/user) container_resist_act(user) -/obj/structure/trash_pile/proc/produce_item_from_list(turf/spawn_loc,list/list_to_use) - var/lootspawn = pick_weight(list_to_use) - while(islist(lootspawn)) - lootspawn = pick_weight(lootspawn) - var/obj/item/hidden_item = new lootspawn(spawn_loc) - return hidden_item - /obj/structure/trash_pile/proc/throw_trash(mob/user) if(QDELETED(src) || QDELETED(user)) //Check if valid. @@ -201,21 +196,24 @@ if(isnum(searched_by_ckeys[user.ckey])) //Don't spawn trash! return TRUE - var/turf/T + var/turf/T = get_turf(user) + if(get_dist(T,src) > 1) //Distance check for TK fuckery + return TRUE + if(COOLDOWN_FINISHED(src, trash_cooldown)) COOLDOWN_START(src, trash_cooldown, trash_delay*0.5 + rand()*trash_delay) // x0.5 to x1.5 - if(!T) - T = get_turf(user) - var/obj/item/spawned_item = produce_item_from_list(T,GLOB.trash_loot) - if(spawned_item) - var/turf/throw_at = get_ranged_target_turf_direct(src, user, 7, rand(-60,60)) - if(spawned_item.safe_throw_at(throw_at, rand(2,4), rand(1,3), user, spin = TRUE)) - playsound(T, 'sound/weapons/punchmiss.ogg', 10) + var/obj/item/spawned_item + if(length(GLOB.one_of_a_kind_loot) && prob(0.1)) //1 in 1000 + spawned_item = pick_n_take(GLOB.one_of_a_kind_loot) + else + spawned_item = pick_weight_recursive(GLOB.trash_loot) + spawned_item = new spawned_item(T) + var/turf/throw_at = get_ranged_target_turf_direct(src, user, 7, rand(-60,60)) + if(spawned_item.safe_throw_at(throw_at, rand(2,4), rand(1,3), user, spin = TRUE)) + playsound(T, 'sound/weapons/punchmiss.ogg', 10) if(COOLDOWN_FINISHED(src,funny_sound_cooldown)) COOLDOWN_START(src, funny_sound_cooldown, funny_sound_delay*0.5 + rand()*funny_sound_delay) // x0.5 to x1.5 - if(!T) - T = get_turf(user) playsound(T,pick_weight(funny_sounds), 25) return TRUE diff --git a/modular_zubbers/code/game/turfs/open/openspace.dm b/modular_zubbers/code/game/turfs/open/openspace.dm index b540530c8c648..986ed2d944846 100644 --- a/modular_zubbers/code/game/turfs/open/openspace.dm +++ b/modular_zubbers/code/game/turfs/open/openspace.dm @@ -1,10 +1,4 @@ -//Stolen from glass floor code. - -/turf/open/chasm/moonstation - - name = "moon chasm" - baseturfs = /turf/open/chasm/moonstation - +/turf/open/openspace/moonstation icon = 'icons/turf/floors/moonchasm.dmi' icon_state = "moonchasm-255" base_icon_state = "moonchasm" @@ -12,14 +6,21 @@ initial_gas_mix = MOONSTATION_ATMOS planetary_atmos = TRUE -/turf/open/chasm/moonstation/Initialize(mapload) + smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER + smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_TURF_CHASM + canSmoothWith = SMOOTH_GROUP_TURF_CHASM + + baseturfs = /turf/open/openspace/moonstation + + plane = FLOOR_PLANE + +/turf/open/openspace/moonstation/Initialize(mapload) icon_state = "" - ..() - return INITIALIZE_HINT_LATELOAD + . = ..() -/turf/open/chasm/moonstation/LateInitialize() - AddElement(/datum/element/turf_z_transparency) +/turf/open/openspace/moonstation/LateInitialize() + . = ..() var/turf/T = GET_TURF_BELOW(src) if(ismineralturf(T)) var/turf/closed/mineral/M = T - M.gets_drilled() \ No newline at end of file + M.gets_drilled() diff --git a/modular_zubbers/code/modules/admin/verbs/debug.dm b/modular_zubbers/code/modules/admin/verbs/debug.dm index aa4645b9c1d17..0f1c6c90e6e9f 100644 --- a/modular_zubbers/code/modules/admin/verbs/debug.dm +++ b/modular_zubbers/code/modules/admin/verbs/debug.dm @@ -1,13 +1,10 @@ -/client/proc/debug_maintenance_loot() - set category = "Debug" - set name = "Debug Missing Maintenance Loot" - if(!check_rights(R_DEBUG)) - return - var/confirm = input("Are you sure you wish to debug maintenance loot? This process takes up a lot of the server's resources.","Debug Maintenance Loot","Cancel") as null|anything in list("Yes","No","Cancel") +ADMIN_VERB(debug_maintenance_loot, R_DEBUG, "Debug Maintenance Loot", "List all items in the game that are not in maintenance loot", ADMIN_CATEGORY_DEBUG) + + var/confirm = input(user,"Are you sure you wish to debug maintenance loot? This process takes up a lot of the server's resources.","Debug Maintenance Loot","Cancel") as null|anything in list("Yes","No","Cancel") if(confirm != "Yes") return - log_admin("[key_name(src)] has started debugging maintenance loot.") + log_admin("[key_name(user)] has started debugging maintenance loot.") var/list/every_single_maintenance_item = list() for(var/loot_list in GLOB.maintenance_loot) @@ -23,6 +20,37 @@ if(!every_single_maintenance_item[k]) returning_data = "[returning_data]
[k]" - src << browse(returning_data, "window=maintenace_report") + user << browse(returning_data, "window=maintenace_report") + +ADMIN_VERB(simulate_maintenance_loot, R_DEBUG, "Simulate Maintenance Loot", "Simulate 100 maintenance loot spawns. Special trait modifiers NOT applied.", ADMIN_CATEGORY_DEBUG) + + var/confirm = input(user,"Are you sure you wish to simulate maintenance loot? This process takes up a lot of the server's resources.","Simulate Maintenance Loot","Cancel") as null|anything in list("Yes","No","Cancel") + if(confirm != "Yes") + return + + var/list/current_loot_counts = list() //Assoc list. path = count + + var/missing_count = 0 + for(var/i=1,i<=500,i++) + var/atom/movable/M = pick_weight_recursive(GLOB.maintenance_loot) + if(!M) //wat + missing_count++ + continue + if(!current_loot_counts[M]) + current_loot_counts[M] = 1 + else + current_loot_counts[M] += 1 + + sortTim(current_loot_counts, cmp=/proc/cmp_numeric_dsc, associative = TRUE) + + var/returning_data = "

List of 500 simulated maintenance spawns:


" + var/confirmation_count = 0 + var/different_path_count = 0 + for(var/atom_path in current_loot_counts) + returning_data = "[returning_data]
[atom_path]: [current_loot_counts[atom_path]] ([round(current_loot_counts[atom_path]/5,0.01)]%)" + confirmation_count += current_loot_counts[atom_path] + different_path_count += 1 + + returning_data = "[returning_data]
Listed [different_path_count] different types of objects, with [confirmation_count] total objects and [missing_count] missing objects." - SSblackbox.record_feedback("tally", "admin_verb", 1, "Debug Missing Maintenance Loot") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! \ No newline at end of file + user << browse(returning_data, "window=maintenace_report") diff --git a/modular_zubbers/code/modules/arcades/code/loot/~arcade_weights_final.dm b/modular_zubbers/code/modules/arcades/code/loot/~arcade_weights_final.dm new file mode 100644 index 0000000000000..42b88b283ac47 --- /dev/null +++ b/modular_zubbers/code/modules/arcades/code/loot/~arcade_weights_final.dm @@ -0,0 +1,7 @@ +GLOBAL_LIST_INIT(arcade_prize_pool, list( + GLOB.arcade_prize_pool_classic = 5000, + GLOB.arcade_prize_pool_toy = 2500, + GLOB.arcade_prize_pool_mechanical = 1000, + GLOB.arcade_prize_pool_special = 250, + GLOB.arcade_prize_pool_oh_god = 1 +)) diff --git a/modular_zubbers/code/modules/automapper/code/overrides/area_spawn_subsystem.dm b/modular_zubbers/code/modules/automapper/code/overrides/area_spawn_subsystem.dm index 59d5a44ab4b97..03c4d57bfefa7 100644 --- a/modular_zubbers/code/modules/automapper/code/overrides/area_spawn_subsystem.dm +++ b/modular_zubbers/code/modules/automapper/code/overrides/area_spawn_subsystem.dm @@ -5,3 +5,17 @@ /datum/area_spawn_over/New() blacklisted_stations |= list("Lima Station", "Moon Station", "Box Station") . = ..() + +/datum/area_spawn_over/big_bertha + target_areas = list( + /area/station/ai_monitored/security/armory, + /area/station/ai_monitored/security/armory/upper + ) + over_atoms = list( + /obj/item/shield/riot + ) + desired_atom = /obj/item/shield/big_bertha + +/datum/area_spawn_over/big_bertha/New(...) + . = ..() + blacklisted_stations = null //Weird, but it werks. diff --git a/modular_zubbers/code/modules/cargo/packs/security.dm b/modular_zubbers/code/modules/cargo/packs/security.dm index e1ce1ab5b8fde..c44d8c0e821c5 100644 --- a/modular_zubbers/code/modules/cargo/packs/security.dm +++ b/modular_zubbers/code/modules/cargo/packs/security.dm @@ -110,3 +110,33 @@ contains = list( /obj/item/ammo_box/c980grenade/riot = 3, ) + +/datum/supply_pack/security/secmed_medical + name = "Security Medic Kit Crate - Medical" + crate_name = "security medic crate" + desc = "Contains a large satchel medical kit." + access = ACCESS_SECURITY + cost = CARGO_CRATE_VALUE * 3.75 + contains = list( + /obj/item/storage/backpack/duffelbag/deforest_medkit/stocked, + ) + +/datum/supply_pack/security/secmed_surgical + name = "Security Medic Kit Crate - Surgical" + crate_name = "security medic crate" + desc = "Contains a first responder surgical kit." + access = ACCESS_SECURITY + cost = CARGO_CRATE_VALUE * 3.75 + contains = list( + /obj/item/storage/backpack/duffelbag/deforest_surgical/stocked, + ) + +/datum/supply_pack/security/secmed_technician + name = "Security Medic Kit Crate - Technician" + crate_name = "security medic crate" + desc = "Contains a medical technician kit." + access = ACCESS_SECURITY + cost = CARGO_CRATE_VALUE * 3.75 + contains = list( + /obj/item/storage/backpack/duffelbag/deforest_paramedic/stocked, + ) diff --git a/modular_zubbers/code/modules/mining/abandoned_crates.dm b/modular_zubbers/code/modules/mining/abandoned_crates.dm new file mode 100644 index 0000000000000..36a8957cc8225 --- /dev/null +++ b/modular_zubbers/code/modules/mining/abandoned_crates.dm @@ -0,0 +1,24 @@ +//The value is not rarity, but rather the amount. +GLOBAL_LIST_INIT(abandoned_crate_disasters,list( + /mob/living/basic/cockroach = 20, + /mob/living/basic/bee/toxin = 10, +)) + +/obj/structure/closet/crate/secure/loot/spawn_loot() + + if(prob(10)) + var/atom/movable/chosen_disaster = pick(GLOB.abandoned_crate_disasters) + for(var/i=1,i<=GLOB.abandoned_crate_disasters[chosen_disaster],i++) + new chosen_disaster(src) + else if(length(GLOB.one_of_a_kind_loot) && prob(1)) + var/atom/movable/chosen_loot = pick_n_take(GLOB.one_of_a_kind_loot) + new chosen_loot(src) + else if(prob(40)) + var/atom/movable/chosen_loot = pick_weight_recursive(GLOB.oddity_loot) + new chosen_loot(src) + else + var/atom/movable/chosen_loot = pick_weight_recursive(GLOB.rarity_loot) + for(var/i=1,i<=rand(3,10),i++) + new chosen_loot(src) + + spawned_loot = TRUE diff --git a/modular_zubbers/code/modules/mob/living/carbon/human/species/tajaran.dm b/modular_zubbers/code/modules/mob/living/carbon/human/species/tajaran.dm index f0fe755fc43e8..1345bf1993003 100644 --- a/modular_zubbers/code/modules/mob/living/carbon/human/species/tajaran.dm +++ b/modular_zubbers/code/modules/mob/living/carbon/human/species/tajaran.dm @@ -106,7 +106,7 @@ return to_add /obj/item/bodypart/chest/tajaran/get_butt_sprite() - return BUTT_SPRITE_FUZZY + return icon('modular_skyrat/master_files/icons/mob/butts.dmi', BUTT_SPRITE_VULP) /datum/species/tajaran/get_species_description() //Something basic until I make lore later return "The Tajara are a race of humanoids that possess markedly felinoid traits that include \ diff --git a/modular_zubbers/code/modules/shuttle/emergency.dm b/modular_zubbers/code/modules/shuttle/emergency.dm new file mode 100644 index 0000000000000..4caebfd52a562 --- /dev/null +++ b/modular_zubbers/code/modules/shuttle/emergency.dm @@ -0,0 +1,4 @@ +/obj/docking_port/mobile/emergency/check() + . = ..() + if(mode == SHUTTLE_CALL && !SSshuttle.canRecall()) + SSmapping.mapvote() //Do a map vote if we're at the point of no return. diff --git a/modular_zubbers/icons/mob/inhands/big_bertha_both.dmi b/modular_zubbers/icons/mob/inhands/big_bertha_both.dmi new file mode 100644 index 0000000000000..e6b3d29039bb6 Binary files /dev/null and b/modular_zubbers/icons/mob/inhands/big_bertha_both.dmi differ diff --git a/modular_zubbers/icons/obj/big_bertha_shield.dmi b/modular_zubbers/icons/obj/big_bertha_shield.dmi new file mode 100644 index 0000000000000..69dbeae91b998 Binary files /dev/null and b/modular_zubbers/icons/obj/big_bertha_shield.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 351aaf97f8e61..674548b26f6e1 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -8469,6 +8469,7 @@ #include "modular_zubbers\code\_globalvars\lists\_maintenance_loot.dm" #include "modular_zubbers\code\_globalvars\lists\maintenance_loot_common.dm" #include "modular_zubbers\code\_globalvars\lists\maintenance_loot_oddity.dm" +#include "modular_zubbers\code\_globalvars\lists\maintenance_loot_one_of_a_kind.dm" #include "modular_zubbers\code\_globalvars\lists\maintenance_loot_rare.dm" #include "modular_zubbers\code\_globalvars\lists\maintenance_loot_trash.dm" #include "modular_zubbers\code\_globalvars\lists\maintenance_loot_uncommon.dm" @@ -8522,6 +8523,7 @@ #include "modular_zubbers\code\game\gamemodes\dynamic\dynamic_rulesets_roundstart.dm" #include "modular_zubbers\code\game\gamemodes\objectives\gimmick.dm" #include "modular_zubbers\code\game\gamemodes\objectives\overrides.dm" +#include "modular_zubbers\code\game\Items\big_bertha_shield.dm" #include "modular_zubbers\code\game\Items\coins.dm" #include "modular_zubbers\code\game\Items\nerdcrowbar.dm" #include "modular_zubbers\code\game\Items\plushes.dm" @@ -8563,6 +8565,7 @@ #include "modular_zubbers\code\game\objects\effects\spawners\random\moonstation_random.dm" #include "modular_zubbers\code\game\objects\effects\spawners\random\vending.dm" #include "modular_zubbers\code\game\objects\items\abductor.dm" +#include "modular_zubbers\code\game\objects\items\bulldog.dm" #include "modular_zubbers\code\game\objects\items\cards_ids.dm" #include "modular_zubbers\code\game\objects\items\cigs_lighters.dm" #include "modular_zubbers\code\game\objects\items\holy_weapons.dm" @@ -8665,6 +8668,7 @@ #include "modular_zubbers\code\modules\arcades\code\loot\arcade_weights_oh_god.dm" #include "modular_zubbers\code\modules\arcades\code\loot\arcade_weights_special.dm" #include "modular_zubbers\code\modules\arcades\code\loot\arcade_weights_toy.dm" +#include "modular_zubbers\code\modules\arcades\code\loot\~arcade_weights_final.dm" #include "modular_zubbers\code\modules\arcades\code\minesweeper\minesweeper.dm" #include "modular_zubbers\code\modules\arcades\code\overrides\spawners.dm" #include "modular_zubbers\code\modules\ashwalkers\ashwalker_names.dm" @@ -8816,6 +8820,8 @@ #include "modular_zubbers\code\modules\lewd_machinery\lustwish.dm" #include "modular_zubbers\code\modules\lewd_machinery\sex_barrier.dm" #include "modular_zubbers\code\modules\liquids\height_floors.dm" +#include "modular_zubbers\code\modules\loadout\categories\accessories.dm" +#include "modular_zubbers\code\modules\loadout\categories\ears.dm" #include "modular_zubbers\code\modules\loadout\categories\glasses.dm" #include "modular_zubbers\code\modules\loadout\categories\gloves.dm" #include "modular_zubbers\code\modules\loadout\categories\heads.dm" @@ -8835,6 +8841,7 @@ #include "modular_zubbers\code\modules\mapping\limastation\shuttles.dm" #include "modular_zubbers\code\modules\mapping\limastation\static_plaque.dm" #include "modular_zubbers\code\modules\mapping\ss13_construct\areas.dm" +#include "modular_zubbers\code\modules\mining\abandoned_crates.dm" #include "modular_zubbers\code\modules\mining\shelters.dm" #include "modular_zubbers\code\modules\mining\equipment\survival_pod.dm" #include "modular_zubbers\code\modules\mining\lavaland\megafauna_loot.dm" @@ -8947,6 +8954,7 @@ #include "modular_zubbers\code\modules\security\security_glock\research.dm" #include "modular_zubbers\code\modules\security_levels\security_level_datums.dm" #include "modular_zubbers\code\modules\shelves\shelf.dm" +#include "modular_zubbers\code\modules\shuttle\emergency.dm" #include "modular_zubbers\code\modules\skub\skub.dm" #include "modular_zubbers\code\modules\space_background\parallax.dm" #include "modular_zubbers\code\modules\space_background\turf_space.dm" diff --git a/tgui/packages/tgui/interfaces/CrewConsoleBubbers.jsx b/tgui/packages/tgui/interfaces/CrewConsoleBubbers.jsx deleted file mode 100644 index 5f58b74e45b26..0000000000000 --- a/tgui/packages/tgui/interfaces/CrewConsoleBubbers.jsx +++ /dev/null @@ -1,215 +0,0 @@ -import { sortBy } from 'common/collections'; - -import { useBackend } from '../backend'; -import { Box, Button, Icon, Section, Table } from '../components'; -import { COLORS } from '../constants'; -import { Window } from '../layouts'; - -const STAT_LIVING = 0; -const STAT_DEAD = 4; - -const HEALTH_COLOR_BY_LEVEL = [ - '#17d568', - '#c4cf2d', - '#e67e22', - '#ed5100', - '#e74c3c', - '#801308', -]; -const HEALTH_ICON_BY_LEVEL = [ - 'heart', - 'heart', - 'heart', - 'heart-circle-exclamation', - 'heartbeat', - 'heart-crack', -]; -const jobIsHead = (jobId) => jobId % 10 === 0; - -const jobToColor = (jobId) => { - if (jobId >= 0 && jobId < 50) { - return COLORS.department.centcom; - } - if (jobId >= 50 && jobId < 200) { - return COLORS.department.captain; - } - if (jobId >= 200 && jobId < 300) { - return COLORS.department.security; - } - if (jobId >= 300 && jobId < 400) { - return COLORS.department.medbay; - } - if (jobId >= 400 && jobId < 500) { - return COLORS.department.science; - } - if (jobId >= 500 && jobId < 600) { - return COLORS.department.engineering; - } - if (jobId >= 600 && jobId < 700) { - return COLORS.department.cargo; - } - if (jobId >= 700 && jobId < 800) { - return COLORS.department.service; - } - if (jobId === 801) { - return COLORS.department.assistant; - } - if (jobId === 803) { - return COLORS.department.prisoner; - } - return COLORS.department.other; -}; - -const healthToAttribute = (oxy, tox, burn, brute, attributeList) => { - const healthSum = oxy + tox + burn + brute; - const level = Math.min(Math.max(Math.ceil(healthSum / 50), 0), 5); - // 200 Default Health, Sum Divided by 50, 6 Health States - return attributeList[level]; -}; - -const HealthStat = (props) => { - const { type, value } = props; - return ( - - {value} - - ); -}; - -export const CrewConsoleBubbers = () => { - return ( - - -
- -
-
-
- ); -}; - -const CrewTable = (props) => { - const { act, data } = useBackend(); - const sensors = sortBy(data.sensors ?? [], (s) => s.ijob); - return ( - - - Name - - - Vitals - - - Position - - {!!data.link_allowed && ( - - Tracking - - )} - - {sensors.map((sensor) => ( - - ))} -
- ); -}; - -const CrewTableEntry = (props, context) => { - const { act, data } = useBackend(context); - const { link_allowed } = data; - const { sensor_data } = props; - const { - name, - assignment, - ijob, - is_robot, - is_dnr, - life_status, - oxydam, - toxdam, - burndam, - brutedam, - area, - can_track, - } = sensor_data; - - return ( - - - {name} - {assignment !== undefined ? ` (${assignment})` : ''} - - - {is_robot ? ( - - ) : ( - - )} - - - {life_status === STAT_DEAD ? ( - - ) : oxydam !== undefined ? ( - - ) : ( - - )} - {life_status === STAT_DEAD && is_dnr ? ' (DNR)' : ''} - - - {oxydam !== undefined ? ( - - - {'/'} - - {'/'} - - {'/'} - - - ) : life_status !== STAT_DEAD ? ( - 'Alive' - ) : ( - 'DEAD' - )} - - - {area !== undefined ? ( - area - ) : ( - - )} - - {!!link_allowed && ( - - + + + setSearchQuery((e.target as HTMLTextAreaElement).value) + } + /> + + } + > + + + Name + + + + Vitals + + + Position + + {!!data.link_allowed && ( + + Tracking + + )} + + {sorted.map((sensor) => ( + + ))} +
+ + ); +}; + +type CrewTableEntryProps = { + sensor_data: CrewSensor; +}; + +const CrewTableEntry = (props: CrewTableEntryProps) => { + const { act, data } = useBackend(); + const { link_allowed } = data; + const { sensor_data } = props; + const { + name, + assignment, + ijob, + is_robot, + is_dnr, + life_status, + oxydam, + toxdam, + burndam, + brutedam, + area, + can_track, + } = sensor_data; + + return ( + + + {name} + {assignment !== undefined ? ` (${assignment})` : ''} + + + {is_robot ? ( + + ) : ( + + )} + + + {oxydam !== undefined ? ( + + ) : life_status !== STAT_DEAD ? ( + + ) : ( + + )} + + + {life_status === STAT_DEAD && is_dnr ? ' (DNR)' : ''} + + + {oxydam !== undefined ? ( + + + {'/'} + + {'/'} + + {'/'} + + + ) : life_status !== STAT_DEAD ? ( + 'Alive' + ) : ( + 'Dead' + )} + + + {area !== '~' && area !== undefined ? ( + area + ) : ( + + )} + + {!!link_allowed && ( + + + + )} + + ); +};