From 453ed482cb790621e178d4180ce3ac812d2127d5 Mon Sep 17 00:00:00 2001 From: Bobby Date: Fri, 10 Nov 2023 13:04:54 +0000 Subject: [PATCH] s --- maps/map_files/USS_Almayer/USS_Almayer.dmm | 419 +++++++++++---------- 1 file changed, 220 insertions(+), 199 deletions(-) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index bdeeb0babb4b..7b9e027c1686 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -13498,6 +13498,15 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south2) +"aYH" = ( +/obj/structure/machinery/door/airlock/almayer/secure/reinforced{ + name = "\improper Armourer's Workshop"; + req_access = null + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hull/upper_hull/u_m_s) "aYI" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /obj/structure/disposalpipe/segment{ @@ -22576,35 +22585,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/offices) -"bQW" = ( -/obj/structure/surface/rack, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0; - pixel_x = -6; - pixel_y = 7 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0; - pixel_x = -6; - pixel_y = -3 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0; - pixel_x = 5; - pixel_y = 9 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0; - pixel_x = 5; - pixel_y = -3 - }, -/obj/structure/noticeboard{ - pixel_y = 29 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "bQX" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin/uscm, @@ -28911,12 +28891,6 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_f_p) -"cVq" = ( -/obj/structure/largecrate/supply/weapons/pistols, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "cVs" = ( /obj/structure/platform_decoration{ dir = 8 @@ -31146,67 +31120,23 @@ icon_state = "silver" }, /area/almayer/hallways/aft_hallway) -"dMB" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "plating_striped" - }, -/area/almayer/living/cryo_cells) -"dMH" = ( +"dMk" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 +/obj/structure/closet/secure_closet/guncabinet, +/obj/item/weapon/gun/rifle/l42a, +/obj/item/weapon/gun/rifle/l42a{ + pixel_y = 6 }, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_m_s) +"dMB" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "plating_striped" + }, +/area/almayer/living/cryo_cells) "dMK" = ( /turf/closed/wall/almayer/research/containment/wall/corner{ dir = 8 @@ -33652,6 +33582,16 @@ icon_state = "outerhull_dir" }, /area/almayer/command/lifeboat) +"eJW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/toolbox/mechanical{ + pixel_x = 4; + pixel_y = -3 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "eJX" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/ce_room) @@ -34630,19 +34570,6 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) -"fgc" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/secure_closet/guncabinet, -/obj/item/weapon/gun/smg/m39{ - pixel_y = 6 - }, -/obj/item/weapon/gun/smg/m39{ - pixel_y = -6 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "fgh" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -35368,6 +35295,20 @@ icon_state = "plate" }, /area/almayer/living/starboard_garden) +"fwS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/largecrate/supply/weapons/m39{ + pixel_x = 2 + }, +/obj/structure/largecrate/supply/weapons/m41a{ + layer = 3.1; + pixel_x = 6; + pixel_y = 17 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "fwY" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -37468,6 +37409,11 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) +"gtd" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/weldingtool, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_m_s) "gtp" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /obj/structure/disposalpipe/junction{ @@ -40569,6 +40515,36 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) +"hHD" = ( +/obj/structure/surface/rack, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0; + pixel_x = -6; + pixel_y = 7 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0; + pixel_x = -6; + pixel_y = -3 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0; + pixel_x = 5; + pixel_y = 9 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0; + pixel_x = 5; + pixel_y = -3 + }, +/obj/structure/noticeboard{ + desc = "The note is haphazardly attached to the cork board by what looks like a bent firing pin. 'The order has come in to perform end of life service checks on all L42A service rifles, any that are defective are to be dis-assembled and packed into a crate and sent to to the cargo hold. L42A service rifles that are in working order after servicing, are to be locked in secure cabinets ready to be off-loaded at Chinook. Scheduled end of life service for the L42A - Complete'"; + pixel_y = 29 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "hHJ" = ( /obj/structure/machinery/door/poddoor/shutters/almayer/open{ id = "vehicle1door"; @@ -43054,6 +43030,15 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/starboard) +"iKe" = ( +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "iKf" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -49217,14 +49202,6 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) -"loi" = ( -/obj/structure/closet/secure_closet/guncabinet, -/obj/item/weapon/gun/rifle/l42a, -/obj/item/weapon/gun/rifle/l42a{ - pixel_y = 6 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_m_s) "lok" = ( /obj/structure/machinery/cm_vending/clothing/marine/charlie{ density = 0; @@ -50643,6 +50620,17 @@ icon_state = "test_floor4" }, /area/almayer/medical/medical_science) +"lPA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/guncabinet, +/obj/item/weapon/gun/rifle/m41a{ + pixel_y = 6 + }, +/obj/item/weapon/gun/rifle/m41a, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "lPB" = ( /obj/structure/surface/table/almayer, /obj/item/device/lightreplacer, @@ -53310,6 +53298,18 @@ icon_state = "blue" }, /area/almayer/hallways/port_hallway) +"mYz" = ( +/obj/structure/closet/secure_closet/guncabinet, +/obj/item/weapon/gun/smg/m39{ + pixel_y = 6 + }, +/obj/item/weapon/gun/smg/m39{ + pixel_y = -6 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "mYY" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -54707,11 +54707,6 @@ icon_state = "orange" }, /area/almayer/squads/bravo) -"nCJ" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/weldingtool, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_m_s) "nCT" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -57834,6 +57829,19 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) +"oRY" = ( +/obj/structure/closet/secure_closet/guncabinet, +/obj/item/weapon/gun/rifle/l42a{ + pixel_y = 6 + }, +/obj/item/weapon/gun/rifle/l42a, +/obj/item/weapon/gun/rifle/l42a{ + pixel_y = -6 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "oRZ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -58170,6 +58178,10 @@ icon_state = "plate" }, /area/almayer/command/cic) +"pby" = ( +/obj/structure/largecrate/supply/weapons/pistols, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_m_s) "pbC" = ( /obj/item/bedsheet/red, /obj/structure/bed, @@ -58446,13 +58458,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"phX" = ( -/obj/structure/surface/table/almayer, -/obj/item/weapon/gun/rifle/m41a, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "piO" = ( /obj/structure/surface/rack, /obj/item/tool/weldingtool, @@ -58965,6 +58970,12 @@ icon_state = "redcorner" }, /area/almayer/shipboard/starboard_missiles) +"pwj" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_m_s) "pwt" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = -25 @@ -61690,6 +61701,61 @@ icon_state = "mono" }, /area/almayer/engineering/ce_room) +"qAR" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/obj/structure/closet/crate, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_m_s) "qAT" = ( /obj/structure/machinery/light, /obj/structure/surface/table/almayer, @@ -61852,17 +61918,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/processing) -"qEC" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/secure_closet/guncabinet, -/obj/item/weapon/gun/rifle/m41a{ - pixel_y = 6 - }, -/obj/item/weapon/gun/rifle/m41a, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "qEW" = ( /obj/structure/sign/poster/ad{ pixel_x = 30 @@ -66600,15 +66655,6 @@ icon_state = "cargo" }, /area/almayer/shipboard/starboard_missiles) -"sFg" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "sFh" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -67727,10 +67773,8 @@ /obj/structure/machinery/light/small{ dir = 1 }, -/obj/structure/closet/secure_closet/guncabinet, -/obj/item/weapon/gun/rifle/l42a, -/obj/item/weapon/gun/rifle/l42a{ - pixel_y = 6 +/obj/structure/largecrate/random/secure{ + pixel_x = -5 }, /turf/open/floor/almayer{ icon_state = "plate" @@ -68875,10 +68919,6 @@ /area/almayer/medical/lower_medical_medbay) "tAV" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/storage/toolbox/mechanical{ - pixel_x = -6; - pixel_y = 16 - }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_m_s) "tBq" = ( @@ -69496,13 +69536,8 @@ }, /area/almayer/hallways/port_hallway) "tQE" = ( -/obj/structure/closet/secure_closet/guncabinet, -/obj/item/weapon/gun/rifle/l42a{ - pixel_y = 6 - }, -/obj/item/weapon/gun/rifle/l42a, -/obj/item/weapon/gun/rifle/l42a{ - pixel_y = -6 +/obj/item/storage/toolbox/mechanical{ + pixel_y = 13 }, /turf/open/floor/almayer{ icon_state = "plate" @@ -71671,10 +71706,11 @@ /area/almayer/hull/lower_hull/l_m_s) "uGz" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/largecrate/supply/weapons/m41a, -/obj/item/storage/toolbox/mechanical{ - pixel_y = 13 +/obj/structure/closet/secure_closet/guncabinet, +/obj/item/weapon/gun/rifle/l42a{ + pixel_y = 6 }, +/obj/item/weapon/gun/rifle/l42a, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -74602,13 +74638,6 @@ "vOy" = ( /turf/closed/wall/almayer/white/reinforced, /area/almayer/medical/medical_science) -"vOD" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/largecrate/supply/weapons/m39, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/upper_hull/u_m_s) "vOP" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -75932,6 +75961,13 @@ icon_state = "red" }, /area/almayer/shipboard/brig/chief_mp_office) +"wlz" = ( +/obj/structure/surface/table/almayer, +/obj/item/weapon/gun/rifle/m41a, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_s) "wlE" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -76335,15 +76371,6 @@ icon_state = "cargo" }, /area/almayer/squads/bravo) -"wuD" = ( -/obj/structure/machinery/door/airlock/almayer/secure/reinforced{ - name = "\improper Armourer's Workshop"; - req_access = null - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hull/upper_hull/u_m_s) "wuH" = ( /obj/structure/closet/crate/freezer, /obj/item/reagent_container/food/snacks/sliceable/pizza/vegetablepizza, @@ -76597,12 +76624,6 @@ }, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_p) -"wAE" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hull/upper_hull/u_m_s) "wAR" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -118144,7 +118165,7 @@ abg caF aar aar -wuD +aYH aar aar ael @@ -118549,9 +118570,9 @@ acO aJs cbN aar -fgc +fwS aap -sFg +iKe vFb ael afH @@ -118955,10 +118976,10 @@ acP bUE qFQ aar -bQW +hHD aap aao -qEC +lPA ael afJ agY @@ -119158,10 +119179,10 @@ acG abx caF aar -loi +pby aap aao -qEC +lPA ael afK ahc @@ -119564,7 +119585,7 @@ acG abx caF aar -wuD +aYH aar aar aar @@ -119770,7 +119791,7 @@ aar aao aao uGz -vOD +dMk adO afM fpR @@ -119970,10 +119991,10 @@ jSY abx hTy aar -wFm +qAR aao aao -dMH +eJW adO afN ahh @@ -120173,10 +120194,10 @@ acP bUE qFQ aar -nCJ -wAE +gtd +pwj aao -fZF +oRY adO afO ahh @@ -120377,9 +120398,9 @@ abg ccf aar tDA -phX +wlz aap -cVq +mYz adO jkj ahh