diff --git a/_maps/RandomRuins/SpaceRuins/allamericandiner.dmm b/_maps/RandomRuins/SpaceRuins/allamericandiner.dmm index d36c5a8b111..9ce70d4d7b1 100644 --- a/_maps/RandomRuins/SpaceRuins/allamericandiner.dmm +++ b/_maps/RandomRuins/SpaceRuins/allamericandiner.dmm @@ -243,17 +243,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/ruin/space/has_grav/allamericandiner) -"nq" = ( -/obj/machinery/shower/directional/east, -/obj/structure/fluff{ - desc = "What, you think the water just magically soaks into the metallic flooring?"; - icon = 'icons/obj/mining_zones/survival_pod.dmi'; - icon_state = "fan_tiny"; - name = "shower drain" - }, -/obj/item/soap, -/turf/open/floor/iron/freezer, -/area/ruin/space/has_grav/allamericandiner) "nr" = ( /obj/structure/table/wood, /obj/item/paper_bin{ @@ -359,6 +348,13 @@ "rd" = ( /turf/open/floor/iron/kitchen, /area/ruin/space/has_grav/allamericandiner) +"ri" = ( +/obj/machinery/door/window/left/directional/south{ + name = "Trash Dumpster" + }, +/obj/structure/plasticflaps, +/turf/open/floor/plating, +/area/ruin/space/has_grav/allamericandiner) "rG" = ( /obj/structure/chair/stool/bar/directional/north, /obj/effect/decal/cleanable/dirt, @@ -601,17 +597,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron/freezer, /area/ruin/space/has_grav/allamericandiner) -"CF" = ( -/obj/machinery/shower/directional/west, -/obj/structure/fluff{ - desc = "What, you think the water just magically soaks into the metallic flooring?"; - icon = 'icons/obj/mining_zones/survival_pod.dmi'; - icon_state = "fan_tiny"; - name = "shower drain" - }, -/obj/item/soap, -/turf/open/floor/iron/freezer, -/area/ruin/space/has_grav/allamericandiner) "Du" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/condiment/peppermill{ @@ -627,6 +612,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/ruin/space/has_grav/allamericandiner) +"DD" = ( +/obj/machinery/shower/directional/east, +/obj/structure/fluff/shower_drain, +/obj/item/soap, +/turf/open/floor/iron/freezer, +/area/ruin/space/has_grav/allamericandiner) "DQ" = ( /obj/structure/chair/sofa/right/maroon, /obj/effect/decal/cleanable/dirt, @@ -638,6 +629,13 @@ }, /turf/open/floor/iron, /area/ruin/space/has_grav/allamericandiner) +"DZ" = ( +/obj/machinery/door/window/left/directional/east{ + name = "Kitchen" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/kitchen/small, +/area/ruin/space/has_grav/allamericandiner) "Eo" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -772,13 +770,6 @@ /obj/item/paper/fluff/ruins/allamericandiner, /turf/open/floor/iron/kitchen/small, /area/ruin/space/has_grav/allamericandiner) -"Ic" = ( -/obj/machinery/door/window/left/directional/east{ - name = "Kitchen" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/kitchen/small, -/area/ruin/space/has_grav/allamericandiner) "Id" = ( /obj/structure/window/reinforced/tinted/spawner/directional/west, /obj/effect/turf_decal/siding/green{ @@ -961,6 +952,12 @@ /obj/item/storage/dice, /turf/open/floor/iron, /area/ruin/space/has_grav/allamericandiner) +"OJ" = ( +/obj/machinery/shower/directional/west, +/obj/structure/fluff/shower_drain, +/obj/item/soap, +/turf/open/floor/iron/freezer, +/area/ruin/space/has_grav/allamericandiner) "Ph" = ( /obj/structure/chair/sofa/left/maroon{ dir = 4 @@ -1141,13 +1138,6 @@ /obj/structure/sink/directional/south, /turf/open/floor/iron/freezer, /area/ruin/space/has_grav/allamericandiner) -"Vn" = ( -/obj/machinery/door/window/left/directional/south{ - name = "Trash Dumpster" - }, -/obj/structure/plasticflaps, -/turf/open/floor/plating, -/area/ruin/space/has_grav/allamericandiner) "Vq" = ( /obj/structure/table/reinforced, /obj/machinery/light/dim/directional/east, @@ -1567,7 +1557,7 @@ oN EK pa Is -Ic +DZ Xw Du FB @@ -2093,7 +2083,7 @@ Kp jx Kp Lp -CF +OJ EK oN oN @@ -2167,7 +2157,7 @@ YX Im YX bE -nq +DD EK oN oN @@ -2229,7 +2219,7 @@ Bn wC qB qB -Vn +ri ck fz vA diff --git a/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm b/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm index 2383c4688e3..84a3a2658d3 100644 --- a/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm +++ b/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm @@ -2483,12 +2483,7 @@ pixel_x = 15; pixel_y = 12 }, -/obj/structure/fluff{ - desc = "Ew, I think I see a hairball."; - icon = 'icons/obj/mining_zones/survival_pod.dmi'; - icon_state = "fan_tiny"; - name = "shower drain" - }, +/obj/structure/fluff/shower_drain, /obj/machinery/shower/directional/east, /turf/open/floor/iron/showroomfloor, /area/ruin/space/has_grav/dangerous_research/dorms) diff --git a/_maps/RandomRuins/SpaceRuins/interdyne.dmm b/_maps/RandomRuins/SpaceRuins/interdyne.dmm index bd0ba4cc2ff..cba624ef05f 100644 --- a/_maps/RandomRuins/SpaceRuins/interdyne.dmm +++ b/_maps/RandomRuins/SpaceRuins/interdyne.dmm @@ -973,12 +973,7 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/interdyne) "NU" = ( -/obj/structure/fluff{ - desc = "Ew, I think I see a hairball."; - icon = 'icons/obj/mining_zones/survival_pod.dmi'; - icon_state = "fan_tiny"; - name = "shower drain" - }, +/obj/structure/fluff/shower_drain, /obj/machinery/shower/directional/east, /obj/item/soap/syndie, /obj/machinery/light/blacklight/directional/north, diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 71e4807de36..5138e8ae214 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -8402,6 +8402,12 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/science/xenobiology) +"cyo" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) "cyA" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/unres{ @@ -11413,11 +11419,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron, /area/station/commons/storage/mining) -"drG" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk, -/turf/open/floor/iron, -/area/station/cargo/office) "drH" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 @@ -14026,6 +14027,14 @@ }, /turf/open/floor/plating, /area/station/engineering/atmos/pumproom) +"ehW" = ( +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal/bin, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/iron/white/side{ + dir = 9 + }, +/area/station/science/lab) "ehZ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -14730,28 +14739,6 @@ /obj/machinery/light_switch/directional/north, /turf/open/floor/iron, /area/station/commons/locker) -"eub" = ( -/obj/machinery/camera{ - c_tag = "Medbay Pharmacy"; - dir = 9; - network = list("ss13","medbay") - }, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/obj/machinery/shower/directional/south, -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/fluff{ - desc = "What, you think the water just magically soaks into the metallic flooring?"; - icon = 'icons/obj/mining_zones/survival_pod.dmi'; - icon_state = "fan_tiny"; - name = "shower drain" - }, -/obj/effect/turf_decal/stripes/white/end, -/turf/open/floor/iron/white, -/area/station/medical/pharmacy) "euc" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -17954,14 +17941,6 @@ /obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/engineering/atmos) -"fwQ" = ( -/obj/structure/table/reinforced, -/obj/structure/secure_safe/caps_spare/directional/east, -/obj/item/papercutter{ - pixel_x = 7 - }, -/turf/open/floor/iron, -/area/station/command/bridge) "fwS" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -19044,14 +19023,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/science/explab) -"fOR" = ( -/obj/structure/disposalpipe/trunk, -/obj/machinery/disposal/bin, -/obj/machinery/airalarm/directional/east, -/turf/open/floor/iron/white/side{ - dir = 9 - }, -/area/station/science/lab) "fPb" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/structure/cable, @@ -20582,6 +20553,18 @@ "gmW" = ( /turf/closed/wall, /area/station/commons/fitness) +"gnb" = ( +/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/trimline/blue/filled/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "gnh" = ( /turf/closed/wall/r_wall, /area/station/maintenance/department/cargo) @@ -21505,15 +21488,6 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/fore) -"gDE" = ( -/obj/machinery/defibrillator_mount/directional/north, -/obj/effect/turf_decal/tile/blue/full, -/obj/machinery/light/cold/directional/north, -/obj/machinery/stasis{ - dir = 4 - }, -/turf/open/floor/iron/large, -/area/station/medical/treatment_center) "gDN" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 @@ -25351,18 +25325,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat_interior) -"hPf" = ( -/obj/structure/safe, -/obj/item/clothing/head/costume/bearpelt, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass, -/obj/item/gun/ballistic/revolver/russian, -/obj/item/ammo_box/a357, -/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka, -/obj/effect/turf_decal/bot_white/left, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/command/nuke_storage) "hPk" = ( /obj/machinery/door/airlock/security{ name = "Permabrig Chapel" @@ -25373,6 +25335,14 @@ /obj/machinery/door/firedoor, /turf/open/floor/wood, /area/station/security/prison/rec) +"hPl" = ( +/obj/structure/table/reinforced, +/obj/structure/secure_safe/caps_spare/directional/east, +/obj/item/papercutter{ + pixel_x = 7 + }, +/turf/open/floor/iron, +/area/station/command/bridge) "hPs" = ( /turf/closed/wall/r_wall, /area/station/security/prison/work) @@ -29853,14 +29823,6 @@ /obj/machinery/atmospherics/components/tank, /turf/open/floor/iron/dark, /area/station/science/ordnance) -"jln" = ( -/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/trimline/blue/filled/line, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "jlu" = ( /obj/structure/railing/corner, /turf/open/lava/plasma/ice_moon, @@ -32181,13 +32143,6 @@ /obj/effect/turf_decal/box/white, /turf/open/floor/engine, /area/station/engineering/atmos/hfr_room) -"jVH" = ( -/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/trimline/blue/filled/corner, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "jVL" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -33380,6 +33335,15 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) +"kmG" = ( +/obj/machinery/defibrillator_mount/directional/north, +/obj/effect/turf_decal/tile/blue/full, +/obj/machinery/light/cold/directional/north, +/obj/machinery/stasis{ + dir = 4 + }, +/turf/open/floor/iron/large, +/area/station/medical/treatment_center) "kmH" = ( /obj/effect/spawner/random/entertainment/cigar, /obj/structure/table, @@ -41107,6 +41071,14 @@ /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) +"mFm" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 + }, +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal/bin, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) "mFt" = ( /obj/machinery/atmospherics/components/binary/pump/on{ name = "Waste In" @@ -42282,6 +42254,23 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/commons/fitness) +"mZM" = ( +/obj/machinery/camera{ + c_tag = "Medbay Pharmacy"; + dir = 9; + network = list("ss13","medbay") + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/machinery/shower/directional/south, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/fluff/shower_drain, +/obj/effect/turf_decal/stripes/white/end, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) "mZS" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/blue, @@ -45359,6 +45348,14 @@ }, /turf/open/floor/iron/white, /area/station/medical/chemistry) +"nRd" = ( +/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/trimline/blue/filled/line, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "nRm" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -52456,17 +52453,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/engineering/atmos) -"pYx" = ( -/obj/structure/table/glass, -/obj/item/reagent_containers/cup/bottle/epinephrine, -/obj/item/reagent_containers/cup/bottle/multiver{ - pixel_x = 6 - }, -/obj/item/reagent_containers/syringe, -/obj/effect/turf_decal/tile/blue/full, -/obj/item/radio/intercom/directional/west, -/turf/open/floor/iron/large, -/area/station/medical/treatment_center) "pYz" = ( /obj/structure/railing/corner, /obj/machinery/door/firedoor/border_only, @@ -52875,6 +52861,17 @@ "qfh" = ( /turf/open/floor/iron/recharge_floor, /area/station/science/robotics/mechbay) +"qfi" = ( +/obj/structure/table/glass, +/obj/item/reagent_containers/cup/bottle/epinephrine, +/obj/item/reagent_containers/cup/bottle/multiver{ + pixel_x = 6 + }, +/obj/item/reagent_containers/syringe, +/obj/effect/turf_decal/tile/blue/full, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/iron/large, +/area/station/medical/treatment_center) "qfj" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -53795,6 +53792,13 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron/dark, /area/station/service/chapel) +"quu" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/security/office) "quB" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment{ @@ -57189,12 +57193,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"ruM" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 9 - }, -/turf/open/floor/iron/white, -/area/station/medical/treatment_center) "ruO" = ( /obj/machinery/firealarm/directional/west, /obj/structure/disposalpipe/segment{ @@ -60401,16 +60399,6 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/iron/white, /area/station/science/ordnance) -"sth" = ( -/obj/item/radio/intercom/directional/east, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/machinery/disposal/bin, -/obj/machinery/computer/security/telescreen/entertainment/directional/south, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) "sto" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -61412,14 +61400,6 @@ /obj/effect/turf_decal/tile/yellow/full, /turf/open/floor/iron/large, /area/station/medical/pharmacy) -"sHd" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 5 - }, -/obj/structure/disposalpipe/trunk, -/obj/machinery/disposal/bin, -/turf/open/floor/iron/white, -/area/station/medical/medbay/aft) "sHh" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet, @@ -66429,6 +66409,13 @@ /obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/iron, /area/station/command/teleporter) +"uoV" = ( +/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/trimline/blue/filled/corner, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "upa" = ( /obj/structure/closet/firecloset, /turf/open/floor/plating, @@ -70924,6 +70911,18 @@ /obj/machinery/light/floor, /turf/open/floor/iron/dark, /area/station/service/chapel) +"vNv" = ( +/obj/structure/safe, +/obj/item/clothing/head/costume/bearpelt, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass, +/obj/item/gun/ballistic/revolver/russian, +/obj/item/ammo_box/a357, +/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka, +/obj/effect/turf_decal/bot_white/left, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/nuke_storage) "vND" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 @@ -71321,6 +71320,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"vUL" = ( +/obj/item/radio/intercom/directional/east, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal/bin, +/obj/machinery/computer/security/telescreen/entertainment/directional/south, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/storage) "vUW" = ( /obj/item/stack/cable_coil{ amount = 7; @@ -73800,6 +73809,11 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/engine, /area/station/science/explab) +"wGk" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, +/turf/open/floor/iron, +/area/station/cargo/office) "wGv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, @@ -74195,13 +74209,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"wMV" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk, -/turf/open/floor/iron/dark/textured_half{ - dir = 1 - }, -/area/station/security/office) "wNp" = ( /obj/machinery/door/airlock/maintenance{ name = "Medbay Maintenance" @@ -79038,18 +79045,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos/storage) -"ylS" = ( -/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/trimline/blue/filled/corner{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "ylU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -231597,7 +231592,7 @@ ybQ egF jYV jDW -hPf +vNv ybQ sDl jOt @@ -232133,7 +232128,7 @@ tKI dMv pdf tKI -drG +wGk ssc cXl wRx @@ -236042,7 +236037,7 @@ wrc eVV rat dNG -sth +vUL aUj aUj stI @@ -237725,7 +237720,7 @@ nbp xKY omk sMY -wMV +quu qqM wMi kvI @@ -240344,7 +240339,7 @@ nfk utR tmQ qnV -fwQ +hPl kBr lhv iGH @@ -244981,7 +244976,7 @@ cwh dEV pNx azw -eub +mZM eyc qPt uTc @@ -245759,8 +245754,8 @@ sHc oGs sEz jFZ -jVH -ylS +uoV +gnb gTi whh pQL @@ -246016,7 +246011,7 @@ azw cXu frP oIJ -jln +nRd lwQ tHr tHr @@ -246275,7 +246270,7 @@ eqp cTV fHz lwQ -pYx +qfi sEK eHg ahL @@ -246532,8 +246527,8 @@ iBj mcW sFG lwQ -gDE -ruM +kmG +cyo lup lup aCA @@ -250140,7 +250135,7 @@ bNH rIc tVB klc -sHd +mFm jih rkM iYs @@ -258352,7 +258347,7 @@ kuV cAi qWn oPq -fOR +ehW tFF tia qNn diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm index d9148021c88..05b8de8fbd7 100644 --- a/_maps/map_files/NorthStar/north_star.dmm +++ b/_maps/map_files/NorthStar/north_star.dmm @@ -947,6 +947,12 @@ /obj/effect/turf_decal/tile/purple/opposingcorners, /turf/open/floor/iron/white, /area/station/command/heads_quarters/rd) +"alL" = ( +/obj/machinery/light/floor, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/hallway/floor2/fore) "amg" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/east, @@ -1289,6 +1295,15 @@ /obj/item/clothing/mask/facehugger/toy, /turf/open/floor/pod/light, /area/station/maintenance/floor1/starboard) +"aqm" = ( +/obj/machinery/door/firedoor/border_only, +/obj/structure/railing, +/obj/effect/turf_decal/box/red, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) "aqu" = ( /obj/effect/turf_decal/siding/wood, /obj/structure/disposalpipe/segment{ @@ -3391,17 +3406,6 @@ /obj/effect/spawner/random/trash/cigbutt, /turf/open/floor/iron/dark, /area/station/maintenance/floor2/starboard/aft) -"aSI" = ( -/obj/machinery/shower/directional/west, -/obj/structure/fluff{ - desc = "What, you think the water just magically soaks into the metallic flooring?"; - icon = 'icons/obj/mining_zones/survival_pod.dmi'; - icon_state = "fan_tiny"; - name = "shower drain" - }, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/iron/white/small, -/area/station/commons/fitness/recreation) "aSK" = ( /obj/effect/spawner/random/structure/crate, /turf/open/floor/pod/light, @@ -4573,10 +4577,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/psychology) -"bgq" = ( -/obj/machinery/bluespace_vendor/directional/west, -/turf/open/floor/iron/dark, -/area/station/hallway/floor2/fore) "bgr" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark/textured_corner, @@ -5032,16 +5032,6 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron/dark, /area/station/hallway/floor2/fore) -"bkJ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/poster/official/random/directional/south, -/turf/open/floor/iron/dark/side, -/area/station/hallway/floor1/fore) "bkM" = ( /obj/effect/landmark/start/ai/secondary, /obj/item/radio/intercom/directional/north{ @@ -6629,16 +6619,6 @@ /obj/item/stack/rods/ten, /turf/open/floor/pod/light, /area/station/maintenance/floor1/port) -"bDf" = ( -/obj/effect/turf_decal/trimline/red/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/red/line{ - dir = 8 - }, -/obj/machinery/light/floor, -/turf/open/floor/iron/dark, -/area/station/hallway/floor4/aft) "bDg" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -6989,6 +6969,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/medical/abandoned) +"bJA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) "bJQ" = ( /obj/structure/railing/corner{ dir = 1 @@ -7370,14 +7357,6 @@ /obj/effect/spawner/random/maintenance/two, /turf/open/floor/pod/light, /area/station/maintenance/floor4/starboard) -"bPh" = ( -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 5 - }, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk, -/turf/open/floor/iron, -/area/station/hallway/floor3/aft) "bPq" = ( /obj/effect/spawner/random/structure/grille, /obj/structure/disposalpipe/segment{ @@ -8060,13 +8039,6 @@ dir = 1 }, /area/station/hallway/floor2/aft) -"bYl" = ( -/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber, -/turf/open/floor/engine/vacuum, -/area/station/science/ordnance/freezerchamber) "bYp" = ( /obj/structure/rack, /obj/effect/spawner/random/engineering/material, @@ -8389,6 +8361,12 @@ }, /turf/open/floor/pod/light, /area/station/maintenance/floor1/starboard/fore) +"ccB" = ( +/obj/machinery/shower/directional/east, +/obj/item/bikehorn/rubberducky, +/obj/structure/fluff/shower_drain, +/turf/open/floor/iron/white/small, +/area/station/commons/fitness/recreation) "ccF" = ( /obj/effect/turf_decal/trimline/brown/filled/corner, /obj/structure/disposalpipe/segment{ @@ -8723,15 +8701,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/storage) -"cgv" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/turf/open/floor/iron/dark/side{ - dir = 10 - }, -/area/station/security/office) "cgw" = ( /obj/effect/decal/cleanable/oil, /obj/effect/decal/cleanable/dirt, @@ -9826,6 +9795,11 @@ /obj/structure/sign/poster/contraband/eat/directional/east, /turf/open/floor/pod/light, /area/station/maintenance/floor1/port) +"cuh" = ( +/obj/machinery/light_switch/directional/north, +/obj/machinery/status_display/ai/directional/east, +/turf/open/floor/circuit, +/area/station/ai_monitored/command/nuke_storage) "cui" = ( /obj/machinery/button/door/directional/south{ id = "nsminingdorm1"; @@ -10372,12 +10346,6 @@ /obj/machinery/duct, /turf/open/floor/iron/white, /area/station/medical/morgue) -"cBP" = ( -/obj/effect/spawner/structure/window/hollow/plasma/middle{ - dir = 4 - }, -/turf/open/floor/engine/vacuum, -/area/station/science/ordnance/freezerchamber) "cBU" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/flora/bush/sunny/style_random, @@ -11175,6 +11143,14 @@ }, /turf/open/floor/iron/smooth_large, /area/station/hallway/secondary/entry) +"cMz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/camera/autoname/directional/south, +/obj/machinery/bluespace_vendor/directional/south, +/turf/open/floor/iron/dark/side, +/area/station/hallway/floor2/aft) "cMA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -11483,11 +11459,6 @@ }, /turf/open/floor/iron/white, /area/station/science/lobby) -"cRe" = ( -/obj/structure/reagent_dispensers/water_cooler, -/obj/machinery/status_display/ai/directional/north, -/turf/open/floor/iron/dark, -/area/station/command/bridge) "cRs" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, @@ -12790,13 +12761,6 @@ "diA" = ( /turf/closed/wall, /area/station/service/kitchen/coldroom) -"diE" = ( -/obj/machinery/light/floor, -/obj/machinery/bluespace_vendor/directional/north, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/station/hallway/floor4/aft) "diS" = ( /obj/machinery/door/airlock/freezer{ name = "Bathroom" @@ -16522,21 +16486,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark/side, /area/station/command/teleporter) -"ehZ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/table/reinforced, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/dark_blue/end{ - dir = 8 - }, -/obj/item/storage/toolbox/emergency, -/obj/machinery/bluespace_vendor/directional/south, -/turf/open/floor/iron/dark, -/area/station/commons/storage/tools) "eir" = ( /obj/machinery/door/airlock/hatch{ name = "Maintenance Access" @@ -16827,6 +16776,12 @@ /obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/floor3/starboard) +"emm" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/machinery/status_display/ai/directional/west, +/turf/open/floor/circuit, +/area/station/ai_monitored/command/nuke_storage) "emp" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/item/reagent_containers/cup/blastoff_ampoule, @@ -16944,15 +16899,6 @@ /obj/effect/landmark/generic_maintenance_landmark, /turf/open/floor/engine, /area/station/maintenance/floor4/starboard/aft) -"enl" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/airalarm/directional/east, -/turf/open/floor/iron/dark, -/area/station/hallway/secondary/service) "enp" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -17600,11 +17546,6 @@ dir = 8 }, /area/station/security/office) -"exv" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible/layer2, -/obj/machinery/atmospherics/pipe/smart/simple/purple, -/turf/open/floor/iron/dark, -/area/station/science/ordnance/testlab) "exw" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -18417,6 +18358,11 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron, /area/station/hallway/floor3/aft) +"eIS" = ( +/obj/structure/fluff/shower_drain, +/obj/machinery/shower/directional/north, +/turf/open/floor/iron/showroomfloor, +/area/station/command/heads_quarters/qm) "eIU" = ( /obj/effect/turf_decal/tile/purple/opposingcorners, /obj/effect/turf_decal/stripes/corner, @@ -18782,6 +18728,10 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/cargo/storage) +"eOC" = ( +/obj/machinery/bluespace_vendor/directional/north, +/turf/open/floor/iron/dark, +/area/station/hallway/floor3/fore) "eOP" = ( /turf/closed/wall/r_wall, /area/station/hallway/floor4/aft) @@ -18982,6 +18932,14 @@ /obj/machinery/duct, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) +"eSq" = ( +/obj/structure/railing/corner, +/obj/machinery/atmospherics/pipe/smart/simple/purple, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) "eSw" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/stool/directional/south, @@ -20768,6 +20726,17 @@ "fsJ" = ( /turf/closed/wall/r_wall, /area/station/ai_monitored/turret_protected/ai_upload) +"fsK" = ( +/obj/effect/turf_decal/trimline/red/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/red/line{ + dir = 8 + }, +/obj/effect/landmark/start/hangover, +/obj/machinery/light/floor, +/turf/open/floor/iron/dark, +/area/station/hallway/floor4/aft) "fsR" = ( /obj/item/kirbyplants/random, /obj/machinery/light/directional/east, @@ -21371,16 +21340,6 @@ /obj/structure/stairs/north, /turf/open/floor/iron/white/small, /area/station/medical/chemistry) -"fCl" = ( -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 8 - }, -/obj/machinery/light/floor, -/turf/open/floor/iron/dark, -/area/station/hallway/floor1/fore) "fCp" = ( /turf/open/floor/plating/airless, /area/space) @@ -22134,14 +22093,6 @@ }, /turf/open/floor/pod/dark, /area/station/maintenance/floor3/starboard) -"fLX" = ( -/obj/structure/railing/corner, -/obj/machinery/atmospherics/pipe/smart/simple/purple, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/science/ordnance/testlab) "fMc" = ( /obj/machinery/airalarm/directional/west, /obj/effect/turf_decal/stripes{ @@ -22387,12 +22338,6 @@ /obj/structure/flora/bush/lavendergrass/style_random, /turf/open/floor/grass, /area/station/security/courtroom) -"fPd" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/science/ordnance/testlab) "fPf" = ( /obj/effect/turf_decal/tile/blue/half, /turf/open/floor/iron/textured_edge, @@ -24432,16 +24377,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/maintenance/floor2/starboard/fore) -"gqT" = ( -/obj/effect/turf_decal/trimline/blue/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/purple/line{ - dir = 8 - }, -/obj/machinery/light/floor, -/turf/open/floor/iron/dark, -/area/station/hallway/floor2/fore) "gqU" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -24767,12 +24702,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/catwalk_floor/iron_white, /area/station/medical/abandoned) -"gvo" = ( -/obj/machinery/light/floor, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/station/hallway/floor3/fore) "gvp" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, @@ -24953,13 +24882,6 @@ /obj/structure/sign/poster/official/random/directional/south, /turf/open/floor/iron/dark/side, /area/station/hallway/floor2/fore) -"gxE" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/bluespace_vendor/directional/north, -/turf/open/floor/iron, -/area/station/hallway/floor1/aft) "gxH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -26898,18 +26820,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/cargo/storage) -"gYI" = ( -/obj/structure/fluff{ - desc = "What, you think the water just magically soaks into the metallic flooring?"; - icon = 'icons/obj/mining_zones/survival_pod.dmi'; - icon_state = "fan_tiny"; - name = "shower drain" - }, -/obj/machinery/duct, -/turf/open/floor/iron/showroomfloor{ - name = "bathroom tiles" - }, -/area/station/security/lockers) "gYN" = ( /obj/machinery/airalarm/directional/west, /obj/item/kirbyplants/random, @@ -27407,6 +27317,12 @@ /obj/machinery/hydroponics/constructable, /turf/open/floor/iron, /area/station/service/hydroponics) +"heI" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/visible{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) "heR" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced, @@ -29006,6 +28922,13 @@ /obj/structure/flora/bush/style_random, /turf/open/floor/grass, /area/station/security/courtroom) +"hAH" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/purple, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) "hAI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -29439,6 +29362,14 @@ /obj/effect/landmark/blobstart, /turf/open/floor/pod/light, /area/station/maintenance/floor4/starboard) +"hGC" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer2{ + dir = 1 + }, +/obj/effect/spawner/structure/window/hollow/plasma/middle, +/obj/machinery/atmospherics/pipe/smart/simple/purple, +/turf/open/floor/engine/vacuum, +/area/station/science/ordnance/freezerchamber) "hGL" = ( /obj/machinery/light/small/directional/north, /obj/effect/decal/cleanable/dirt, @@ -30068,6 +29999,19 @@ dir = 1 }, /area/station/command/gateway) +"hOG" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/machinery/newscaster/directional/south, +/turf/open/floor/iron/dark/side{ + dir = 10 + }, +/area/station/hallway/secondary/exit/departure_lounge) "hOP" = ( /obj/machinery/incident_display/delam/directional/south, /turf/open/floor/engine, @@ -32640,18 +32584,6 @@ dir = 1 }, /area/station/hallway/secondary/exit/escape_pod) -"ixd" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/science/ordnance/testlab) "ixf" = ( /obj/structure/chair/sofa/bench/right{ dir = 1 @@ -34382,19 +34314,6 @@ /obj/structure/cable, /turf/open/floor/iron/grimy, /area/station/security/detectives_office) -"iUP" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/machinery/newscaster/directional/south, -/turf/open/floor/iron/dark/side{ - dir = 10 - }, -/area/station/hallway/secondary/exit/departure_lounge) "iUQ" = ( /obj/effect/turf_decal/tile/green/half, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -35776,6 +35695,11 @@ /obj/machinery/light/cold/directional/east, /turf/open/floor/iron/textured_large, /area/station/medical/chemistry) +"jov" = ( +/obj/structure/reagent_dispensers/water_cooler, +/obj/machinery/status_display/ai/directional/north, +/turf/open/floor/iron/dark, +/area/station/command/bridge) "joA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -35943,6 +35867,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/pod/light, /area/station/maintenance/floor4/starboard/aft) +"jqq" = ( +/obj/effect/turf_decal/trimline/green/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/green/line{ + dir = 8 + }, +/obj/machinery/light/floor, +/turf/open/floor/iron/dark, +/area/station/hallway/floor3/fore) "jqy" = ( /obj/structure/lattice/catwalk, /turf/open/openspace, @@ -36054,6 +35988,15 @@ /obj/effect/mapping_helpers/airlock/access/any/service/bar, /turf/open/floor/wood, /area/station/service/bar) +"jsg" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/service) "jsF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -36584,6 +36527,14 @@ /obj/machinery/camera/autoname/directional/east, /turf/open/floor/catwalk_floor, /area/station/hallway/floor3/aft) +"jyX" = ( +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal/bin, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/corner{ + dir = 8 + }, +/area/station/engineering/lobby) "jyY" = ( /obj/structure/rack, /obj/item/clothing/gloves/color/black, @@ -37348,6 +37299,14 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) +"jIj" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 5 + }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, +/turf/open/floor/iron, +/area/station/hallway/floor3/aft) "jIs" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -37463,6 +37422,15 @@ /obj/structure/training_machine, /turf/open/floor/iron, /area/station/security/range) +"jJG" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 10 + }, +/area/station/security/office) "jJI" = ( /obj/effect/spawner/random/structure/chair_maintenance{ dir = 8 @@ -37473,6 +37441,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/floor4/starboard) +"jJM" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/purple, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) "jJP" = ( /obj/effect/decal/cleanable/glass, /turf/open/floor/engine, @@ -39367,14 +39340,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood/parquet, /area/station/medical/psychology) -"kiw" = ( -/obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer2{ - dir = 1 - }, -/obj/effect/spawner/structure/window/hollow/plasma/middle, -/obj/machinery/atmospherics/pipe/smart/simple/purple, -/turf/open/floor/engine/vacuum, -/area/station/science/ordnance/freezerchamber) "kiA" = ( /obj/effect/turf_decal/tile/green/opposingcorners, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -39479,12 +39444,6 @@ /obj/machinery/light/cold/no_nightlight/directional/east, /turf/open/floor/iron, /area/station/hallway/floor3/fore) -"kkd" = ( -/obj/machinery/light/floor, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/station/hallway/floor3/fore) "kkg" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -42944,6 +42903,13 @@ }, /turf/open/openspace, /area/station/maintenance/floor2/starboard) +"lcn" = ( +/obj/structure/cable, +/obj/machinery/conveyor/inverted{ + dir = 6 + }, +/turf/open/floor/iron/checker, +/area/station/cargo/miningdock) "lcr" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 10 @@ -43509,6 +43475,10 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/service/abandoned_gambling_den) +"liu" = ( +/obj/machinery/atmospherics/components/unary/bluespace_sender, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/project) "liL" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, @@ -44837,17 +44807,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark/textured, /area/station/commons/toilet) -"lBR" = ( -/obj/machinery/shower/directional/east, -/obj/item/bikehorn/rubberducky, -/obj/structure/fluff{ - desc = "What, you think the water just magically soaks into the metallic flooring?"; - icon = 'icons/obj/mining_zones/survival_pod.dmi'; - icon_state = "fan_tiny"; - name = "shower drain" - }, -/turf/open/floor/iron/white/small, -/area/station/commons/fitness/recreation) "lCf" = ( /obj/effect/turf_decal/trimline/green/warning, /obj/machinery/light/floor, @@ -45336,6 +45295,12 @@ /obj/effect/mapping_helpers/airlock/access/any/service/theatre, /turf/open/floor/pod/dark, /area/station/maintenance/floor3/starboard/aft) +"lIC" = ( +/obj/machinery/light/floor, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/hallway/floor2/fore) "lIJ" = ( /obj/structure/table/reinforced, /obj/item/flashlight/lamp{ @@ -46111,13 +46076,6 @@ /obj/structure/flora/bush/flowers_yw/style_random, /turf/open/floor/grass, /area/station/science/genetics) -"lRw" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/purple, -/turf/open/floor/iron/dark, -/area/station/science/ordnance/testlab) "lRF" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 1 @@ -47659,10 +47617,6 @@ dir = 4 }, /area/station/hallway/floor3/fore) -"mlc" = ( -/obj/machinery/atmospherics/components/unary/bluespace_sender, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/project) "mlg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -49032,6 +48986,13 @@ }, /turf/open/floor/wood/tile, /area/station/service/library/lounge) +"mCU" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber, +/turf/open/floor/engine/vacuum, +/area/station/science/ordnance/freezerchamber) "mDe" = ( /obj/structure/lattice, /turf/open/openspace, @@ -50769,14 +50730,6 @@ name = "Holodeck Projector Floor" }, /area/station/holodeck/rec_center) -"mZS" = ( -/obj/structure/disposalpipe/trunk, -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 9 - }, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "mZT" = ( /obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 10 @@ -51671,6 +51624,13 @@ }, /turf/open/floor/catwalk_floor, /area/station/maintenance/floor1/port) +"njR" = ( +/obj/structure/cable, +/obj/machinery/conveyor/inverted{ + dir = 10 + }, +/turf/open/floor/iron/checker, +/area/station/cargo/miningdock) "njS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -53525,6 +53485,16 @@ }, /turf/open/floor/engine/airless, /area/station/engineering/supermatter/waste) +"nIN" = ( +/obj/effect/turf_decal/trimline/blue/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/purple/line{ + dir = 8 + }, +/obj/machinery/light/floor, +/turf/open/floor/iron/dark, +/area/station/hallway/floor2/fore) "nIO" = ( /obj/structure/cable, /turf/open/floor/iron/smooth, @@ -53638,13 +53608,6 @@ /mob/living/basic/cow, /turf/open/floor/grass, /area/station/service/hydroponics) -"nKc" = ( -/obj/structure/cable, -/obj/machinery/conveyor/inverted{ - dir = 10 - }, -/turf/open/floor/iron/checker, -/area/station/cargo/miningdock) "nKn" = ( /obj/structure/sign/directions/dorms/directional/east, /obj/structure/sign/directions/evac/directional/east{ @@ -53768,6 +53731,12 @@ }, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/aft) +"nLP" = ( +/obj/structure/fluff/shower_drain, +/obj/effect/turf_decal/trimline/neutral, +/obj/machinery/shower/directional/west, +/turf/open/floor/iron/freezer, +/area/station/hallway/secondary/service) "nLY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -54313,13 +54282,6 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/floor1/fore) -"nTF" = ( -/obj/structure/chair/sofa/bench/left{ - dir = 4 - }, -/obj/machinery/bluespace_vendor/directional/west, -/turf/open/floor/iron/dark, -/area/station/hallway/floor1/fore) "nTI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -54916,13 +54878,6 @@ dir = 1 }, /area/station/engineering/lobby) -"obC" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/science/ordnance/testlab) "obH" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -56026,16 +55981,6 @@ dir = 1 }, /area/station/hallway/floor1/fore) -"oqc" = ( -/obj/structure/fluff{ - desc = "What, you think the water just magically soaks into the metallic flooring?"; - icon = 'icons/obj/mining_zones/survival_pod.dmi'; - icon_state = "fan_tiny"; - name = "shower drain" - }, -/obj/machinery/shower/directional/north, -/turf/open/floor/iron/showroomfloor, -/area/station/command/heads_quarters/qm) "oqd" = ( /obj/structure/chair/comfy/brown{ dir = 4 @@ -56250,12 +56195,6 @@ /obj/structure/sink/directional/west, /turf/open/floor/eighties, /area/station/commons/dorms/room2) -"otC" = ( -/obj/machinery/light/floor, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/station/hallway/floor2/fore) "otD" = ( /obj/effect/turf_decal/siding/thinplating_new{ dir = 1 @@ -56720,6 +56659,13 @@ /obj/effect/landmark/start/medical_doctor, /turf/open/floor/iron/white, /area/station/medical/office) +"ozM" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/bluespace_vendor/directional/north, +/turf/open/floor/iron, +/area/station/hallway/floor1/aft) "ozO" = ( /turf/closed/wall, /area/station/security/prison) @@ -57224,6 +57170,14 @@ dir = 1 }, /area/station/hallway/secondary/exit/departure_lounge) +"oHh" = ( +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "oHp" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 4 @@ -58284,6 +58238,12 @@ /obj/machinery/light_switch/directional/east, /turf/open/floor/iron, /area/station/cargo/storage) +"oUW" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) "oVa" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 @@ -59279,6 +59239,12 @@ /obj/structure/cable, /turf/open/floor/iron/dark/smooth_large, /area/station/service/kitchen/abandoned) +"pkt" = ( +/obj/machinery/shower/directional/west, +/obj/structure/fluff/shower_drain, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron/white/small, +/area/station/commons/fitness/recreation) "pkH" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -59733,6 +59699,12 @@ dir = 4 }, /area/station/hallway/secondary/exit/departure_lounge) +"pqB" = ( +/obj/machinery/light/floor, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/hallway/floor3/fore) "pqH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ @@ -60584,6 +60556,16 @@ }, /turf/open/floor/iron, /area/station/hallway/floor1/fore) +"pBQ" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/poster/official/random/directional/south, +/turf/open/floor/iron/dark/side, +/area/station/hallway/floor1/fore) "pBS" = ( /obj/machinery/deepfryer, /turf/open/floor/iron/kitchen, @@ -62213,6 +62195,16 @@ /obj/effect/landmark/start/cook, /turf/open/floor/wood/large, /area/station/service/kitchen/kitchen_backroom) +"pYd" = ( +/obj/effect/turf_decal/trimline/purple/corner, +/obj/effect/turf_decal/trimline/purple/filled/corner{ + dir = 4 + }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, +/obj/machinery/light/cold/no_nightlight/directional/west, +/turf/open/floor/iron/white, +/area/station/science/lobby) "pYf" = ( /obj/structure/chair/sofa/bench/left{ dir = 8 @@ -62711,6 +62703,10 @@ }, /turf/open/floor/iron, /area/station/hallway/floor1/aft) +"qdF" = ( +/obj/machinery/bluespace_vendor/directional/west, +/turf/open/floor/iron/dark, +/area/station/hallway/floor2/fore) "qdS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -62956,6 +62952,16 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/manifold, /turf/open/space/basic, /area/space/nearstation) +"qgU" = ( +/obj/effect/turf_decal/trimline/yellow/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/line{ + dir = 8 + }, +/obj/machinery/light/floor, +/turf/open/floor/iron/dark, +/area/station/hallway/floor1/fore) "qgV" = ( /obj/structure/railing{ dir = 1 @@ -63581,6 +63587,13 @@ /obj/effect/spawner/random/structure/crate, /turf/open/floor/pod/light, /area/station/maintenance/floor2/port) +"qra" = ( +/obj/structure/fluff/shower_drain, +/obj/machinery/duct, +/turf/open/floor/iron/showroomfloor{ + name = "bathroom tiles" + }, +/area/station/security/lockers) "qrd" = ( /turf/closed/wall, /area/station/maintenance/floor3/starboard) @@ -64058,10 +64071,6 @@ /obj/structure/cable, /turf/open/floor/carpet/royalblue, /area/station/commons/dorms/room4) -"qwd" = ( -/obj/machinery/bluespace_vendor/directional/north, -/turf/open/floor/iron/dark, -/area/station/hallway/floor3/fore) "qwg" = ( /obj/structure/chair/comfy/brown{ dir = 1 @@ -64271,12 +64280,6 @@ "qyx" = ( /turf/open/floor/engine, /area/station/science/explab) -"qyA" = ( -/obj/machinery/light/floor, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/station/hallway/floor4/aft) "qyB" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -65413,6 +65416,13 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/iron, /area/station/science/genetics) +"qNI" = ( +/obj/machinery/light/floor, +/obj/machinery/bluespace_vendor/directional/north, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/hallway/floor4/aft) "qNK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -68770,6 +68780,11 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/floor3/aft) +"rIg" = ( +/obj/structure/secure_safe/caps_spare/directional/south, +/obj/effect/turf_decal/tile/purple/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/bridge) "rIo" = ( /turf/closed/wall/r_wall, /area/station/maintenance/floor4/starboard/aft) @@ -68933,6 +68948,10 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor, /area/station/maintenance/floor3/starboard/aft) +"rKV" = ( +/obj/machinery/bluespace_vendor/directional/north, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "rKX" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced, @@ -70556,6 +70575,14 @@ /obj/item/clothing/glasses/welding, /turf/open/floor/iron/white, /area/station/science/lower) +"sik" = ( +/obj/structure/cable, +/obj/machinery/bouldertech/refinery/smelter, +/obj/machinery/conveyor/inverted{ + dir = 10 + }, +/turf/open/floor/iron/checker, +/area/station/cargo/miningdock) "sil" = ( /obj/item/restraints/legcuffs/beartrap/prearmed, /obj/effect/decal/cleanable/dirt, @@ -71666,17 +71693,6 @@ /obj/machinery/light/cold/directional/north, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"syZ" = ( -/obj/effect/turf_decal/trimline/red/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/red/line{ - dir = 8 - }, -/obj/effect/landmark/start/hangover, -/obj/machinery/light/floor, -/turf/open/floor/iron/dark, -/area/station/hallway/floor4/aft) "szb" = ( /obj/structure/chair/sofa/corp/right, /obj/machinery/light/directional/north, @@ -73259,6 +73275,16 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/atmos/hfr_room) +"sTE" = ( +/obj/effect/turf_decal/trimline/red/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/red/line{ + dir = 8 + }, +/obj/machinery/light/floor, +/turf/open/floor/iron/dark, +/area/station/hallway/floor4/aft) "sTG" = ( /obj/machinery/chem_dispenser/drinks, /obj/structure/table/glass, @@ -73779,14 +73805,6 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet) -"sZb" = ( -/obj/structure/disposalpipe/trunk, -/obj/machinery/disposal/bin, -/obj/machinery/firealarm/directional/north, -/turf/open/floor/iron/corner{ - dir = 8 - }, -/area/station/engineering/lobby) "sZd" = ( /obj/structure/table/wood, /obj/effect/turf_decal/siding/white{ @@ -73997,14 +74015,6 @@ /obj/machinery/light/red/dim/directional/north, /turf/open/floor/catwalk_floor, /area/station/maintenance/floor3/port) -"tbt" = ( -/obj/structure/cable, -/obj/machinery/bouldertech/refinery/smelter, -/obj/machinery/conveyor/inverted{ - dir = 10 - }, -/turf/open/floor/iron/checker, -/area/station/cargo/miningdock) "tbu" = ( /obj/effect/spawner/random/trash/hobo_squat, /obj/effect/decal/cleanable/dirt, @@ -74620,14 +74630,6 @@ /obj/machinery/light/floor, /turf/open/floor/iron/dark, /area/station/hallway/floor2/fore) -"tjS" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/camera/autoname/directional/south, -/obj/machinery/bluespace_vendor/directional/south, -/turf/open/floor/iron/dark/side, -/area/station/hallway/floor2/aft) "tjV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -74680,13 +74682,6 @@ }, /turf/open/floor/eighties, /area/station/commons/fitness/recreation/entertainment) -"tkZ" = ( -/obj/structure/cable, -/obj/machinery/conveyor/inverted{ - dir = 6 - }, -/turf/open/floor/iron/checker, -/area/station/cargo/miningdock) "tld" = ( /obj/structure/table/reinforced, /obj/item/stack/sheet/mineral/plasma/five, @@ -76381,6 +76376,18 @@ }, /turf/open/floor/pod, /area/station/maintenance/floor4/starboard/aft) +"tHk" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) "tHn" = ( /obj/machinery/atmospherics/components/binary/pump/layer4{ dir = 1 @@ -77448,11 +77455,6 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/iron/dark/textured, /area/station/medical/paramedic) -"tVp" = ( -/obj/machinery/light_switch/directional/north, -/obj/machinery/status_display/ai/directional/east, -/turf/open/floor/circuit, -/area/station/ai_monitored/command/nuke_storage) "tVq" = ( /obj/structure/railing{ dir = 8 @@ -78231,6 +78233,21 @@ }, /turf/open/floor/catwalk_floor, /area/station/maintenance/floor1/port) +"uhj" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/table/reinforced, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/dark_blue/end{ + dir = 8 + }, +/obj/item/storage/toolbox/emergency, +/obj/machinery/bluespace_vendor/directional/south, +/turf/open/floor/iron/dark, +/area/station/commons/storage/tools) "uhl" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/spawner/random/structure/crate, @@ -78918,6 +78935,23 @@ }, /turf/open/floor/engine/xenobio, /area/station/science/xenobiology) +"urJ" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/effect/turf_decal/trimline/white/filled/line{ + color = "#065C93"; + 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/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/command/bridge) "urO" = ( /obj/machinery/firealarm/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible/layer2{ @@ -79615,23 +79649,6 @@ /obj/item/radio/intercom/directional/west, /turf/open/floor/iron/smooth_large, /area/station/cargo/miningoffice) -"uBN" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/effect/turf_decal/trimline/white/filled/line{ - color = "#065C93"; - 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/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/station/command/bridge) "uBR" = ( /obj/machinery/airalarm/directional/south, /obj/structure/table, @@ -80027,6 +80044,13 @@ /obj/machinery/vending/coffee, /turf/open/floor/iron/dark, /area/station/science/breakroom) +"uGS" = ( +/obj/structure/chair/sofa/bench/left{ + dir = 4 + }, +/obj/machinery/bluespace_vendor/directional/west, +/turf/open/floor/iron/dark, +/area/station/hallway/floor1/fore) "uHa" = ( /obj/effect/turf_decal/tile/red, /turf/open/floor/iron/dark/side, @@ -80625,12 +80649,6 @@ /obj/item/reagent_containers/syringe, /turf/open/floor/iron/white, /area/station/security/medical) -"uNm" = ( -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, -/obj/machinery/status_display/ai/directional/west, -/turf/open/floor/circuit, -/area/station/ai_monitored/command/nuke_storage) "uNp" = ( /obj/effect/turf_decal/trimline/purple/filled/corner{ dir = 4 @@ -81902,10 +81920,6 @@ /obj/machinery/duct, /turf/open/floor/pod/dark, /area/station/maintenance/floor2/port) -"vdT" = ( -/obj/machinery/bluespace_vendor/directional/north, -/turf/open/floor/engine, -/area/station/engineering/supermatter/room) "vdU" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/generic_maintenance_landmark, @@ -81996,12 +82010,6 @@ /obj/effect/decal/cleanable/glass, /turf/open/floor/plating, /area/station/maintenance/floor4/starboard) -"vfy" = ( -/obj/machinery/light/floor, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/station/hallway/floor2/fore) "vfG" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -82401,17 +82409,6 @@ dir = 1 }, /area/station/security/prison) -"vlh" = ( -/obj/structure/fluff{ - desc = "What, you think the water just magically soaks into the metallic flooring?"; - icon = 'icons/obj/mining_zones/survival_pod.dmi'; - icon_state = "fan_tiny"; - name = "shower drain" - }, -/obj/effect/turf_decal/trimline/neutral, -/obj/machinery/shower/directional/west, -/turf/open/floor/iron/freezer, -/area/station/hallway/secondary/service) "vlm" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -87368,16 +87365,6 @@ "wvq" = ( /turf/open/floor/iron/dark, /area/station/command/teleporter) -"wvv" = ( -/obj/effect/turf_decal/trimline/purple/corner, -/obj/effect/turf_decal/trimline/purple/filled/corner{ - dir = 4 - }, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk, -/obj/machinery/light/cold/no_nightlight/directional/west, -/turf/open/floor/iron/white, -/area/station/science/lobby) "wvw" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -88759,12 +88746,6 @@ dir = 5 }, /area/station/security/prison) -"wLQ" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/visible{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/science/ordnance/testlab) "wLV" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -89566,12 +89547,24 @@ /obj/item/storage/briefcase/secure, /turf/open/floor/iron/dark, /area/station/command/teleporter) +"wWY" = ( +/obj/effect/spawner/structure/window/hollow/plasma/middle{ + dir = 4 + }, +/turf/open/floor/engine/vacuum, +/area/station/science/ordnance/freezerchamber) "wXc" = ( /obj/structure/disposalpipe/segment{ dir = 10 }, /turf/open/floor/plating, /area/station/maintenance/floor2/starboard/fore) +"wXg" = ( +/obj/machinery/light/floor, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/hallway/floor4/aft) "wXi" = ( /obj/structure/cable/multilayer/multiz, /turf/open/floor/plating, @@ -90149,16 +90142,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/floor3/aft) -"xff" = ( -/obj/effect/turf_decal/trimline/green/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/green/line{ - dir = 8 - }, -/obj/machinery/light/floor, -/turf/open/floor/iron/dark, -/area/station/hallway/floor3/fore) "xfv" = ( /obj/machinery/atmospherics/components/binary/pump/layer2{ dir = 1; @@ -90222,15 +90205,6 @@ icon_state = "textured_dark" }, /area/station/medical/office) -"xgo" = ( -/obj/machinery/door/firedoor/border_only, -/obj/structure/railing, -/obj/effect/turf_decal/box/red, -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/science/ordnance/testlab) "xgC" = ( /obj/structure/railing/corner{ dir = 8 @@ -91627,11 +91601,6 @@ }, /turf/open/floor/pod/light, /area/station/maintenance/floor2/port/fore) -"xzS" = ( -/obj/structure/secure_safe/caps_spare/directional/south, -/obj/effect/turf_decal/tile/purple/fourcorners, -/turf/open/floor/iron/dark, -/area/station/command/bridge) "xzT" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -93210,6 +93179,12 @@ }, /turf/open/space/openspace, /area/space) +"xUB" = ( +/obj/machinery/light/floor, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/hallway/floor3/fore) "xUI" = ( /obj/structure/cable, /obj/structure/chair/sofa/bench/left, @@ -109227,7 +109202,7 @@ owI owI imY imY -lBR +ccB hpI jZE jSj @@ -110255,7 +110230,7 @@ owI owI imY imY -aSI +pkt hpI vTL vTL @@ -110794,7 +110769,7 @@ vsj tAz nQT lPR -iUP +hOG inq qsF wUH @@ -112595,7 +112570,7 @@ aYd nBn rUH rUH -nTF +uGS rNO tSK hJy @@ -121842,7 +121817,7 @@ xHA xHA uKC gqU -bkJ +pBQ wdL wdL wdL @@ -123358,7 +123333,7 @@ owI hKN lWH oLL -oqc +eIS hKN hKN mar @@ -124413,9 +124388,9 @@ qIz jYY ptd cbT -fCl +qgU okN -fCl +qgU mXx nRe mXx @@ -127232,9 +127207,9 @@ quB mRt dAc sBK -tbt -tkZ -nKc +sik +lcn +njR qas jwr cax @@ -136744,7 +136719,7 @@ bJU pYs uyu kbu -gxE +ozM eeQ mdR gpf @@ -139323,7 +139298,7 @@ rBP hjz hjz rBP -sZb +jyX xYU fYg kHS @@ -141366,7 +141341,7 @@ qEw qEw qEw sAH -vdT +rKV kfo iZP kcB @@ -143145,7 +143120,7 @@ owI owI css lwc -mlc +liu vEN tGq vmr @@ -178119,7 +178094,7 @@ kEI wwu sbI jtJ -bgq +qdF hat qfv lXq @@ -183764,7 +183739,7 @@ jON jON jON vxK -wvv +pYd hVK eLC tpU @@ -186355,7 +186330,7 @@ hLz uXA uXA hLz -enl +jsg ljf naW gqN @@ -186619,7 +186594,7 @@ hLz ilY hLz pLy -vlh +nLP joh hLz aQU @@ -189432,7 +189407,7 @@ dpL dpL dpL fNT -vfy +alL tjP jVt fNT @@ -189949,14 +189924,14 @@ uPQ mge loK umC -gqT +nIN gYX -gqT +nIN feX feX feX qGm -mZS +oHh vKz oHs vXP @@ -190460,7 +190435,7 @@ qun qun qun fNT -otC +lIC uKW gEa fNT @@ -203828,7 +203803,7 @@ wzS nyE aOp oqv -tjS +cMz igE aWR aZn @@ -243143,7 +243118,7 @@ nVq nVq cyX wRJ -qwd +eOC mUs oJo oJo @@ -254968,7 +254943,7 @@ liQ liQ liQ eDe -gvo +pqB bdR cKS eDe @@ -255485,9 +255460,9 @@ cXK kZH uNx hkV -xff +jqq viX -xff +jqq oZx oZx oZx @@ -255996,7 +255971,7 @@ qrd qrd qrd eDe -kkd +xUB bdR mZI eDe @@ -266013,7 +265988,7 @@ avk pNj hgM iMN -bPh +jIj aLZ iNC xoj @@ -269104,7 +269079,7 @@ faS fXB quO cgm -ehZ +uhj frW frW chn @@ -308164,7 +308139,7 @@ xHe xHe xHe aNs -cRe +jov rrX djJ pWa @@ -308940,7 +308915,7 @@ rDQ rrX ewp eIb -uBN +urJ mzv wvA rrX @@ -309459,7 +309434,7 @@ rrX shu hwM ukK -xzS +rIg uIx oad uxW @@ -310230,7 +310205,7 @@ wlK eCM nET eCM -uNm +emm vQR hEQ uIx @@ -310744,7 +310719,7 @@ bxe eCM evo eCM -tVp +cuh vQR uIz uIx @@ -315087,7 +315062,7 @@ xpL qRI mKO rDL -wLQ +heI jha nPE xVV @@ -315344,7 +315319,7 @@ wFa eIs wFa tYV -fPd +oUW xwL nPE nPE @@ -315601,7 +315576,7 @@ mSG aSX aSX pqH -obC +bJA mKu hHi fMc @@ -315858,7 +315833,7 @@ dWz lYx unQ wMU -fPd +oUW rDL jjj dIJ @@ -316111,12 +316086,12 @@ ucA vyc vPP rrs -bYl -kiw -exv -lRw -fLX -ixd +mCU +hGC +jJM +hAH +eSq +tHk bDn gwe eoI @@ -316368,11 +316343,11 @@ ucA lYx oRh lYx -cBP +wWY lYx ngD wMU -xgo +aqm kFy xTG xxA @@ -316664,7 +316639,7 @@ dDw mau xPE qFL -gYI +qra rPK vEa owb @@ -319239,7 +319214,7 @@ exp lnl uYM eOy -cgv +jJG eNj ftt eNj @@ -320504,7 +320479,7 @@ liQ liQ liQ nWW -qyA +wXg nQX bgI eOP @@ -321021,9 +320996,9 @@ jgd kpl tFp gQh -syZ +fsK weB -bDf +sTE vRO vRO vRO @@ -321532,7 +321507,7 @@ txa txa txa nWW -diE +qNI nQX kQk eOP diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 2bdd5480d9d..3223f913aa5 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -3632,17 +3632,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/security/interrogation) -"awh" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 1 - }, -/obj/machinery/disposal/bin, -/obj/machinery/status_display/evac/directional/north, -/obj/structure/disposalpipe/trunk{ - dir = 2 - }, -/turf/open/floor/iron, -/area/station/commons/dorms) "awi" = ( /obj/effect/turf_decal/stripes{ dir = 4 @@ -8050,20 +8039,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/station/security/courtroom/holding) -"bLr" = ( -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 5 - }, -/obj/structure/plaque/static_plaque/golden{ - pixel_x = 32 - }, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/structure/window/reinforced/spawner/directional/south, -/turf/open/floor/iron, -/area/station/security/office) "bLA" = ( /obj/structure/table/wood, /obj/item/folder{ @@ -10468,6 +10443,19 @@ /obj/structure/thermoplastic/light, /turf/open/openspace, /area/station/hallway/primary/tram/center) +"cAc" = ( +/obj/structure/table, +/obj/item/storage/box/beakers{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Service - Hydroponics" + }, +/obj/effect/turf_decal/tile/green/fourcorners, +/obj/item/storage/box/syringes, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) "cAd" = ( /obj/structure/marker_beacon/burgundy, /turf/open/floor/plating/airless, @@ -10844,6 +10832,17 @@ }, /turf/open/floor/iron/white, /area/station/security/medical) +"cGY" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 9 + }, +/obj/machinery/disposal/bin, +/obj/machinery/newscaster/directional/north, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/main) "cHj" = ( /obj/structure/disposalpipe/junction/flip{ dir = 4 @@ -11643,18 +11642,6 @@ /obj/machinery/light/cold/directional/north, /turf/open/floor/iron/freezer, /area/station/security/prison/shower) -"cVk" = ( -/obj/effect/turf_decal/box, -/obj/machinery/shower/directional/east, -/obj/structure/fluff{ - desc = "Ew, I think I see a hairball."; - icon = 'icons/obj/mining_zones/survival_pod.dmi'; - icon_state = "fan_tiny"; - name = "shower drain" - }, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/white, -/area/station/medical/treatment_center) "cVl" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -16740,18 +16727,6 @@ "ePG" = ( /turf/closed/wall/r_wall, /area/station/science/auxlab/firing_range) -"ePS" = ( -/obj/machinery/shower/directional/west, -/obj/structure/fluff{ - desc = "What, you think the water just magically soaks into the metallic flooring?"; - icon = 'icons/obj/mining_zones/survival_pod.dmi'; - icon_state = "fan_tiny"; - name = "shower drain" - }, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/purple/fourcorners, -/turf/open/floor/iron/white, -/area/station/science/research) "eQm" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -19110,17 +19085,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/grimy, /area/station/service/library/lounge) -"fJQ" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 9 - }, -/obj/machinery/newscaster/directional/north, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/science/lab) "fKg" = ( /obj/machinery/air_sensor/nitrogen_tank, /turf/open/floor/engine/n2, @@ -21052,6 +21016,16 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/commons/dorms) +"gua" = ( +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/structure/disposalpipe/trunk{ + dir = 2 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) "gui" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -21205,17 +21179,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) -"gxO" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 9 - }, -/obj/machinery/disposal/bin, -/obj/machinery/newscaster/directional/north, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/main) "gxV" = ( /obj/machinery/mech_bay_recharge_port{ dir = 2 @@ -21292,6 +21255,16 @@ "gyP" = ( /turf/closed/wall, /area/station/science/robotics/mechbay) +"gzg" = ( +/obj/structure/chair/comfy/black, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/wood, +/area/station/command/meeting_room) "gzw" = ( /turf/closed/wall/r_wall, /area/station/science/ordnance/office) @@ -22516,18 +22489,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"gWt" = ( -/obj/effect/turf_decal/box, -/obj/structure/fluff{ - desc = "Ew, I think I see a hairball."; - icon = 'icons/obj/mining_zones/survival_pod.dmi'; - icon_state = "fan_tiny"; - name = "shower drain" - }, -/obj/machinery/shower/directional/west, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/white, -/area/station/medical/treatment_center) "gWu" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, /obj/effect/turf_decal/trimline/yellow/filled/corner{ @@ -24020,6 +23981,16 @@ }, /turf/open/floor/wood, /area/station/service/bar/backroom) +"hCD" = ( +/obj/structure/safe, +/obj/item/clothing/head/costume/bearpelt, +/obj/item/gun/ballistic/revolver/russian, +/obj/item/ammo_box/a357, +/obj/effect/turf_decal/bot_white/left, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/dim/directional/east, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/nuke_storage) "hCN" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /obj/machinery/light/floor, @@ -26706,6 +26677,17 @@ /obj/effect/mapping_helpers/requests_console/assistance, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) +"iEj" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/obj/machinery/disposal/bin, +/obj/machinery/status_display/evac/directional/north, +/obj/structure/disposalpipe/trunk{ + dir = 2 + }, +/turf/open/floor/iron, +/area/station/commons/dorms) "iEl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -31072,6 +31054,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/carpet, /area/station/command/heads_quarters/captain) +"kbR" = ( +/obj/effect/turf_decal/box, +/obj/structure/fluff/shower_drain, +/obj/machinery/shower/directional/west, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) "kbW" = ( /obj/structure/table/wood, /obj/machinery/firealarm/directional/north{ @@ -32918,21 +32907,6 @@ }, /turf/open/floor/plating, /area/station/hallway/secondary/entry) -"kHd" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/shower/directional/west, -/obj/effect/turf_decal/bot, -/obj/structure/fluff{ - desc = "What, you think the water just magically soaks into the metallic flooring?"; - icon = 'icons/obj/mining_zones/survival_pod.dmi'; - icon_state = "fan_tiny"; - name = "shower drain" - }, -/obj/effect/turf_decal/tile/purple/fourcorners, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "kHn" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner{ dir = 1 @@ -33734,6 +33708,19 @@ }, /turf/open/floor/iron/white, /area/station/science/lab) +"kUg" = ( +/obj/structure/reagent_dispensers/watertank/high, +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green/fourcorners, +/obj/machinery/newscaster/directional/south, +/obj/item/reagent_containers/cup/watering_can, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) "kUm" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -34600,6 +34587,10 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/prison) +"lkV" = ( +/obj/structure/table/glass, +/turf/open/floor/glass, +/area/station/command/meeting_room) "lkZ" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -35089,10 +35080,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/engineering/atmos) -"lrZ" = ( -/obj/structure/table/glass, -/turf/open/floor/glass, -/area/station/command/meeting_room) "lse" = ( /turf/open/floor/carpet, /area/station/service/theater) @@ -38697,19 +38684,6 @@ }, /turf/open/floor/engine, /area/station/science/xenobiology) -"mFj" = ( -/obj/structure/reagent_dispensers/watertank/high, -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/yellow/warning{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green/fourcorners, -/obj/machinery/newscaster/directional/south, -/obj/item/reagent_containers/cup/watering_can, -/turf/open/floor/iron/dark, -/area/station/service/hydroponics) "mFo" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 @@ -39733,6 +39707,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/grimy, /area/station/service/library/lounge) +"nbe" = ( +/obj/structure/table/reinforced, +/obj/structure/secure_safe/caps_spare/directional/east, +/obj/machinery/cell_charger{ + pixel_y = 4 + }, +/obj/item/stock_parts/cell/high, +/turf/open/floor/iron, +/area/station/command/bridge) "nbh" = ( /obj/structure/railing/corner, /obj/effect/turf_decal/trimline/blue/filled/corner, @@ -42028,6 +42011,16 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/station/cargo/miningdock/cafeteria) +"nOR" = ( +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 10 + }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) "nPe" = ( /turf/open/floor/carpet, /area/station/medical/psychology) @@ -42178,6 +42171,13 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"nRP" = ( +/obj/machinery/shower/directional/west, +/obj/structure/fluff/shower_drain, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/purple/fourcorners, +/turf/open/floor/iron/white, +/area/station/science/research) "nRW" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 8 @@ -43176,6 +43176,20 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"ojq" = ( +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 5 + }, +/obj/structure/plaque/static_plaque/golden{ + pixel_x = 32 + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/iron, +/area/station/security/office) "ojI" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -44621,16 +44635,6 @@ /obj/effect/turf_decal/trimline/yellow/filled/warning, /turf/open/floor/iron, /area/station/construction/mining/aux_base) -"oQO" = ( -/obj/structure/safe, -/obj/item/clothing/head/costume/bearpelt, -/obj/item/gun/ballistic/revolver/russian, -/obj/item/ammo_box/a357, -/obj/effect/turf_decal/bot_white/left, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/light/dim/directional/east, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/command/nuke_storage) "oQU" = ( /obj/structure/window/reinforced/spawner/directional/north, /turf/open/misc/grass/jungle, @@ -46975,19 +46979,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/service) -"pGO" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/machinery/disposal/bin, -/turf/open/floor/iron/dark, -/area/station/command/bridge) "pGS" = ( /obj/machinery/telecomms/bus/preset_one, /turf/open/floor/iron/dark/telecomms, @@ -48408,15 +48399,6 @@ "qgt" = ( /turf/closed/wall/rock/porous, /area/station/medical/chemistry) -"qgy" = ( -/obj/structure/table/reinforced, -/obj/structure/secure_safe/caps_spare/directional/east, -/obj/machinery/cell_charger{ - pixel_y = 4 - }, -/obj/item/stock_parts/cell/high, -/turf/open/floor/iron, -/area/station/command/bridge) "qgB" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -49910,15 +49892,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"qHW" = ( -/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/trimline/red/filled/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/security/checkpoint/science) "qIc" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/structure/cable, @@ -54269,16 +54242,6 @@ }, /turf/open/floor/iron/white, /area/station/science/xenobiology) -"skb" = ( -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 10 - }, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/cargo/storage) "ski" = ( /turf/open/floor/carpet, /area/station/hallway/secondary/entry) @@ -55408,6 +55371,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/security/brig) +"sDW" = ( +/obj/effect/turf_decal/box, +/obj/machinery/shower/directional/east, +/obj/structure/fluff/shower_drain, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) "sDY" = ( /obj/structure/railing{ dir = 1 @@ -55510,6 +55480,17 @@ }, /turf/open/floor/iron/dark, /area/station/security/courtroom/holding) +"sGc" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 9 + }, +/obj/machinery/newscaster/directional/north, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/lab) "sGk" = ( /obj/machinery/button/door/directional/east{ id = "miningdorm1"; @@ -56326,6 +56307,12 @@ }, /turf/open/floor/plating/airless, /area/station/science/ordnance/bomb) +"sUE" = ( +/obj/structure/fluff/shower_drain, +/obj/machinery/duct, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet) "sUX" = ( /obj/structure/railing{ dir = 4 @@ -56866,24 +56853,6 @@ "tes" = ( /turf/open/floor/glass/reinforced, /area/station/command/heads_quarters/rd) -"teH" = ( -/obj/structure/reagent_dispensers/watertank/high, -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/yellow/warning{ - dir = 8 - }, -/obj/machinery/elevator_control_panel/directional/south{ - desc = "A small control panel used to move the kitchen dumbwaiter up and down."; - linked_elevator_id = "dumbwaiter_lift"; - name = "Dumbwaiter control Panel"; - preset_destination_names = list("2" = "Hydroponics", "3" = "Kitchen") - }, -/obj/effect/turf_decal/tile/green/fourcorners, -/obj/item/reagent_containers/cup/watering_can, -/turf/open/floor/iron/dark, -/area/station/service/hydroponics) "teM" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner, /obj/effect/turf_decal/trimline/neutral/filled/corner{ @@ -60054,20 +60023,6 @@ }, /turf/open/floor/iron, /area/station/command/teleporter) -"ujv" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 5 - }, -/obj/machinery/shower/directional/west, -/obj/effect/turf_decal/box, -/obj/structure/fluff{ - desc = "What, you think the water just magically soaks into the metallic flooring?"; - icon = 'icons/obj/mining_zones/survival_pod.dmi'; - icon_state = "fan_tiny"; - name = "shower drain" - }, -/turf/open/floor/iron/white, -/area/station/medical/pharmacy) "ujw" = ( /obj/effect/landmark/start/hangover, /obj/structure/disposalpipe/segment, @@ -62919,6 +62874,24 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor, /area/station/maintenance/starboard/central) +"vcs" = ( +/obj/structure/reagent_dispensers/watertank/high, +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 8 + }, +/obj/machinery/elevator_control_panel/directional/south{ + desc = "A small control panel used to move the kitchen dumbwaiter up and down."; + linked_elevator_id = "dumbwaiter_lift"; + name = "Dumbwaiter control Panel"; + preset_destination_names = list("2" = "Hydroponics", "3" = "Kitchen") + }, +/obj/effect/turf_decal/tile/green/fourcorners, +/obj/item/reagent_containers/cup/watering_can, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) "vcv" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 10 @@ -64129,15 +64102,6 @@ }, /turf/open/floor/plating, /area/station/hallway/secondary/entry) -"vxv" = ( -/obj/effect/turf_decal/siding/wood, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/light/warm/directional/north, -/turf/open/floor/wood, -/area/station/command/meeting_room) "vyo" = ( /obj/machinery/duct, /obj/structure/cable, @@ -64760,6 +64724,15 @@ }, /turf/open/floor/iron, /area/station/commons/dorms) +"vHX" = ( +/obj/effect/turf_decal/siding/wood, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/light/warm/directional/north, +/turf/open/floor/wood, +/area/station/command/meeting_room) "vIa" = ( /obj/machinery/vending/cigarette, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -66155,19 +66128,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/tram/right) -"wjd" = ( -/obj/structure/table, -/obj/item/storage/box/beakers{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/machinery/camera/directional/north{ - c_tag = "Service - Hydroponics" - }, -/obj/effect/turf_decal/tile/green/fourcorners, -/obj/item/storage/box/syringes, -/turf/open/floor/iron/dark, -/area/station/service/hydroponics) "wjk" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Security Maintenance Hatch" @@ -66721,6 +66681,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/medical/virology) +"wvW" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal/bin, +/turf/open/floor/iron/dark, +/area/station/command/bridge) "wwc" = ( /obj/structure/table/wood, /obj/item/paper_bin{ @@ -68014,16 +67987,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/command/heads_quarters/cmo) -"wWe" = ( -/obj/structure/chair/comfy/black, -/obj/effect/turf_decal/siding/wood{ - dir = 6 - }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/open/floor/wood, -/area/station/command/meeting_room) "wWh" = ( /obj/machinery/vending/cola/blue, /obj/effect/turf_decal/siding/thinplating/dark{ @@ -68123,6 +68086,15 @@ }, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/foyer) +"wXJ" = ( +/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/trimline/red/filled/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/checkpoint/science) "wXM" = ( /turf/open/floor/carpet, /area/station/commons/vacant_room/office) @@ -68305,6 +68277,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/closed/wall/r_wall, /area/station/medical/virology) +"xbv" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 5 + }, +/obj/machinery/shower/directional/west, +/obj/effect/turf_decal/box, +/obj/structure/fluff/shower_drain, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) "xbw" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -69058,17 +69039,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) -"xrf" = ( -/obj/structure/fluff{ - desc = "What, you think the water just magically soaks into the metallic flooring?"; - icon = 'icons/obj/mining_zones/survival_pod.dmi'; - icon_state = "fan_tiny"; - name = "shower drain" - }, -/obj/machinery/duct, -/obj/effect/landmark/event_spawn, -/turf/open/floor/iron/freezer, -/area/station/commons/toilet) "xrl" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 @@ -69844,6 +69814,16 @@ "xFx" = ( /turf/open/floor/iron, /area/station/commons/fitness) +"xGu" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/shower/directional/west, +/obj/effect/turf_decal/bot, +/obj/structure/fluff/shower_drain, +/obj/effect/turf_decal/tile/purple/fourcorners, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "xGw" = ( /obj/machinery/door/airlock/external{ name = "Labor Camp Shuttle Airlock" @@ -70447,16 +70427,6 @@ /obj/effect/turf_decal/trimline/blue/filled/line, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"xSz" = ( -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 - }, -/obj/structure/disposalpipe/trunk{ - dir = 2 - }, -/turf/open/floor/iron/white, -/area/station/medical/treatment_center) "xSD" = ( /obj/structure/chair/office/light{ dir = 8 @@ -84278,7 +84248,7 @@ apC abM apC thi -xrf +sUE alT amr alT @@ -84289,7 +84259,7 @@ kMD alT amr alT -xrf +sUE pAv apC abM @@ -88650,7 +88620,7 @@ fFi apC fii apC -awh +iEj wBc nhL npe @@ -90671,7 +90641,7 @@ rUR aaa rUR pnp -oQO +hCD lQM abM abM @@ -101505,7 +101475,7 @@ pkp pkp pkp pLH -gxO +cGY sqV lku osj @@ -103251,7 +103221,7 @@ adg ykN qMf dyC -mFj +kUg nUP gvC cay @@ -103758,14 +103728,14 @@ iJn gzP uQb nUP -wjd +cAc wHX nWT adg ykN qMf mCR -teH +vcs nUP cQY aer @@ -117448,7 +117418,7 @@ puT awT qVr kXg -kHd +xGu dGk qVr kkL @@ -155171,7 +155141,7 @@ qdY xNj qyZ kSZ -wWe +gzg imr iue hyE @@ -155427,11 +155397,11 @@ lSo azy tFK qyZ -vxv +vHX hHI nfR hHI -lrZ +lkV hHI nUM bNF @@ -155694,7 +155664,7 @@ pRB kVV mIp hZP -pGO +wvW cMb qiq crR @@ -156470,7 +156440,7 @@ aQO rup wzm rAh -qgy +nbe eUy mgq nhV @@ -159003,7 +158973,7 @@ bcq idF dYe auR -bLr +ojq mld nPw lMQ @@ -166770,7 +166740,7 @@ jyH wmy iYv kFf -ujv +xbv mOM ssF kTS @@ -168836,7 +168806,7 @@ xSZ yfw oIU aLA -gWt +kbR wbT dvQ uZQ @@ -169350,7 +169320,7 @@ xSZ aLd oIU aLA -cVk +sDW krE bvK eGn @@ -170120,7 +170090,7 @@ uHB jtr jtr jKi -xSz +gua qDF uwk oXz @@ -181905,7 +181875,7 @@ jcv rpr dzw sxR -skb +nOR oAV ccF uWi @@ -181936,7 +181906,7 @@ sUb amL qQc oxL -fJQ +sGc mlM bxG nDR @@ -184506,9 +184476,9 @@ sNQ sPK gYO pMk -ePS +nRP pmM -ePS +nRP pMk dfE gvm @@ -185288,7 +185258,7 @@ niF rQt kvt syv -qHW +wXJ ybW eah syv diff --git a/_maps/shuttles/pirate_irs.dmm b/_maps/shuttles/pirate_irs.dmm index 38067cecaae..a15f006ca0f 100644 --- a/_maps/shuttles/pirate_irs.dmm +++ b/_maps/shuttles/pirate_irs.dmm @@ -1033,12 +1033,7 @@ layer = 4 }, /obj/effect/turf_decal/box, -/obj/structure/fluff{ - desc = "What, you think the water just magically soaks into the metallic flooring?"; - icon = 'icons/obj/mining_zones/survival_pod.dmi'; - icon_state = "fan_tiny"; - name = "shower drain" - }, +/obj/structure/fluff/shower_drain, /turf/open/floor/iron/dark, /area/shuttle/pirate) "Dy" = ( diff --git a/code/game/objects/structures/fluff.dm b/code/game/objects/structures/fluff.dm index 82e89314d68..82569c8f9e7 100644 --- a/code/game/objects/structures/fluff.dm +++ b/code/game/objects/structures/fluff.dm @@ -25,6 +25,7 @@ qdel(src) return ..() + /** * Empty terrariums are created when a preserved terrarium in a lavaland seed vault is activated. */ @@ -34,6 +35,7 @@ icon = 'icons/obj/mining_zones/spawners.dmi' icon_state = "terrarium_open" density = TRUE + /** * Empty sleepers are created by a good few ghost roles in lavaland. */ @@ -51,6 +53,7 @@ /obj/structure/fluff/empty_sleeper/syndicate icon_state = "sleeper_s-open" + /** * Empty cryostasis sleepers are created when a malfunctioning cryostasis sleeper in a lavaland shelter is activated. */ @@ -75,6 +78,17 @@ deconstructible = FALSE layer = EDGED_TURF_LAYER +/** + * shower drain placed usually under showers just so it looks like something picks the water up. + */ +/obj/structure/fluff/shower_drain + name = "shower drain" + desc = "Ew, I think I see a hairball." + icon = 'icons/obj/mining_zones/survival_pod.dmi' + icon_state = "fan_tiny" + plane = FLOOR_PLANE + layer = LOW_OBJ_LAYER + /** * A variety of statue in disrepair; parts are broken off and a gemstone is missing */