From 5cec6b95eb52ae4519ac2aee1af150b88da35172 Mon Sep 17 00:00:00 2001 From: Morrow Date: Sun, 22 Oct 2023 16:29:24 -0400 Subject: [PATCH] fixes and touch ups --- maps/map_files/golden_arrow/golden_arrow.dmm | 163 +++++++++---------- 1 file changed, 73 insertions(+), 90 deletions(-) diff --git a/maps/map_files/golden_arrow/golden_arrow.dmm b/maps/map_files/golden_arrow/golden_arrow.dmm index 7f137ce9e3..08b869e59d 100644 --- a/maps/map_files/golden_arrow/golden_arrow.dmm +++ b/maps/map_files/golden_arrow/golden_arrow.dmm @@ -30,9 +30,6 @@ }, /area/almayer/hallways/hangar) "an" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 - }, /obj/structure/machinery/power/terminal{ dir = 8 }, @@ -112,7 +109,9 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha/squad_one) "aK" = ( -/obj/structure/closet/secure_closet/engineering_electrical, +/obj/structure/closet/secure_closet/engineering_electrical{ + req_one_access = list() + }, /turf/open/floor/almayer{ icon_state = "test_floor5" }, @@ -688,9 +687,6 @@ }, /area/almayer/engineering) "em" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 - }, /obj/effect/decal/warning_stripes{ icon_state = "N"; pixel_y = 2 @@ -778,12 +774,6 @@ }, /area/almayer/hallways/hangar) "eZ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 - }, -/obj/item/frame/light_fixture{ - pixel_y = 10 - }, /obj/effect/decal/warning_stripes{ icon_state = "S" }, @@ -943,7 +933,7 @@ /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/airlock/almayer/generic{ dir = 1; - name = "\improper Requisitions Bay" + name = "\improper Supply Bay" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -967,10 +957,13 @@ }, /area/almayer/medical) "ga" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 1 +/obj/structure/machinery/door/airlock/almayer/engineering/reinforced{ + req_one_access = list(); + name = "\improper Engineering Airlock" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, -/turf/open/floor/almayer, /area/almayer/engineering) "gd" = ( /turf/open/floor/almayer{ @@ -1038,7 +1031,8 @@ "gC" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor/autoname{ dir = 1; - req_one_access = list(8,19,7) + req_one_access = list(); + autoname = 0 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -1314,7 +1308,9 @@ }, /area/almayer/living/cryo_cells) "iv" = ( -/obj/structure/closet/secure_closet/engineering_welding, +/obj/structure/closet/secure_closet/engineering_welding{ + req_one_access = list() + }, /obj/structure/machinery/light{ dir = 1 }, @@ -1400,10 +1396,10 @@ }, /area/almayer/hallways/port_hallway) "iO" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, /obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, /turf/open/floor/almayer, /area/almayer/engineering) "iR" = ( @@ -1482,7 +1478,9 @@ }, /area/almayer/hallways/hangar) "jp" = ( -/obj/structure/closet/secure_closet/engineering_electrical, +/obj/structure/closet/secure_closet/engineering_electrical{ + req_one_access = list() + }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering) "js" = ( @@ -1877,13 +1875,14 @@ /turf/open/floor/almayer, /area/almayer/hallways/hangar) "mo" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, /obj/effect/decal/warning_stripes{ - icon_state = "S" + icon_state = "W" }, -/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -1897,9 +1896,6 @@ }, /area/almayer/hallways/port_hallway) "mw" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 - }, /obj/structure/machinery/power/terminal{ dir = 8 }, @@ -2499,7 +2495,6 @@ }, /area/almayer/living/cryo_cells) "qr" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, /obj/effect/decal/warning_stripes{ icon_state = "N"; pixel_y = 2 @@ -2509,6 +2504,9 @@ pixel_x = -7; pixel_y = 6 }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 + }, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -2557,7 +2555,6 @@ }, /area/almayer/squads/alpha/squad_two) "qE" = ( -/obj/structure/pipes/vents/scrubber, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -2893,9 +2890,6 @@ }, /area/almayer/hallways/starboard_hallway) "sL" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 - }, /obj/effect/decal/warning_stripes{ icon_state = "N"; pixel_y = 2 @@ -2905,6 +2899,9 @@ pixel_y = 7 }, /obj/item/tool/warning_cone, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 + }, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -3433,6 +3430,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "W" }, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering) "wI" = ( @@ -3653,7 +3651,8 @@ /area/almayer/living/grunt_rnr) "yp" = ( /obj/structure/machinery/door/airlock/almayer/engineering/reinforced{ - req_one_access = list(8,19,7) + req_one_access = list(); + name = "\improper Engineering Airlock" }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 8 @@ -3698,17 +3697,6 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) -"yy" = ( -/obj/structure/pipes/vents/scrubber, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/engineering) "yA" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/secure_closet/squad_sergeant{ @@ -4919,9 +4907,6 @@ /turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) "Fv" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 - }, /obj/effect/decal/warning_stripes{ icon_state = "S" }, @@ -4929,6 +4914,9 @@ icon_state = "N"; pixel_y = 2 }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 + }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering) "Fw" = ( @@ -5159,7 +5147,8 @@ "Gl" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor/autoname{ dir = 1; - req_one_access = list(8,19,7) + req_one_access = list(); + autoname = 0 }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 8 @@ -5742,7 +5731,6 @@ }, /area/almayer/squads/alpha/platoon_sergeant) "Ko" = ( -/obj/structure/pipes/vents/scrubber, /obj/effect/decal/warning_stripes{ icon_state = "S" }, @@ -5755,6 +5743,9 @@ pixel_x = -1; pixel_y = 2 }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -5816,7 +5807,9 @@ /turf/open/floor/almayer, /area/almayer/hallways/hangar) "KJ" = ( -/obj/structure/closet/secure_closet/engineering_welding, +/obj/structure/closet/secure_closet/engineering_welding{ + req_one_access = list() + }, /turf/open/floor/almayer{ icon_state = "test_floor5" }, @@ -5951,9 +5944,6 @@ /turf/open/floor/almayer, /area/almayer/hallways/hangar) "Lq" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 - }, /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; pixel_x = 1; @@ -5964,6 +5954,7 @@ pixel_x = -1; pixel_y = 2 }, +/obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -6254,9 +6245,6 @@ }, /area/almayer/engineering) "NH" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 - }, /obj/structure/machinery/power/terminal{ dir = 8 }, @@ -6550,7 +6538,9 @@ /area/almayer/hallways/hangar) "Pv" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/cm_vending/sorted/tech/tool_storage, +/obj/structure/machinery/cm_vending/sorted/tech/tool_storage{ + req_one_access = list() + }, /obj/structure/machinery/light, /turf/open/floor/almayer{ icon_state = "plate" @@ -6607,7 +6597,11 @@ "PJ" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor{ name = "Damage Control Locker"; - req_one_access = list(8,19,7) + req_one_access = list() + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor{ + name = "\improper Damage Control Locker"; + req_one_access = list() }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -6628,10 +6622,12 @@ }, /area/almayer/squads/alpha/platoon_sergeant) "PR" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, /obj/effect/decal/warning_stripes{ icon_state = "S" }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, /turf/open/floor/almayer, /area/almayer/engineering) "PW" = ( @@ -7464,7 +7460,7 @@ }, /obj/structure/machinery/door/airlock/almayer/generic{ dir = 1; - name = "\improper Requisitions Bay" + name = "\improper Supply Office" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -7707,18 +7703,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) -"VJ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/engineering) "VK" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/secure_closet/smartgunner{ @@ -7906,9 +7890,6 @@ icon_state = "plating" }, /area/almayer/engineering) -"WT" = ( -/turf/open/space/basic, -/area/almayer/medical/lockerroom) "WV" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ dir = 4; @@ -7967,9 +7948,6 @@ }, /area/almayer/engineering) "Xo" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 - }, /obj/effect/decal/warning_stripes{ icon_state = "N"; pixel_y = 2 @@ -7978,6 +7956,9 @@ pixel_x = -8; pixel_y = 8 }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 + }, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -8293,7 +8274,9 @@ }, /area/almayer/squads/alpha/squad_two) "Zm" = ( -/obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, +/obj/structure/machinery/cm_vending/sorted/tech/electronics_storage{ + req_one_access = list() + }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering) "Zw" = ( @@ -14254,7 +14237,7 @@ Cr Cr Cr Cr -WT +Cr Cr Cr Cr @@ -21537,7 +21520,7 @@ uE UB Tt iO -ga +SQ OQ vr Cr @@ -22903,7 +22886,7 @@ BV cw OF mI -OF +mo Lq ES lL @@ -23203,8 +23186,8 @@ YV Zw ZX BN -yy -mo +dj +KB an NH mw @@ -23356,7 +23339,7 @@ Zw ZX NF dj -VJ +MT Av Vm uY @@ -23508,7 +23491,7 @@ Zw ZX NF dj -VJ +MT uQ wi uQ @@ -23660,7 +23643,7 @@ Zw ZX ZX ZX -yp +ga ZX ZX ZX