From d5dd357f407163849c48b0fbe5c2e92675ac6450 Mon Sep 17 00:00:00 2001 From: HeresKozmos <31109792+HeresKozmos@users.noreply.github.com> Date: Tue, 19 Sep 2023 19:03:19 +0100 Subject: [PATCH] Adds a commissary to the hangar. --- maps/map_files/USS_Almayer/USS_Almayer.dmm | 435 ++++++++++----------- 1 file changed, 198 insertions(+), 237 deletions(-) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index eb05927b5f18..cd6007fbf837 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -5003,15 +5003,8 @@ }, /area/almayer/command/telecomms) "aqc" = ( -/obj/structure/machinery/door_control{ - id = "panicroomback"; - name = "\improper Safe Room"; - pixel_x = -25; - req_one_access_txt = "3" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, +/obj/structure/sign/nosmoking_2, +/turf/closed/wall/almayer, /area/almayer/hull/lower_hull/l_f_s) "aqd" = ( /obj/structure/disposalpipe/trunk{ @@ -11636,14 +11629,13 @@ /turf/closed/wall/almayer, /area/almayer/living/chapel) "aNj" = ( -/obj/structure/bed/chair/office/dark, /obj/structure/machinery/light{ dir = 1 }, -/obj/structure/sign/safety/terminal{ - pixel_x = 8; - pixel_y = 32 +/obj/structure/machinery/computer/card{ + dir = 8 }, +/obj/structure/surface/table/reinforced/almayer_B, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -11689,6 +11681,7 @@ pixel_y = 24; req_access_txt = "4" }, +/obj/structure/bed/chair/office/dark, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -17240,6 +17233,7 @@ "bpW" = ( /obj/structure/surface/table/almayer, /obj/effect/spawner/random/technology_scanner, +/obj/effect/decal/cleanable/ash, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -34016,10 +34010,9 @@ /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering/port) "eNx" = ( -/obj/structure/machinery/vending/snack, -/turf/open/floor/almayer{ - icon_state = "plate" - }, +/obj/structure/machinery/vending/cigarette, +/obj/effect/decal/cleanable/ash, +/turf/open/floor/wood, /area/almayer/hull/lower_hull/l_f_s) "eNI" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -35990,15 +35983,8 @@ }, /area/almayer/hull/upper_hull/u_f_p) "fGY" = ( -/obj/structure/machinery/door_control{ - id = "panicroomback"; - name = "\improper Safe Room"; - pixel_x = 25; - req_one_access_txt = "3" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, +/obj/structure/bed/chair, +/turf/open/floor/wood, /area/almayer/hull/lower_hull/l_f_s) "fHc" = ( /obj/structure/surface/table/almayer, @@ -36112,6 +36098,12 @@ icon_state = "emeraldfull" }, /area/almayer/living/briefing) +"fJg" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/wood, +/area/almayer/hull/lower_hull/l_f_s) "fJm" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -39051,16 +39043,6 @@ icon_state = "redfull" }, /area/almayer/living/offices/flight) -"gYB" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "Saferoom Channel"; - pixel_x = 27 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull/l_f_s) "gYS" = ( /obj/structure/prop/invuln/overhead_pipe{ dir = 4; @@ -39340,15 +39322,13 @@ }, /area/almayer/squads/req) "hdR" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 4; - id = "OfficeSafeRoom"; - name = "\improper Office Safe Room" - }, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/machinery/light{ + dir = 8 }, +/obj/structure/surface/table/almayer, +/obj/item/ashtray/glass, +/obj/item/trash/cigbutt, +/turf/open/floor/wood, /area/almayer/hull/lower_hull/l_f_s) "hec" = ( /turf/open/floor/almayer{ @@ -40674,11 +40654,13 @@ }, /area/almayer/hallways/aft_hallway) "hJz" = ( -/obj/structure/sign/safety/restrictedarea, -/obj/structure/sign/safety/security{ - pixel_x = 15 +/obj/structure/machinery/light/small{ + dir = 1 }, -/turf/closed/wall/almayer, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_s) "hJJ" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -43114,12 +43096,8 @@ /obj/structure/machinery/light{ dir = 8 }, -/obj/structure/bed/chair{ - dir = 16 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, +/obj/structure/machinery/vending/walkman, +/turf/open/floor/wood, /area/almayer/hull/lower_hull/l_f_s) "iOh" = ( /obj/structure/machinery/light/small, @@ -45360,11 +45338,9 @@ }, /area/almayer/hull/lower_hull/l_f_p) "jNt" = ( -/obj/structure/surface/rack, -/obj/item/stack/folding_barricade/three, -/turf/open/floor/almayer{ - icon_state = "plate" - }, +/obj/structure/flora/pottedplant, +/obj/structure/window/reinforced, +/turf/open/floor/wood, /area/almayer/hull/lower_hull/l_f_s) "jOi" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -46087,25 +46063,8 @@ }, /area/almayer/engineering/laundry) "kdt" = ( -/obj/structure/machinery/door_control{ - id = "OuterShutter"; - name = "Outer Shutter"; - pixel_x = 5; - pixel_y = -2; - req_one_access_txt = "1;3" - }, -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/door_control{ - id = "OfficeSafeRoom"; - name = "Office Safe Room"; - pixel_x = 5; - pixel_y = 5; - req_one_access_txt = "1;3" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull/l_f_s) +/turf/closed/wall/almayer, +/area/almayer/hull) "kdB" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -48131,13 +48090,11 @@ }, /area/almayer/medical/medical_science) "kXJ" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/computer/secure_data{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-j2" }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_s) "kXK" = ( /obj/structure/machinery/light, @@ -48156,13 +48113,9 @@ }, /area/almayer/engineering/laundry) "kYa" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 2; - id = "OuterShutter"; - name = "\improper Saferoom Shutters" - }, +/obj/structure/window/framed/almayer, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) "kYP" = ( @@ -49000,6 +48953,9 @@ /obj/structure/bed/chair{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_s) "lqJ" = ( @@ -50306,23 +50262,8 @@ }, /area/almayer/command/securestorage) "lQj" = ( -/obj/structure/machinery/door_control{ - id = "InnerShutter"; - name = "Inner Shutter"; - pixel_x = 5; - pixel_y = 10 - }, -/obj/item/toy/deck{ - pixel_x = -9 - }, -/obj/item/ashtray/plastic, -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/sign/safety/intercom{ - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, +/obj/structure/machinery/vending/snack, +/turf/open/floor/wood, /area/almayer/hull/lower_hull/l_f_s) "lQq" = ( /obj/structure/bed, @@ -50688,6 +50629,13 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/lower_engineering) +"mbQ" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/wood, +/area/almayer/hull/lower_hull/l_f_s) "mce" = ( /turf/open/floor/almayer{ icon_state = "greencorner" @@ -51624,6 +51572,9 @@ pixel_x = 8; pixel_y = -32 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -51776,6 +51727,12 @@ }, /turf/open/floor/almayer, /area/almayer/living/chapel) +"mBW" = ( +/obj/effect/decal/cleanable/ash, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/lower_hull/l_f_s) "mCo" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -52016,14 +51973,13 @@ }, /area/almayer/lifeboat_pumps/south2) "mIB" = ( -/obj/structure/machinery/cm_vending/sorted/medical/marinemed, /obj/structure/sign/safety/medical{ pixel_x = 8; pixel_y = 32 }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, +/obj/structure/machinery/vending/coffee, +/obj/structure/disposalpipe/segment, +/turf/open/floor/wood, /area/almayer/hull/lower_hull/l_f_s) "mIW" = ( /obj/structure/machinery/light, @@ -52919,6 +52875,13 @@ "naB" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/perma) +"naD" = ( +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/structure/machinery/disposal, +/turf/open/floor/wood, +/area/almayer/hull/lower_hull/l_f_s) "naQ" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -55211,9 +55174,9 @@ }, /area/almayer/squads/alpha_bravo_shared) "obG" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/computer/card{ - dir = 8 +/obj/effect/landmark/yautja_teleport, +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/open/floor/almayer{ icon_state = "plate" @@ -56245,7 +56208,7 @@ /obj/structure/sign/safety/security{ pixel_x = 15 }, -/turf/closed/wall/almayer, +/turf/closed/wall/almayer/reinforced, /area/almayer/hallways/starboard_umbilical) "owg" = ( /turf/open/floor/almayer{ @@ -58807,6 +58770,12 @@ pixel_y = 7 }, /obj/item/storage/box/lights/mixed, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_s) "pGT" = ( @@ -59576,15 +59545,6 @@ icon_state = "plate" }, /area/almayer/living/pilotbunks) -"pXQ" = ( -/obj/structure/sign/safety/intercom{ - pixel_x = 32; - pixel_y = 7 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hull/lower_hull/l_f_s) "pXV" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -61118,17 +61078,8 @@ }, /area/almayer/medical/operating_room_two) "qHb" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "Saferoom Channel"; - pixel_y = -28 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/wood, /area/almayer/hull/lower_hull/l_f_s) "qHg" = ( /turf/open/floor/almayer{ @@ -62846,6 +62797,7 @@ pixel_x = 32; pixel_y = -8 }, +/obj/effect/decal/cleanable/ash, /turf/open/floor/almayer{ icon_state = "cargo" }, @@ -63025,6 +62977,9 @@ pixel_x = 8; pixel_y = -32 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -63626,15 +63581,12 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/req) "rII" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, -/obj/structure/machinery/door/poddoor/shutters/almayer{ +/obj/structure/machinery/door/airlock/almayer/generic/glass{ dir = 2; - id = "OuterShutter"; - name = "\improper Saferoom Shutters" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" + name = "\improper Commissary" }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/wood, /area/almayer/hull/lower_hull/l_f_s) "rIO" = ( /obj/structure/machinery/vending/snack, @@ -63791,6 +63743,12 @@ dir = 8 }, /area/almayer/medical/containment/cell/cl) +"rMs" = ( +/obj/effect/decal/cleanable/ash{ + pixel_y = 15 + }, +/turf/open/floor/wood, +/area/almayer/hull/lower_hull/l_f_s) "rNF" = ( /obj/structure/machinery/light{ unacidable = 1; @@ -64119,19 +64077,8 @@ }, /area/almayer/shipboard/brig/cells) "rUU" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - req_access = null; - req_one_access = null - }, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 4; - id = "panicroomback"; - name = "\improper Safe Room Shutters" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hull/lower_hull/l_f_s) +/turf/closed/wall/almayer/reinforced, +/area/almayer/hallways/starboard_umbilical) "rVo" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -71348,7 +71295,7 @@ pixel_x = 15; pixel_y = 32 }, -/turf/closed/wall/almayer, +/turf/closed/wall/almayer/reinforced, /area/almayer/hallways/starboard_umbilical) "vbf" = ( /obj/structure/machinery/landinglight/ds2/delaytwo{ @@ -72107,6 +72054,10 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) +"vpE" = ( +/obj/structure/machinery/atm, +/turf/closed/wall/almayer, +/area/almayer/hull/lower_hull/l_f_s) "vpI" = ( /obj/effect/landmark/start/police, /turf/open/floor/plating/plating_catwalk, @@ -72935,6 +72886,17 @@ icon_state = "containment_corner_variant_2" }, /area/almayer/medical/containment/cell) +"vHU" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/door_control{ + id = "OfficeSafeRoom"; + name = "Office Safe Room"; + req_one_access_txt = "1;3" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/lower_hull/l_f_s) "vHW" = ( /obj/structure/surface/rack, /obj/item/tool/extinguisher, @@ -73080,14 +73042,8 @@ }, /area/almayer/living/briefing) "vKf" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - id = "InnerShutter"; - name = "\improper Saferoom Shutters" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/wood, /area/almayer/hull/lower_hull/l_f_s) "vKF" = ( /obj/structure/stairs{ @@ -73107,12 +73063,13 @@ }, /area/almayer/hallways/aft_hallway) "vLh" = ( -/obj/item/roller, -/obj/structure/surface/rack, -/obj/item/roller, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/machinery/vending/cola, +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 }, +/turf/open/floor/wood, /area/almayer/hull/lower_hull/l_f_s) "vLj" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ @@ -76026,13 +75983,10 @@ }, /area/almayer/hull/upper_hull/u_a_p) "wUO" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - id = "InnerShutter"; - name = "\improper Saferoom Shutters" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/obj/structure/bed/chair{ + dir = 1 }, +/turf/open/floor/wood, /area/almayer/hull/lower_hull/l_f_s) "wUP" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -76625,6 +76579,9 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/operating_room_one) +"xfZ" = ( +/turf/open/floor/wood, +/area/almayer/hull/lower_hull/l_f_s) "xgh" = ( /obj/structure/pipes/vents/scrubber{ dir = 4 @@ -78307,6 +78264,10 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) +"xOC" = ( +/obj/structure/disposalpipe/segment, +/turf/closed/wall/almayer, +/area/almayer/hull/lower_hull/l_f_s) "xOL" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk, @@ -96048,12 +96009,12 @@ aaa aaa aPy aPY -aQv -aQv -aQv -aQv -aQv -aQv +rUU +rUU +rUU +rUU +rUU +rUU vak ovP xyw @@ -96251,7 +96212,7 @@ aaa aaa nXP ndx -uNL +sIT nDd soS sgy @@ -96454,13 +96415,13 @@ aaa aaa nXP hJp -uNL +sIT gka bwQ oNf -uNL +sIT aNw -kXJ +xmv kVX xyw bHB @@ -96663,7 +96624,7 @@ sIT sIT sIT aNj -xmv +vHU kVX xyw bHB @@ -96860,15 +96821,15 @@ aaa aaa nXP tRV -sIT +kdt jNt iNZ lQj sIT -obG -kdt -kVX -xyw +sIT +sIT +sIT +hmy bHB aZO baI @@ -97063,15 +97024,15 @@ aaa aaa nXP hJp -sIT +kdt vLh -mGL -qHb -sIT -hdR +xfZ +xfZ +fGY hdR -hJz -hmy +wUO +kYa +xyw bHB aZP baI @@ -97266,16 +97227,16 @@ aaa aaa nXP mfe -sIT +aqc eNx -mGL -mGL +rMs +fJg +vKf +vKf vKf -mGL -mGL rII -xyw -bHB +baN +hBF aZQ baI baI @@ -97468,14 +97429,14 @@ aaa aaa aaa nXP -hJp -sIT +pwK +xOC mIB -mGL -fGY -wUO -gYB -pXQ +mbQ +qHb +qHb +mbQ +naD kYa xyw bHB @@ -97671,15 +97632,15 @@ aaa aaa aaa nXP -mGL -sIT -sIT -rUU -sIT -sIT +kKG +uNL +uNL uNL uNL uNL +uNL +uNL +vpE xyw bHB aZO @@ -97876,7 +97837,7 @@ aaa nXP rxk uNL -aqc +mGL hJp qbd cQF @@ -98077,12 +98038,12 @@ aaa aaa aaa nXP -mGL +kKG qee hJp mGL qaZ -mGL +mBW hJp mGL mBb @@ -98280,7 +98241,7 @@ aac aaf aaf nXP -hJp +dnX uNL afd hJp @@ -98483,7 +98444,7 @@ aad aag nXP nXP -tRV +hJz uNL uNL agi @@ -98686,7 +98647,7 @@ aad aag nXP mGL -hJp +dnX uNL aas alI @@ -98889,7 +98850,7 @@ aad aag nXP mGL -hJp +dnX uNL aga alQ @@ -99701,7 +99662,7 @@ aad aag nXP hJp -hJp +dnX uNL aaK cfN @@ -99904,7 +99865,7 @@ aad aag nXP fpd -mGL +kKG uNL ceQ ceU @@ -100107,7 +100068,7 @@ aag aag nXP dUF -mGL +kKG uNL ceR ceU @@ -100310,7 +100271,7 @@ aag aag nXP fQF -mGL +kKG uNL abd adk @@ -100513,7 +100474,7 @@ aag aag nXP wVD -mGL +kKG uNL uZQ uZQ @@ -100716,7 +100677,7 @@ aag aag nXP mNf -hJp +dnX uNL cdE xSI @@ -100919,7 +100880,7 @@ aag aag nXP bvO -hJp +dnX ahd adg amp @@ -101122,7 +101083,7 @@ aag aag nXP dNB -hJp +dnX uNL hSL agn @@ -101325,7 +101286,7 @@ aag aag nXP mGL -iBE +obG uNL eXq adR @@ -101528,7 +101489,7 @@ aag aag nXP mGL -mGL +kKG uNL abG aeh @@ -101731,7 +101692,7 @@ aag aag nXP rbv -hJp +dnX uNL abH aer @@ -101934,7 +101895,7 @@ aag aag nXP mGL -pwK +kXJ pJW acq aeJ