diff --git a/maps/map_files/golden_arrow/golden_arrow.dmm b/maps/map_files/golden_arrow/golden_arrow.dmm index f2f9a9a2e1..ed6306db1f 100644 --- a/maps/map_files/golden_arrow/golden_arrow.dmm +++ b/maps/map_files/golden_arrow/golden_arrow.dmm @@ -237,6 +237,9 @@ /obj/effect/landmark/late_join/alpha, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/cryo_cells) +"bl" = ( +/turf/closed/wall/almayer/outer, +/area/golden_arrow/firingrange) "bo" = ( /obj/structure/window/framed/almayer, /turf/open/floor/almayer{ @@ -678,9 +681,6 @@ icon_state = "plate" }, /area/golden_arrow/hangar) -"dD" = ( -/turf/closed/wall/almayer/outer, -/area/golden_arrow/firingrange) "dE" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/light{ @@ -738,6 +738,29 @@ icon_state = "sterile_green" }, /area/golden_arrow/medical) +"eh" = ( +/obj/structure/surface/rack, +/obj/item/ammo_magazine/rifle/m41aMK1{ + current_rounds = 0; + pixel_x = -5 + }, +/obj/item/ammo_magazine/rifle/m41aMK1{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/m41aMK1{ + current_rounds = 0; + pixel_x = 5 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/firingrange) +"ek" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/golden_arrow/firingrange) "eo" = ( /turf/open/floor/almayer{ icon_state = "cargo_arrow" @@ -968,14 +991,6 @@ icon_state = "plate" }, /area/golden_arrow/briefing) -"fz" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/firingrange) "fF" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -1223,15 +1238,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/hangar) -"hh" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/structure/surface/table/almayer, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/firingrange) "hk" = ( /obj/structure/machinery/camera/autoname/golden_arrow{ dir = 4; @@ -1298,6 +1304,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "S" }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -1335,6 +1342,9 @@ icon_state = "plate" }, /area/golden_arrow/engineering) +"hM" = ( +/turf/open/floor/plating/plating_catwalk, +/area/golden_arrow/firingrange) "hN" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/secure_data{ @@ -1344,6 +1354,17 @@ icon_state = "plate" }, /area/golden_arrow/platoon_sergeant) +"hQ" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/firingrange) "hR" = ( /obj/structure/machinery/firealarm{ pixel_y = 28 @@ -1642,6 +1663,7 @@ /obj/structure/machinery/light{ dir = 1 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -1811,16 +1833,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/hangar) -"kx" = ( -/obj/structure/barricade/metal{ - dir = 8 - }, -/obj/structure/machinery/light, -/obj/structure/sign/safety/two{ - pixel_y = -22 - }, -/turf/open/floor/almayer, -/area/golden_arrow/firingrange) "kB" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 8 @@ -1953,17 +1965,6 @@ }, /turf/open/floor/almayer, /area/golden_arrow/prep_hallway) -"lt" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/firingrange) "ly" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/manifold/hidden/supply, @@ -2009,12 +2010,6 @@ icon_state = "plate" }, /area/golden_arrow/engineering) -"lP" = ( -/obj/structure/surface/table/almayer, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/firingrange) "lQ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/firealarm{ @@ -2178,9 +2173,6 @@ icon_state = "test_floor4" }, /area/golden_arrow/squad_two) -"nc" = ( -/turf/open/floor/plating/plating_catwalk, -/area/golden_arrow/firingrange) "nd" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -2334,6 +2326,12 @@ icon_state = "plate" }, /area/golden_arrow/canteen) +"nL" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/firingrange) "nM" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/table/reinforced/almayer_B, @@ -2790,6 +2788,16 @@ icon_state = "plate" }, /area/golden_arrow/squad_two) +"qE" = ( +/obj/structure/barricade/metal{ + dir = 8 + }, +/obj/structure/machinery/light, +/obj/structure/sign/safety/two{ + pixel_y = -22 + }, +/turf/open/floor/almayer, +/area/golden_arrow/firingrange) "qI" = ( /obj/structure/machinery/landinglight/ds1/delayone{ dir = 8 @@ -2932,12 +2940,6 @@ icon_state = "plate" }, /area/golden_arrow/prep_hallway) -"rE" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/almayer, -/area/golden_arrow/prep_hallway) "rH" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -3161,6 +3163,25 @@ icon_state = "plate" }, /area/golden_arrow/platoon_commander_rooms) +"tb" = ( +/obj/structure/sign/safety/firingrange{ + pixel_x = -24; + pixel_y = 7 + }, +/obj/structure/sign/safety/hazard{ + pixel_y = -7; + pixel_x = -24 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/prep_hallway) +"tf" = ( +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/golden_arrow/firingrange) "ti" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -3215,18 +3236,6 @@ icon_state = "test_floor5" }, /area/golden_arrow/engineering) -"tH" = ( -/obj/structure/barricade/metal{ - dir = 8 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/sign/safety/one{ - pixel_y = 22 - }, -/turf/open/floor/almayer, -/area/golden_arrow/firingrange) "tS" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep{ @@ -3346,6 +3355,18 @@ icon_state = "plate" }, /area/golden_arrow/briefing) +"uE" = ( +/obj/structure/machinery/firealarm{ + pixel_y = 28 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/firingrange) "uF" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/crew/alt, @@ -3376,10 +3397,6 @@ icon_state = "plate" }, /area/golden_arrow/dorms) -"uK" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/plating/plating_catwalk, -/area/golden_arrow/firingrange) "uO" = ( /obj/structure/surface/table/almayer, /obj/item/device/flashlight/lamp{ @@ -3758,10 +3775,8 @@ icon_state = "test_floor4" }, /area/golden_arrow/platoon_sergeant) -"xc" = ( -/obj/structure/surface/rack, -/obj/item/tool/screwdriver, -/obj/item/prop/helmetgarb/gunoil, +"wX" = ( +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -3783,6 +3798,15 @@ icon_state = "plate" }, /area/golden_arrow/prep_hallway) +"xo" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "cargo_arrow" + }, +/area/golden_arrow/prep_hallway) "xx" = ( /obj/structure/machinery/light, /obj/structure/pipes/vents/scrubber, @@ -4181,6 +4205,16 @@ icon_state = "cargo_arrow" }, /area/golden_arrow/prep_hallway) +"zP" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/golden_arrow/firingrange) "zV" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/disposal, @@ -4451,6 +4485,19 @@ icon_state = "plate" }, /area/golden_arrow/squad_two) +"BC" = ( +/obj/structure/target, +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/golden_arrow/firingrange) +"BD" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/firingrange) "BM" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light{ @@ -4580,6 +4627,7 @@ /obj/structure/barricade/plasteel{ dir = 8 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -4872,12 +4920,6 @@ /obj/structure/surface/table/reinforced/almayer_B, /turf/open/floor/almayer, /area/golden_arrow/briefing) -"Ee" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/golden_arrow/firingrange) "Ei" = ( /obj/structure/machinery/space_heater, /turf/open/floor/almayer{ @@ -4997,6 +5039,13 @@ icon_state = "cargo_arrow" }, /area/golden_arrow/cryo_cells) +"EN" = ( +/obj/structure/barricade/metal{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer, +/area/golden_arrow/firingrange) "EO" = ( /obj/structure/machinery/disposal{ density = 0; @@ -5245,12 +5294,6 @@ icon_state = "plate" }, /area/golden_arrow/cryo_cells) -"Ga" = ( -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/golden_arrow/firingrange) "Gf" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/cameras/wooden_tv/prop{ @@ -5564,15 +5607,6 @@ icon_state = "test_floor5" }, /area/golden_arrow/engineering) -"Hy" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "cargo_arrow" - }, -/area/golden_arrow/prep_hallway) "HG" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -5601,12 +5635,6 @@ "HK" = ( /turf/closed/wall/almayer, /area/golden_arrow/cryo_cells) -"HL" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/firingrange) "HQ" = ( /obj/structure/machinery/light, /obj/effect/decal/cleanable/dirt, @@ -5663,6 +5691,12 @@ /obj/structure/barricade/metal{ dir = 8 }, +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/sign/safety/one{ + pixel_y = 22 + }, /turf/open/floor/almayer, /area/golden_arrow/firingrange) "Ii" = ( @@ -5730,6 +5764,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/squad_two) +"IH" = ( +/obj/structure/barricade/metal{ + dir = 8 + }, +/turf/open/floor/almayer, +/area/golden_arrow/firingrange) "IP" = ( /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/engineering) @@ -5813,16 +5853,6 @@ }, /turf/open/floor/almayer, /area/golden_arrow/prep_hallway) -"Jf" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Firing Range"; - req_one_access_txt = "8;12;40"; - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/golden_arrow/firingrange) "Jg" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/clipboard{ @@ -5947,30 +5977,10 @@ icon_state = "plate" }, /area/golden_arrow/hangar) -"Ka" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 28 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/firingrange) "Kb" = ( /obj/structure/surface/rack, -/obj/item/ammo_magazine/rifle/m41aMK1{ - current_rounds = 0; - pixel_x = -5 - }, -/obj/item/ammo_magazine/rifle/m41aMK1{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/m41aMK1{ - current_rounds = 0; - pixel_x = 5 - }, +/obj/item/tool/screwdriver, +/obj/item/prop/helmetgarb/gunoil, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -6076,6 +6086,15 @@ icon_state = "plate" }, /area/golden_arrow/dorms) +"KL" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/firingrange) "KM" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light, @@ -6419,6 +6438,15 @@ icon_state = "test_floor4" }, /area/golden_arrow/engineering) +"Mz" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/firingrange) "MB" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out" @@ -6989,6 +7017,14 @@ icon_state = "plate" }, /area/golden_arrow/squad_two) +"PI" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/golden_arrow/firingrange) "PL" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -7340,6 +7376,15 @@ icon_state = "plate" }, /area/golden_arrow/platoon_sergeant) +"Ri" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/golden_arrow/firingrange) "Rl" = ( /obj/structure/surface/table/almayer, /obj/item/tool/kitchen/tray{ @@ -7362,19 +7407,6 @@ icon_state = "dark_sterile" }, /area/golden_arrow/canteen) -"Rm" = ( -/obj/structure/sign/safety/firingrange{ - pixel_x = -24; - pixel_y = 7 - }, -/obj/structure/sign/safety/hazard{ - pixel_y = -7; - pixel_x = -24 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/golden_arrow/prep_hallway) "Rr" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, @@ -7666,6 +7698,7 @@ icon_state = "S" }, /obj/structure/target, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -8166,10 +8199,10 @@ }, /area/golden_arrow/hangar) "VG" = ( -/obj/structure/pipes/vents/pump{ - dir = 4 +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" }, -/turf/open/floor/plating/plating_catwalk, /area/golden_arrow/firingrange) "VJ" = ( /obj/structure/ladder{ @@ -8248,13 +8281,6 @@ icon_state = "plate" }, /area/golden_arrow/briefing) -"Wb" = ( -/obj/structure/target, -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/golden_arrow/firingrange) "Wf" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -8356,6 +8382,12 @@ icon_state = "plate" }, /area/golden_arrow/hangar) +"Wy" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor/almayer, +/area/golden_arrow/prep_hallway) "WA" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/power/apc/almayer{ @@ -8465,8 +8497,10 @@ /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/hangar) "Xu" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper Firing Range"; + req_one_access_txt = "8;12;40"; + dir = 2 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -8590,6 +8624,11 @@ icon_state = "plate" }, /area/golden_arrow/canteen) +"XV" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer, +/area/golden_arrow/prep_hallway) "Ya" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -8645,6 +8684,7 @@ icon_state = "N"; pixel_y = 1 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -8880,6 +8920,11 @@ icon_state = "test_floor4" }, /area/golden_arrow/canteen) +"ZQ" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/golden_arrow/firingrange) "ZR" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/chem_master, @@ -15704,13 +15749,13 @@ ot Qw Cr Cr -dD -dD -dD -dD -dD -dD -dD +bl +bl +bl +bl +bl +bl +bl Cr Cr Cr @@ -15856,13 +15901,13 @@ gd Qw Cr Cr -dD +bl Oy SE zv Hu -Ee -dD +ek +bl Cr Cr Cr @@ -16008,13 +16053,13 @@ gd Qw Cr Cr -dD -Ga +bl +VG hD zv -Yk -Ga -dD +zP +VG +bl Cr Cr Cr @@ -16160,13 +16205,13 @@ Me Qw Qw Qw -dD -Ga -hD +bl +VG +Ri zv Yk -Ga -dD +VG +bl Cr Cr Cr @@ -16315,10 +16360,10 @@ Me Me jt Jj -zv +BD Is -Wb -dD +BC +bl Cr Cr Cr @@ -16465,12 +16510,12 @@ Fg gd tS Me -Ga +VG hD zv -Yk -Ga -dD +zP +VG +bl Cr Cr Cr @@ -16622,7 +16667,7 @@ ce zv FK PS -dD +bl Cr Cr Cr @@ -16769,12 +16814,12 @@ Fy DR tS Me -tH Ib +EN Co -Ib -kx -dD +IH +qE +bl Cr Cr Cr @@ -16921,13 +16966,13 @@ sV Yp Db Me -VG -nc +tf +hM zv -nc -VG -dD -dD +hM +tf +bl +bl Cr Cr Cr @@ -17073,13 +17118,13 @@ Fg TT Me Of -lt -HL -uK -HL -fz -xc -dD +hQ +wX +ZQ +wX +KL +Kb +bl Cr Cr Cr @@ -17225,13 +17270,13 @@ cA RO Me Of -Ka -zv -hh -lP -zv -Kb -dD +uE +BD +Mz +nL +BD +eh +bl Cr Cr Cr @@ -17377,13 +17422,13 @@ Me Me Me Of +PI Xu -Jf Of Of -dD -dD -dD +bl +bl +bl Cr Cr Cr @@ -17523,13 +17568,13 @@ Wl uu WY iN +wp iN +wp iN -iN -iN -iN -Rm -Hy +wp +tb +xo RY iN oh @@ -17677,11 +17722,11 @@ so SO iK iK -SO -SO +XV +XV iK iK -rE +Wy Ad Op CA @@ -17827,15 +17872,15 @@ gq Va iL iN +wp iN iN iN -iN -iN -iN -pZ +wp +wp pZ -iN +ms +wp iN Ay Cr