From e0eca566a9860f27e6b645c7265c74380a4be15a Mon Sep 17 00:00:00 2001 From: TripleShades Date: Thu, 29 Apr 2021 14:04:04 -0400 Subject: [PATCH 1/3] Update PubbyStation.dmm --- _maps/map_files/PubbyStation/PubbyStation.dmm | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 7bfabf432d..6dc7a478c0 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -3392,6 +3392,10 @@ /obj/vehicle/ridden/secway, /obj/item/key/security, /obj/effect/turf_decal/bot, +/obj/machinery/airalarm{ + dir = 1; + pixel_y = -22 + }, /turf/open/floor/plasteel/showroomfloor, /area/security/office) "ais" = ( @@ -4891,6 +4895,10 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -23 + }, /turf/open/floor/plasteel, /area/security/brig) "alz" = ( @@ -107807,8 +107815,8 @@ aaa aaa aaa aaa -aEl -aFi +aEj +bZV aEj aaa aEj @@ -108064,9 +108072,9 @@ aaa aaa aaa aaa -aEj -bZV -aEj +cdm +cdm +cdm aaa aaa aaa @@ -108321,9 +108329,9 @@ aaa aaa aaa aaa -ahi -ahi -ahi +bBW +bBW +bBW aaa aaa aaa From ee3b69989b3fb99edea24d8033ad833efce5212d Mon Sep 17 00:00:00 2001 From: TripleShades Date: Thu, 29 Apr 2021 14:20:11 -0400 Subject: [PATCH 2/3] Update PubbyStation.dmm --- _maps/map_files/PubbyStation/PubbyStation.dmm | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 6dc7a478c0..eacbc74508 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -705,7 +705,7 @@ icon_state = "4-8" }, /turf/open/floor/plating, -/area/commons/fitness/pool) +/area/maintenance/department/crew_quarters/dorms) "abG" = ( /obj/structure/cable{ icon_state = "1-2" @@ -37287,7 +37287,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/science/mixing) +/area/maintenance/department/science) "bGB" = ( /obj/machinery/light/small, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -45944,14 +45944,8 @@ /turf/open/floor/engine, /area/maintenance/disposal/incinerator) "bZV" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/machinery/door/airlock/external{ - req_access_txt = "13" - }, -/turf/open/floor/plating, -/area/maintenance/department/cargo) +/turf/closed/wall, +/area/hallway/primary/fore) "bZY" = ( /turf/closed/wall, /area/service/chapel/office) @@ -61269,8 +61263,14 @@ /turf/open/floor/plating, /area/maintenance/department/science) "vtT" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/airlock/external{ + req_access_txt = "13" + }, /turf/open/floor/plating, -/area/maintenance/solars/port) +/area/maintenance/department/cargo) "vuP" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -62187,7 +62187,7 @@ "xuv" = ( /obj/item/broken_bottle, /turf/open/floor/plating, -/area/maintenance/solars/port) +/area/maintenance/department/security/brig) "xvO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -79796,11 +79796,11 @@ atp aus aiu wxb -axC +aiu xuv -azN -vtT -vtT +aoe +ajD +ajD aiu apB aiu @@ -82368,8 +82368,8 @@ apE avq apE ajM -aiu -aiu +bZV +bZV gSH xJy sJr @@ -106263,7 +106263,7 @@ aaF aaF aaF abF -aaF +aiS aiS atn awC @@ -107816,7 +107816,7 @@ aaa aaa aaa aEj -bZV +vtT aEj aaa aEj From 0c854552270ae47d1ef5647f375e296361ef5c32 Mon Sep 17 00:00:00 2001 From: TripleShades Date: Thu, 29 Apr 2021 15:09:33 -0400 Subject: [PATCH 3/3] god i hate areas --- _maps/map_files/BoxStation/BoxStation.dmm | 96 +++++++++++++------ .../map_files/Deltastation/DeltaStation2.dmm | 17 ++-- _maps/map_files/MetaStation/MetaStation.dmm | 13 ++- 3 files changed, 84 insertions(+), 42 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 9ace5cf95b..826d25a437 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -25957,7 +25957,7 @@ /area/medical/paramedic) "bkd" = ( /obj/machinery/camera{ - c_tag = "Medbay Morgue"; + c_tag = "Paramedic Disbatch"; dir = 8; network = list("ss13","medbay") }, @@ -26360,7 +26360,7 @@ req_access_txt = "6" }, /turf/open/floor/plasteel/dark, -/area/medical/morgue) +/area/maintenance/department/medical/morgue) "blb" = ( /obj/machinery/door/airlock/command{ name = "Captain's Quarters"; @@ -33974,12 +33974,12 @@ }, /obj/machinery/bloodbankgen, /obj/machinery/camera{ - c_tag = "Medbay Recovery Room"; + c_tag = "Medbay Surgery Storage"; dir = 6; network = list("ss13","medbay") }, /turf/open/floor/plasteel/white, -/area/medical/medbay/central) +/area/medical/storage) "bCD" = ( /obj/machinery/computer/operating, /turf/open/floor/plasteel/white/side, @@ -34354,11 +34354,14 @@ /area/engineering/storage/tech) "bDA" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 }, /turf/open/floor/plasteel/white, -/area/medical/medbay/central) +/area/medical/storage) "bDB" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -34366,6 +34369,9 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/white/side{ dir = 4 }, @@ -35118,7 +35124,7 @@ dir = 4 }, /turf/closed/wall, -/area/medical/medbay/central) +/area/medical/storage) "bFn" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -35130,12 +35136,12 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/light/small{ - dir = 1 - }, /obj/effect/decal/cleanable/blood/old, +/obj/machinery/airalarm{ + pixel_y = 23 + }, /turf/open/floor/plasteel/white, -/area/medical/medbay/central) +/area/medical/storage) "bFp" = ( /obj/structure/closet/crate/freezer, /obj/item/reagent_containers/blood/random, @@ -35162,8 +35168,11 @@ dir = 8; sortType = 6 }, +/obj/machinery/light/small{ + dir = 1 + }, /turf/open/floor/plasteel/white, -/area/medical/medbay/central) +/area/medical/storage) "bFq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/yellow, @@ -35187,8 +35196,11 @@ /obj/structure/disposalpipe/segment, /obj/structure/closet/crate/freezer/surplus_limbs, /obj/item/reagent_containers/glass/beaker/synthflesh, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, /turf/open/floor/plasteel/white, -/area/medical/medbay/central) +/area/medical/storage) "bFu" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -35222,8 +35234,9 @@ "bFx" = ( /obj/structure/disposalpipe/segment, /obj/machinery/limbgrower, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/plasteel/white, -/area/medical/medbay/central) +/area/medical/storage) "bFy" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -35809,7 +35822,7 @@ dir = 4 }, /turf/closed/wall, -/area/medical/medbay/central) +/area/medical/storage) "bGR" = ( /obj/structure/table, /obj/item/storage/belt/medical{ @@ -35860,11 +35873,9 @@ /area/medical/medbay/central) "bGW" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers, /turf/closed/wall, -/area/medical/medbay/central) +/area/medical/storage) "bGX" = ( /obj/machinery/light{ dir = 8 @@ -37012,7 +37023,7 @@ dir = 9 }, /turf/closed/wall, -/area/medical/medbay/central) +/area/medical/storage) "bJB" = ( /obj/machinery/atmospherics/pipe/manifold4w/scrubbers, /turf/open/floor/plasteel, @@ -52309,7 +52320,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/science/robotics/mechbay) +/area/maintenance/department/medical/morgue) "cHF" = ( /obj/machinery/button/door{ id = "Skynet_launch"; @@ -54428,7 +54439,7 @@ "fvk" = ( /obj/structure/disposalpipe/segment, /turf/closed/wall, -/area/medical/medbay/central) +/area/medical/storage) "fvY" = ( /obj/machinery/computer/cryopod{ pixel_y = 26 @@ -55768,6 +55779,9 @@ req_access_txt = "45" }, /obj/machinery/door/firedoor, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, /area/medical/surgery) "iVJ" = ( @@ -60411,6 +60425,9 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engineering/atmos) +"tBV" = ( +/turf/closed/wall, +/area/medical/storage) "tCa" = ( /obj/structure/table/wood, /obj/item/instrument/guitar{ @@ -61009,8 +61026,17 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/machinery/power/apc{ + areastring = "/area/medical/storage"; + name = "Medbay Surgery Storage"; + pixel_x = 1; + pixel_y = -24 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, /turf/open/floor/plasteel/white, -/area/medical/medbay/central) +/area/medical/storage) "uFZ" = ( /obj/structure/closet/emcloset, /obj/effect/turf_decal/stripes/line{ @@ -61336,6 +61362,16 @@ /obj/structure/pool/Lboard, /turf/open/pool, /area/commons/fitness/pool) +"voZ" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/white, +/area/medical/storage) "vpY" = ( /obj/structure/closet/lasertag/blue, /obj/item/clothing/under/misc/pj/blue, @@ -95226,10 +95262,10 @@ aJq bHt bBz bzs -bof +tBV bFm bGI -bof +tBV cBD bKD bLO @@ -95483,7 +95519,7 @@ bwu kPj bBB eBX -bof +tBV bFp uFV fvk @@ -95740,7 +95776,7 @@ aJq bAj aJq aKG -bof +tBV bFo bDA bFt @@ -95997,9 +96033,9 @@ byX aXh bmE bCA -bof +tBV bCC -bDA +voZ bFx bGW bKI diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 8c382e56e8..19c8e68546 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -13232,7 +13232,7 @@ dir = 4 }, /turf/open/floor/plasteel, -/area/hallway/secondary/service) +/area/maintenance/port/fore) "aYA" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -33522,7 +33522,7 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/security/range) +/area/maintenance/starboard) "cqi" = ( /obj/structure/cable/white, /obj/effect/spawner/structure/window/reinforced, @@ -49101,7 +49101,7 @@ icon_state = "1-2" }, /turf/open/floor/plasteel, -/area/science/misc_lab) +/area/maintenance/port) "dhU" = ( /obj/structure/sign/nanotrasen, /turf/closed/wall/r_wall, @@ -71534,6 +71534,9 @@ }, /turf/open/floor/plasteel/dark, /area/command/heads_quarters/hos) +"emZ" = ( +/turf/closed/wall, +/area/hallway/primary/port) "enl" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/stripes/corner, @@ -106478,7 +106481,7 @@ dir = 1 }, /turf/open/floor/plasteel, -/area/commons/dorms) +/area/maintenance/starboard) "qtk" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb, @@ -156429,7 +156432,7 @@ pzz kRu iio aMN -alf +emZ bqm bsp bug @@ -156686,7 +156689,7 @@ vgS xnz iio aMO -alf +emZ bqn bsq buh @@ -156943,7 +156946,7 @@ lNq skw iio aMN -alf +emZ bqo bsr fzc diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 9b70a54282..f39dbc578d 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -25521,6 +25521,9 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/item/paicard{ + pixel_x = -8 + }, /turf/open/floor/plasteel/white, /area/science/research) "cav" = ( @@ -74083,7 +74086,7 @@ }, /obj/machinery/door/firedoor, /turf/open/floor/plating, -/area/science/circuit) +/area/maintenance/starboard/aft) "sFR" = ( /obj/structure/cable{ icon_state = "2-8" @@ -76385,7 +76388,7 @@ icon_state = "1-2" }, /turf/open/floor/plating, -/area/service/library) +/area/maintenance/port) "ubJ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable/yellow{ @@ -80256,7 +80259,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/commons/vacant_room/office) +/area/maintenance/port) "wxP" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 @@ -97479,8 +97482,8 @@ dne aip dne dne -dne -dne +aRA +aRA dne baf bbK