From d175f3d1e4fdd2b2935beb9e399effb24291d9b4 Mon Sep 17 00:00:00 2001 From: CRUNCH <143041327+Fordoxia@users.noreply.github.com> Date: Mon, 8 Sep 2025 19:17:27 +0100 Subject: [PATCH] Updates Genetics on Every Station Except Delta (#30027) * creation * Update emeraldstation.dmm --- _maps/map_files/stations/boxstation.dmm | 22 +++--- _maps/map_files/stations/cerestation.dmm | 39 +++++++--- _maps/map_files/stations/emeraldstation.dmm | 80 +++++++++++++++------ _maps/map_files/stations/metastation.dmm | 43 +++++++---- 4 files changed, 129 insertions(+), 55 deletions(-) diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index f4797207a5b..c2a8232d434 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -49678,9 +49678,6 @@ }, /area/station/security/brig) "eHO" = ( -/obj/machinery/door/airlock/medical{ - name = "Genetics Monkey Pen" - }, /obj/effect/mapping_helpers/airlock/access/all/medical/genetics, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -49692,6 +49689,7 @@ dir = 4 }, /obj/machinery/door/firedoor, +/obj/machinery/door/airlock/research, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -55890,11 +55888,18 @@ /obj/structure/table/reinforced, /obj/machinery/door/firedoor, /obj/machinery/door/window/classic/reversed{ - dir = 4; - name = "Genetics Reception" + dir = 8 }, /obj/effect/mapping_helpers/airlock/windoor/access/any/medical/genetics{ - dir = 4 + dir = 8 + }, +/obj/item/desk_bell{ + pixel_x = 7; + pixel_y = 7; + anchored = 1 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname/desk{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "darkpurplefull" @@ -74333,10 +74338,6 @@ /area/station/maintenance/asmaint) "qDj" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical/glass{ - id_tag = "GeneticsDoor"; - name = "Genetics" - }, /obj/effect/mapping_helpers/airlock/access/all/medical/genetics, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -74344,6 +74345,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/door/airlock/research/glass, /turf/simulated/floor/plasteel{ icon_state = "dark" }, diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index 0fa8e1eebe4..5560f00a7cf 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -18454,13 +18454,6 @@ }, /area/station/command/meeting_room) "cGW" = ( -/obj/machinery/door_control{ - id = "genetics"; - name = "Genetics Privacy Shutters"; - pixel_y = -23; - req_access = list(9); - pixel_x = 24 - }, /obj/structure/table/glass, /obj/item/paper_bin, /obj/item/pen, @@ -32103,6 +32096,18 @@ pixel_x = -2; pixel_y = 10 }, +/obj/machinery/button/windowtint{ + id = "genetics"; + pixel_x = 24; + dir = 8 + }, +/obj/machinery/door_control{ + id = "genetics"; + name = "Genetics Privacy Shutters"; + pixel_y = 8; + req_access = list(9); + pixel_x = 24 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkpurple" @@ -63252,8 +63257,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/access/all/medical/genetics, -/obj/machinery/door/airlock/medical/glass, /obj/effect/mapping_helpers/airlock/autoname, +/obj/machinery/door/airlock/research/glass, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -96577,11 +96582,18 @@ }, /area/station/maintenance/starboard) "sWu" = ( -/obj/effect/spawner/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id_tag = "genetics"; name = "Genetics Privacy Shutters" }, +/obj/machinery/door/poddoor/preopen{ + id_tag = "researchlockdown"; + layer = 2.6; + name = "Research Emergency Lockdown" + }, +/obj/effect/spawner/window/reinforced/polarized{ + id = "genetics" + }, /turf/simulated/floor/plating, /area/station/science/genetics) "sWz" = ( @@ -98297,6 +98309,15 @@ /obj/effect/mapping_helpers/airlock/windoor/access/any/medical/genetics{ dir = 8 }, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/preopen{ + id_tag = "researchlockdown"; + layer = 2.6; + name = "Research Emergency Lockdown" + }, +/obj/effect/mapping_helpers/airlock/polarized{ + id = "genetics" + }, /turf/simulated/floor/plating, /area/station/science/genetics) "tpA" = ( diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm index 8dfd46d513f..2ff2ae5b91f 100644 --- a/_maps/map_files/stations/emeraldstation.dmm +++ b/_maps/map_files/stations/emeraldstation.dmm @@ -24133,9 +24133,10 @@ /area/station/engineering/solar/fore_starboard) "ePX" = ( /obj/structure/table/reinforced, -/obj/machinery/door/window/classic/reversed{ - name = "Genetics Reception" - }, +/obj/effect/mapping_helpers/airlock/windoor/access/any/medical/genetics, +/obj/machinery/door/firedoor, +/obj/machinery/door/window/classic/reversed, +/obj/effect/mapping_helpers/airlock/windoor/autoname/desk, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -31079,11 +31080,18 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/east) "ggn" = ( -/obj/effect/spawner/window/reinforced, /obj/machinery/door/poddoor/preopen{ id_tag = "Biohazard"; name = "Biohazard Shutter" }, +/obj/effect/spawner/window/reinforced/polarized{ + id = "genetics" + }, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id_tag = "geneticsprivacy"; + name = "Genetics Privacy Shutters" + }, /turf/simulated/floor/plating, /area/station/science/genetics) "ggt" = ( @@ -66184,14 +66192,26 @@ /area/station/engineering/atmos/distribution) "nkr" = ( /obj/machinery/disposal, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, /obj/structure/disposalpipe/trunk{ dir = 4 }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -24; + name = "west bump"; + pixel_y = 7 + }, +/obj/machinery/button/windowtint{ + dir = 4; + id = "genetics"; + pixel_x = -24 + }, +/obj/machinery/door_control{ + id = "geneticsprivacy"; + name = "Genetics Privacy Control"; + pixel_x = -25; + pixel_y = -8 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkpurplecorners" @@ -74326,13 +74346,11 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "oLN" = ( -/obj/machinery/door/airlock/medical{ - name = "Genetics Monkey Pen" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/mapping_helpers/airlock/access/all/medical/genetics, /obj/machinery/door/firedoor, +/obj/machinery/door/airlock/research, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -99381,6 +99399,18 @@ /obj/effect/landmark/spawner/late/crew, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) +"tIk" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/poster/official/random/directional/south, +/obj/structure/table/glass, +/obj/item/paper_bin, +/obj/item/pen, +/turf/simulated/floor/plasteel{ + icon_state = "purplecorner" + }, +/area/station/hallway/primary/starboard/south) "tIp" = ( /obj/structure/table/reinforced, /obj/item/storage/firstaid/regular, @@ -110409,10 +110439,6 @@ /area/station/security/checkpoint/secondary) "vRn" = ( /obj/structure/table/reinforced, -/obj/machinery/door/window/classic/reversed{ - dir = 4; - name = "Genetics Reception" - }, /obj/item/desk_bell{ pixel_x = -6; pixel_y = 3; @@ -110426,6 +110452,20 @@ id_tag = "Biohazard"; name = "Biohazard Shutter" }, +/obj/machinery/door/window/classic/reversed{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname/desk{ + dir = 4 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id_tag = "geneticsprivacy"; + name = "Genetics Privacy Shutters" + }, +/obj/effect/mapping_helpers/airlock/polarized{ + id = "genetics" + }, /turf/simulated/floor/plasteel, /area/station/science/genetics) "vRu" = ( @@ -110508,15 +110548,13 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "vSF" = ( -/obj/machinery/door/airlock/medical/glass{ - id_tag = "GeneticsDoor"; - name = "Genetics" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/mapping_helpers/airlock/access/all/medical/genetics, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, +/obj/machinery/door/airlock/research/glass, +/obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -165955,7 +165993,7 @@ jWF lwn mxJ suS -udN +tIk wDu cVJ vYY diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index 289344b83bc..a277d531316 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -6966,11 +6966,13 @@ /area/shuttle/pod_1) "aSx" = ( /obj/machinery/door/poddoor/shutters/preopen{ - dir = 2; + dir = 1; name = "Genetics Shutters"; id_tag = "geneticsprivacy" }, -/obj/effect/spawner/window/reinforced, +/obj/effect/spawner/window/reinforced/polarized{ + id = "genetics" + }, /turf/simulated/floor/plating, /area/station/science/genetics) "aSy" = ( @@ -23798,6 +23800,10 @@ /obj/machinery/computer/scan_consolenew{ dir = 4 }, +/obj/machinery/button/windowtint{ + id = "genetics"; + pixel_y = 24 + }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "darkpurple" @@ -27939,14 +27945,18 @@ /obj/structure/table/reinforced, /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/shutters/preopen{ - dir = 2; + dir = 1; name = "Genetics Shutters"; id_tag = "geneticsprivacy" }, /obj/effect/mapping_helpers/airlock/windoor/access/any/medical/genetics, -/obj/machinery/door/window/classic/normal{ - name = "Genetics Reception" +/obj/machinery/door/window/classic/normal, +/obj/effect/mapping_helpers/airlock/windoor/autoname/desk, +/obj/effect/mapping_helpers/airlock/polarized{ + id = "genetics" }, +/obj/item/paper_bin, +/obj/item/pen, /turf/simulated/floor/plasteel{ icon_state = "darkpurplefull" }, @@ -57808,19 +57818,22 @@ /area/station/public/toilet/lockerroom) "mic" = ( /obj/structure/table/reinforced, -/obj/machinery/door/window/classic/reversed{ - name = "Genetics Reception" - }, /obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/windoor/access/any/medical/genetics, +/obj/machinery/door/window/classic/reversed, +/obj/effect/mapping_helpers/airlock/windoor/autoname/desk, /obj/machinery/door/poddoor/shutters/preopen{ - dir = 2; + dir = 1; name = "Genetics Shutters"; id_tag = "geneticsprivacy" }, -/obj/effect/mapping_helpers/airlock/windoor/access/any/medical/genetics, -/obj/item/paper_bin{ - pixel_x = -2; - pixel_y = 6 +/obj/effect/mapping_helpers/airlock/polarized{ + id = "genetics" + }, +/obj/item/desk_bell{ + pixel_x = 7; + pixel_y = 7; + anchored = 1 }, /turf/simulated/floor/plasteel{ icon_state = "darkpurplefull" @@ -88002,8 +88015,8 @@ /obj/machinery/door_control{ id = "geneticsprivacy"; name = "Genetics Privacy Control"; - pixel_x = -30; - pixel_y = 26 + pixel_x = -23; + pixel_y = 24 }, /obj/effect/landmark/start/geneticist, /obj/structure/chair/office{