From 2a48ed1c1784c8f73e50888ec430c5bd355fd9d3 Mon Sep 17 00:00:00 2001 From: Zack Date: Tue, 12 Mar 2024 05:41:28 -0500 Subject: [PATCH] Slightly remaps Meta toxins launch room (#24250) * remaps toxins * fixed what Henri215 suggested --- _maps/map_files/MetaStation/MetaStation.dmm | 334 ++++++++------------ 1 file changed, 135 insertions(+), 199 deletions(-) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 8ef0ae72bef..ece2acf140b 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -23154,14 +23154,6 @@ icon_state = "darkbluecorners" }, /area/station/turret_protected/aisat/interior) -"bAB" = ( -/obj/structure/table/wood, -/obj/machinery/bottler, -/obj/structure/sign/poster/random{ - pixel_y = -32 - }, -/turf/simulated/floor/wood, -/area/station/service/bar) "bAC" = ( /turf/simulated/floor/plating/airless, /area/station/engineering/solar/auxport) @@ -31554,6 +31546,14 @@ }, /turf/simulated/floor/plasteel, /area/station/science/robotics) +"cdj" = ( +/obj/structure/table/wood, +/obj/machinery/bottler, +/obj/structure/sign/poster/random{ + pixel_y = -32 + }, +/turf/simulated/floor/wood, +/area/station/service/bar) "cdk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -36336,6 +36336,18 @@ icon_state = "solarpanel" }, /area/station/engineering/solar/port) +"cuZ" = ( +/obj/structure/table, +/obj/item/storage/toolbox/mechanical, +/obj/machinery/power/apc/directional/north, +/obj/structure/cable/yellow{ + d2 = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/station/science/toxins/launch) "cva" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -47142,6 +47154,18 @@ icon_state = "red" }, /area/station/security/permabrig) +"dQI" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel, +/area/station/science/research) "dRt" = ( /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, @@ -48765,6 +48789,12 @@ /obj/item/assembly/signaler{ pixel_y = 8 }, +/obj/machinery/requests_console{ + department = "Science"; + departmentType = 2; + name = "Science Requests Console"; + pixel_y = 30 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -49037,7 +49067,6 @@ }, /area/station/public/locker) "eGn" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -53102,21 +53131,6 @@ icon_state = "dark" }, /area/station/engineering/ai_transit_tube) -"gpV" = ( -/obj/machinery/door/window/classic/normal{ - name = "Mass Driver Door"; - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/effect/mapping_helpers/airlock/windoor/access/all/science/tox{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkgrey" - }, -/area/station/science/toxins/launch) "gqi" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance, @@ -53713,10 +53727,12 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft2) "gFf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -59247,14 +59263,12 @@ }, /area/station/hallway/primary/aft/south) "iQC" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/white/line{ dir = 1 }, +/obj/structure/table, +/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/glasses/science, /turf/simulated/floor/plasteel{ icon_state = "darkgrey" }, @@ -59448,6 +59462,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -59563,7 +59580,6 @@ }, /area/station/turret_protected/ai) "iXy" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, @@ -61443,7 +61459,6 @@ /turf/space, /area/station/engineering/solar/auxstarboard) "jQZ" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ @@ -61451,6 +61466,10 @@ d2 = 8; icon_state = "1-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -67197,10 +67216,6 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -68177,6 +68192,30 @@ }, /turf/simulated/floor/plating, /area/station/command/office/rd) +"mEd" = ( +/obj/structure/disposalpipe/sortjunction{ + dir = 4; + name = "Kitchen Junction"; + sort_type_txt = "20" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/wood, +/area/station/service/bar) "mEe" = ( /obj/structure/chair/office/dark{ dir = 8 @@ -71231,11 +71270,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light, /turf/simulated/floor/plasteel{ icon_state = "darkgrey" }, @@ -72146,17 +72181,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) -"ooH" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkgrey" - }, -/area/station/science/toxins/launch) "ooN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -77779,17 +77803,6 @@ icon_state = "dark" }, /area/station/security/permabrig) -"qIZ" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkgrey" - }, -/area/station/science/toxins/launch) "qJz" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -78229,19 +78242,6 @@ icon_state = "white" }, /area/station/medical/medbay) -"qSE" = ( -/obj/structure/table, -/obj/machinery/computer/security/telescreen{ - desc = "Used for watching the test chamber."; - layer = 4; - name = "Test Chamber Telescreen"; - network = list("Toxins"); - pixel_x = -2 - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkgrey" - }, -/area/station/science/toxins/launch) "qTF" = ( /obj/machinery/newscaster{ name = "north bump"; @@ -78896,16 +78896,18 @@ }, /area/station/service/kitchen) "rhH" = ( -/obj/structure/window/reinforced{ - dir = 8 +/obj/machinery/door/window/classic/normal{ + name = "Mass Driver Door" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/machinery/door/window/classic/normal{ + name = "Mass Driver Control Door"; + dir = 1 }, -/turf/simulated/floor/plasteel{ - icon_state = "darkgrey" +/obj/effect/mapping_helpers/airlock/windoor/access/all/science/tox{ + dir = 1 }, +/obj/effect/mapping_helpers/airlock/windoor/access/all/science/tox, +/turf/simulated/floor/plating, /area/station/science/toxins/launch) "rif" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -80472,9 +80474,7 @@ dir = 4; network = list("Research","SS13") }, -/obj/structure/disaster_counter/toxins{ - pixel_x = -32 - }, +/obj/item/storage/toolbox/mechanical, /turf/simulated/floor/plasteel{ icon_state = "darkgrey" }, @@ -81047,18 +81047,6 @@ /obj/effect/spawner/random_spawners/fungus_maybe, /turf/simulated/wall/r_wall, /area/station/public/mrchangs) -"sdj" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel, -/area/station/science/research) "sdJ" = ( /obj/machinery/door/airlock/freezer, /obj/effect/mapping_helpers/airlock/access/all/service/kitchen, @@ -82590,12 +82578,10 @@ }, /area/station/engineering/atmos) "sNi" = ( -/obj/structure/table, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/glasses/science, -/obj/item/radio/intercom{ - name = "east bump"; - pixel_x = 28 +/obj/effect/turf_decal/delivery, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "darkgrey" @@ -82817,6 +82803,11 @@ "sRf" = ( /obj/structure/table, /obj/item/clothing/mask/gas, +/obj/machinery/driver_button{ + id_tag = "toxinsdriver"; + pixel_y = -24; + range = 18 + }, /turf/simulated/floor/plasteel{ icon_state = "darkgrey" }, @@ -90066,15 +90057,12 @@ /obj/structure/table, /obj/item/paper_bin, /obj/item/pen, -/obj/machinery/requests_console{ - department = "Science"; - departmentType = 2; - name = "Science Requests Console"; - pixel_x = -30 - }, /obj/effect/turf_decal/stripes/white/line{ dir = 1 }, +/obj/structure/disaster_counter/toxins{ + pixel_x = -32 + }, /turf/simulated/floor/plasteel{ icon_state = "darkgrey" }, @@ -90401,17 +90389,6 @@ }, /turf/space, /area/space/nearstation) -"wpn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/science/toxins/launch) "wpu" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel, @@ -90635,23 +90612,16 @@ }, /area/station/science/toxins/launch) "wuc" = ( -/obj/structure/table, -/obj/machinery/driver_button{ - id_tag = "toxinsdriver"; - pixel_y = -24; - range = 18 +/obj/machinery/disposal/deliveryChute{ + dir = 4 }, /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/camera{ - c_tag = "Science Toxins Launch - Aft"; - dir = 10; - network = list("Research","SS13") - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkgrey" +/obj/structure/disposalpipe/trunk{ + dir = 8 }, +/turf/simulated/floor/plating, /area/station/science/toxins/launch) "wul" = ( /turf/simulated/floor/plasteel{ @@ -91232,13 +91202,11 @@ }, /area/station/security/processing) "wHL" = ( -/obj/machinery/door/window/classic/normal{ - name = "Mass Driver Control Door"; - dir = 1 - }, -/obj/effect/mapping_helpers/airlock/windoor/access/all/science/tox{ - dir = 1 - }, +/obj/structure/closet/crate, +/obj/item/target/alien, +/obj/item/target/alien, +/obj/item/target/alien, +/obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel{ icon_state = "darkgrey" }, @@ -92909,6 +92877,10 @@ /obj/structure/table, /obj/item/wrench, /obj/item/crowbar, +/obj/item/radio/intercom{ + name = "west bump"; + pixel_x = -28 + }, /turf/simulated/floor/plasteel{ icon_state = "darkgrey" }, @@ -93330,18 +93302,6 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) -"xCY" = ( -/obj/structure/table, -/obj/item/storage/toolbox/mechanical, -/obj/machinery/power/apc/directional/north, -/obj/structure/cable/yellow{ - d2 = 4; - icon_state = "0-4" - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/science/toxins/launch) "xDR" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ @@ -93598,30 +93558,6 @@ icon_state = "neutralcorner" }, /area/station/hallway/primary/central/north) -"xLw" = ( -/obj/structure/disposalpipe/sortjunction{ - dir = 4; - name = "Kitchen Junction"; - sort_type_txt = "20" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/wood, -/area/station/service/bar) "xLA" = ( /obj/machinery/hydroponics/constructable, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -128409,7 +128345,7 @@ dCm nqr fyt rOZ -xCY +cuZ lhF eDX whx @@ -129183,7 +129119,7 @@ rOZ lvB eDX dIQ -qIZ +dal lvP hVK oTc @@ -129381,7 +129317,7 @@ byM bEA bvz bEv -xLw +mEd uhV lBQ fjy @@ -129443,7 +129379,7 @@ ucR iQC sNi sRf -oTc +rOZ aaa abq bwM @@ -129697,10 +129633,10 @@ rOZ phL mWp dIQ -cRQ -cRQ oTc -cRQ +wuc +oTc +oTc cRQ cRQ mng @@ -129954,7 +129890,7 @@ rOZ cDq kGo gFf -cRQ +rhH dnH cWc wvK @@ -130210,11 +130146,11 @@ bXG rOZ eAC dWQ -wpn +eDX nRl -rhH -gpV -wuc +xtx +rOZ +rOZ cRQ cRQ mng @@ -130469,10 +130405,10 @@ ljg fuC lIC wHL -lvP -ooH -qSE -oTc +rOZ +aaa +abq +aaa aaa aaa iju @@ -130726,11 +130662,11 @@ xtx rOZ rOZ rOZ -xtx -rOZ -naq rOZ aaa +abq +aaa +aaa aaa aaa aaa @@ -131988,7 +131924,7 @@ cQg rOD cDa mra -sdj +dQI vCB lHQ eIa @@ -132204,7 +132140,7 @@ bsp buI bwO pjb -bAB +cdj aoG aoG aoG