From 63f84711eded561f65c59f986cbebbf472da809a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E6=9C=88=E7=8C=AB?= Date: Wed, 30 Jun 2021 21:46:24 -0400 Subject: [PATCH] Fixes some minor tramstation mapping issues (#59871) * Added heavy firedoors on the windows between toxins and the sci hallways * Fixed air alarm placement in science * added missing air alarms in engineering * kitchen freezer now has the proper area * sec point near arrivals had no air alarm * added missing air alarms in security * added missing air alarms in science * added missing air alarm in escape hallway * removed redundant air alarm * added APC in kitchen --- _maps/map_files/tramstation/tramstation.dmm | 111 +++++++++++++------- 1 file changed, 73 insertions(+), 38 deletions(-) diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 8005ecccc12..650b2e538f5 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -432,7 +432,7 @@ "abv" = ( /obj/machinery/icecream_vat, /turf/open/floor/iron/showroomfloor, -/area/service/kitchen) +/area/service/kitchen/coldroom) "abx" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 @@ -778,7 +778,7 @@ /obj/structure/closet/secure_closet/freezer/meat, /obj/structure/kitchenspike, /turf/open/floor/iron/showroomfloor, -/area/service/kitchen) +/area/service/kitchen/coldroom) "acL" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 8 @@ -842,7 +842,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/structure/closet/secure_closet/freezer/meat, /turf/open/floor/iron/showroomfloor, -/area/service/kitchen) +/area/service/kitchen/coldroom) "acY" = ( /obj/structure/table, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -974,7 +974,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/duct, /turf/open/floor/iron, -/area/service/kitchen) +/area/service/kitchen/coldroom) "adr" = ( /obj/machinery/door/airlock/maintenance_hatch{ req_one_access_txt = "12" @@ -4498,7 +4498,7 @@ /obj/structure/cable, /obj/machinery/power/apc/auto_name/south, /turf/open/floor/iron/showroomfloor, -/area/service/kitchen) +/area/service/kitchen/coldroom) "aps" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/west, @@ -5644,6 +5644,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/item/radio/intercom/directional/west, +/obj/machinery/airalarm/directional/north, /turf/open/floor/iron, /area/security/checkpoint) "ass" = ( @@ -6218,7 +6219,7 @@ "atV" = ( /obj/machinery/vending/wardrobe/chef_wardrobe, /turf/open/floor/iron/showroomfloor, -/area/service/kitchen) +/area/service/kitchen/coldroom) "atZ" = ( /obj/structure/chair/pew/left{ dir = 4 @@ -6405,7 +6406,7 @@ /area/hallway/secondary/entry) "auC" = ( /turf/open/floor/iron/showroomfloor, -/area/service/kitchen) +/area/service/kitchen/coldroom) "auD" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron, @@ -7148,6 +7149,7 @@ dir = 5 }, /obj/structure/extinguisher_cabinet/directional/north, +/obj/machinery/airalarm/directional/east, /turf/open/floor/iron, /area/engineering/break_room) "awX" = ( @@ -11045,7 +11047,7 @@ "aKQ" = ( /obj/machinery/gibber, /turf/open/floor/iron/showroomfloor, -/area/service/kitchen) +/area/service/kitchen/coldroom) "aKU" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -12645,7 +12647,7 @@ "aUO" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/showroomfloor, -/area/service/kitchen) +/area/service/kitchen/coldroom) "aUV" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 1 @@ -12868,6 +12870,8 @@ "aWx" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/effect/turf_decal/delivery, +/obj/machinery/power/apc/auto_name/north, +/obj/structure/cable, /turf/open/floor/iron/white, /area/service/kitchen) "aWC" = ( @@ -12959,7 +12963,7 @@ "aXK" = ( /obj/structure/kitchenspike, /turf/open/floor/iron/showroomfloor, -/area/service/kitchen) +/area/service/kitchen/coldroom) "aXN" = ( /obj/machinery/light/small/directional/south, /obj/machinery/button/door/directional/east{ @@ -15484,6 +15488,7 @@ /obj/item/mmi, /obj/item/mmi, /obj/item/mmi, +/obj/machinery/airalarm/directional/south, /turf/open/floor/iron, /area/science/robotics/lab) "bPs" = ( @@ -17659,7 +17664,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, -/obj/machinery/airalarm/directional/north, /turf/open/floor/iron/dark, /area/security/interrogation) "cJH" = ( @@ -18385,6 +18389,7 @@ /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 6 }, +/obj/machinery/airalarm/directional/south, /turf/open/floor/iron, /area/hallway/secondary/construction/engineering) "cXQ" = ( @@ -19163,7 +19168,7 @@ }, /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/showroomfloor, -/area/service/kitchen) +/area/service/kitchen/coldroom) "doC" = ( /obj/effect/turf_decal/trimline/white/filled/line, /turf/open/floor/iron/dark, @@ -21242,6 +21247,7 @@ "ebe" = ( /obj/structure/table, /obj/item/ai_module/reset, +/obj/machinery/airalarm/directional/north, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) "ebt" = ( @@ -23583,7 +23589,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/duct, /turf/open/floor/iron/showroomfloor, -/area/service/kitchen) +/area/service/kitchen/coldroom) "eZa" = ( /obj/structure/closet/firecloset, /obj/effect/decal/cleanable/dirt, @@ -26186,6 +26192,11 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/cargo/office) +"fYk" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/firedoor/heavy, +/turf/open/floor/plating, +/area/science/research) "fYq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, /turf/closed/wall/r_wall, @@ -28284,7 +28295,7 @@ "gQi" = ( /obj/machinery/duct, /turf/open/floor/iron/showroomfloor, -/area/service/kitchen) +/area/service/kitchen/coldroom) "gQo" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/gross_decal_spawner, @@ -30433,7 +30444,7 @@ dir = 9 }, /turf/open/floor/iron/showroomfloor, -/area/service/kitchen) +/area/service/kitchen/coldroom) "hGh" = ( /turf/closed/wall, /area/science/robotics/mechbay) @@ -34467,6 +34478,7 @@ dir = 9 }, /obj/effect/turf_decal/trimline/purple/filled/line, +/obj/machinery/airalarm/directional/south, /turf/open/floor/iron/white, /area/science/xenobiology) "jjN" = ( @@ -35888,6 +35900,7 @@ name = "Security Requests Console" }, /obj/machinery/light/directional/north, +/obj/machinery/airalarm/directional/north, /turf/open/floor/iron/showroomfloor, /area/security/warden) "jNk" = ( @@ -35942,7 +35955,7 @@ name = "Pete" }, /turf/open/floor/iron/showroomfloor, -/area/service/kitchen) +/area/service/kitchen/coldroom) "jOk" = ( /obj/machinery/door/airlock/public/glass{ name = "Escape Wing" @@ -36545,6 +36558,9 @@ }, /turf/open/floor/iron, /area/ai_monitored/security/armory) +"jZY" = ( +/turf/closed/wall, +/area/service/kitchen/coldroom) "jZZ" = ( /obj/effect/turf_decal/trimline/neutral/filled/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ @@ -37186,6 +37202,17 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/command/nuke_storage) +"kkp" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron/white, +/area/science/research) "kkw" = ( /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/virology{ @@ -43939,7 +43966,7 @@ }, /obj/machinery/duct, /turf/open/floor/iron/showroomfloor, -/area/service/kitchen) +/area/service/kitchen/coldroom) "mQb" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -45792,7 +45819,7 @@ }, /obj/effect/turf_decal/trimline/purple/filled/line, /obj/structure/cable, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor/heavy, /turf/open/floor/iron/white, /area/science/research) "nGc" = ( @@ -48732,6 +48759,7 @@ id = "cytologylockdown"; name = "Cytology Lockdown" }, +/obj/machinery/airalarm/directional/south, /turf/open/floor/iron/white, /area/science/cytology) "oNe" = ( @@ -50808,7 +50836,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor/heavy, /turf/open/floor/iron, /area/science/mixing) "pCt" = ( @@ -55087,6 +55115,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, +/obj/machinery/airalarm/directional/east, /turf/open/floor/carpet, /area/command/heads_quarters/hos) "roW" = ( @@ -58111,8 +58140,8 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/obj/machinery/door/firedoor/heavy, /turf/open/floor/iron, /area/science/mixing) "svV" = ( @@ -59073,7 +59102,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 8 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor/heavy, /turf/open/floor/iron, /area/science/mixing) "sSU" = ( @@ -62373,7 +62402,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/duct, /turf/open/floor/iron/showroomfloor, -/area/service/kitchen) +/area/service/kitchen/coldroom) "tZl" = ( /obj/effect/turf_decal/arrows/red{ pixel_y = 15 @@ -66052,6 +66081,13 @@ }, /turf/open/floor/iron, /area/hallway/secondary/construction/engineering) +"vBv" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron, +/area/hallway/secondary/exit) "vBA" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -72952,7 +72988,6 @@ name = "Research Requests Console"; receive_ore_updates = 1 }, -/obj/machinery/airalarm/directional/north, /turf/open/floor/iron/white, /area/science/lab) "xXC" = ( @@ -114912,7 +114947,7 @@ hmN hmN vXT ecX -ecX +kkp ecX tSp der @@ -117222,9 +117257,9 @@ der der der der -lar +fYk nFJ -lar +fYk der der der @@ -160104,10 +160139,10 @@ sUz nqs qxK amK -aGY +jZY adp -aGY -aGY +jZY +jZY ayP vRt ltP @@ -160364,7 +160399,7 @@ amK acK gQi aXK -aGY +jZY aBQ msi aTJ @@ -160621,7 +160656,7 @@ acw aUO mQa apq -aGY +jZY ltD hmf aEU @@ -161135,7 +161170,7 @@ amK acW hFl auC -aGY +jZY wzb fAF anI @@ -161392,7 +161427,7 @@ amK abv atV aKQ -aGY +jZY aiT jGO wDL @@ -161646,10 +161681,10 @@ ssw vFb azY amK -aGY -aGY -aGY -aGY +jZY +jZY +jZY +jZY afA qVG tzb @@ -185056,7 +185091,7 @@ vNK ooX aEQ kkf -xNV +vBv xNV the abm