diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index d09ac36997..df96918db5 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -2512,9 +2512,6 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/machinery/airalarm{ - pixel_y = 23 - }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "afa" = ( @@ -3231,11 +3228,10 @@ /turf/open/floor/plasteel, /area/security/brig) "agq" = ( -/obj/machinery/door/poddoor/shutters{ - id = "armory1"; - name = "Armoury Shutter" - }, /obj/effect/turf_decal/delivery, +/obj/machinery/door/poddoor/shutters/window{ + id = "armory1" + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "agr" = ( @@ -3586,25 +3582,58 @@ pixel_y = -26; req_access_txt = "3" }, -/obj/machinery/door/poddoor/shutters{ - id = "armory1"; - name = "Armoury Shutter" - }, /obj/effect/turf_decal/delivery, +/obj/machinery/door/poddoor/shutters/window{ + id = "armory1" + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/security/armory) +"agW" = ( +/obj/structure/rack, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/obj/item/storage/box/handcuffs{ + pixel_x = -1; + pixel_y = 1 + }, +/obj/item/storage/box/handcuffs{ + pixel_x = 1; + pixel_y = -1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/camera/motion{ + c_tag = "Armory Motion Sensor"; + dir = 4 + }, +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -23 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "agX" = ( -/obj/machinery/door/poddoor/shutters{ - id = "armory2"; - name = "Armoury Shutter" - }, -/obj/machinery/button/door{ - id = "armory2"; - name = "Armory Shutters"; - pixel_y = -26; - req_access_txt = "3" - }, /obj/effect/turf_decal/delivery, +/obj/machinery/door/poddoor/shutters/window{ + id = "armory2" + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "agY" = ( @@ -3757,42 +3786,11 @@ /turf/open/floor/plasteel, /area/security/main) "ahm" = ( -/obj/structure/rack, -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/obj/item/storage/box/handcuffs{ - pixel_x = -1; - pixel_y = 1 - }, -/obj/item/storage/box/handcuffs{ - pixel_x = 1; - pixel_y = -1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/bot, -/obj/machinery/camera/motion{ - c_tag = "Armory Motion Sensor"; - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "ahn" = ( /turf/closed/wall, /area/maintenance/fore/secondary) @@ -3824,6 +3822,17 @@ }, /turf/open/floor/plasteel, /area/security/processing) +"ahs" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/item/radio/intercom{ + pixel_y = 25 + }, +/obj/effect/landmark/start/assistant, +/obj/structure/chair/sofa/right, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "aht" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -3971,6 +3980,17 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) +"ahC" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, +/obj/structure/closet/wardrobe/white, +/obj/item/clothing/under/suit/waiter, +/obj/item/clothing/under/suit/waiter, +/obj/item/clothing/under/suit/waiter, +/obj/item/clothing/suit/straight_jacket, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "ahD" = ( /obj/structure/chair, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -4100,6 +4120,30 @@ }, /turf/open/floor/plasteel, /area/security/main) +"ahO" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4; + pixel_y = 5 + }, +/obj/structure/chair/sofa/left{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) +"ahP" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/closet/wardrobe/mixed, +/obj/item/clothing/under/costume/kilt, +/obj/item/clothing/under/costume/kilt, +/obj/item/clothing/under/dress/skirt/purple, +/obj/item/clothing/head/beret, +/obj/item/clothing/head/beret, +/obj/item/clothing/head/beret, +/obj/structure/sign/poster/official/fashion{ + pixel_x = -32 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "ahQ" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -4275,6 +4319,14 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/plasteel/showroomfloor, /area/security/brig) +"aia" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/closet/secure_closet/hydroponics, +/obj/structure/sign/poster/official/hydro_ad{ + pixel_y = 32 + }, +/turf/open/floor/plasteel, +/area/hydroponics) "aib" = ( /obj/structure/cable{ icon_state = "2-8" @@ -4353,11 +4405,16 @@ /turf/open/floor/plasteel, /area/security/brig) "aih" = ( -/obj/machinery/door/poddoor/shutters{ +/obj/machinery/button/door{ id = "armory2"; - name = "Armoury Shutter" + name = "Armory Shutters"; + pixel_y = -26; + req_access_txt = "3" }, /obj/effect/turf_decal/delivery, +/obj/machinery/door/poddoor/shutters/window{ + id = "armory2" + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "aii" = ( @@ -4614,6 +4671,16 @@ }, /turf/open/floor/plating, /area/maintenance/fore/secondary) +"aiB" = ( +/obj/machinery/vending/kink, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/poster/official/fashion{ + pixel_y = 32 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/locker) "aiC" = ( /obj/structure/cable{ icon_state = "1-4" @@ -4722,6 +4789,13 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel/dark, /area/security/brig) +"aiJ" = ( +/obj/structure/reagent_dispensers/watertank/high, +/obj/structure/sign/poster/official/hydro_ad{ + pixel_x = -32 + }, +/turf/open/floor/plasteel, +/area/hydroponics) "aiK" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 @@ -4774,6 +4848,14 @@ /obj/effect/turf_decal/box, /turf/open/floor/plasteel/dark, /area/security/brig) +"aiP" = ( +/obj/structure/table, +/obj/item/storage/firstaid/regular, +/obj/structure/sign/poster/official/medical_green_cross{ + pixel_x = -32 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) "aiQ" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -4797,6 +4879,13 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/security/processing) +"aiV" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/holopad, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "aiW" = ( /obj/structure/closet/bombcloset/security, /obj/effect/turf_decal/bot, @@ -4817,26 +4906,24 @@ /turf/open/floor/plating, /area/ai_monitored/security/armory) "aja" = ( -/obj/machinery/door/poddoor/shutters{ - id = "armory3"; - name = "Armoury Shutter" - }, /obj/effect/turf_decal/delivery, /obj/structure/cable{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/door/poddoor/shutters/window{ + id = "armory3" + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "ajb" = ( -/obj/machinery/door/poddoor/shutters{ - id = "armory3"; - name = "Armoury Shutter" - }, /obj/effect/turf_decal/delivery, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/door/poddoor/shutters/window{ + id = "armory3" + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "ajc" = ( @@ -4888,6 +4975,16 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel/dark, /area/security/brig) +"ajh" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/obj/structure/sign/poster/official/pda_ad800{ + pixel_y = 32 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "aji" = ( /obj/structure/chair{ name = "Judge" @@ -4974,6 +5071,17 @@ }, /turf/open/floor/plating, /area/security/vacantoffice/b) +"ajs" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/sign/poster/official/pda_ad600{ + pixel_x = 32 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/heads/hop) "ajt" = ( /obj/machinery/camera{ c_tag = "Vacant Office B"; @@ -5001,6 +5109,15 @@ }, /turf/open/floor/plasteel, /area/security/main) +"ajv" = ( +/obj/machinery/computer/med_data{ + dir = 3 + }, +/obj/structure/sign/poster/official/medical_green_cross{ + pixel_x = -32 + }, +/turf/open/floor/plasteel/white, +/area/medical/sleeper) "ajw" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -5056,6 +5173,12 @@ }, /turf/open/floor/plasteel, /area/security/main) +"ajB" = ( +/obj/structure/sign/poster/official/medical_green_cross{ + pixel_x = 32 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) "ajC" = ( /obj/structure/cable{ icon_state = "4-8" @@ -5069,6 +5192,13 @@ }, /turf/open/floor/plasteel, /area/security/brig) +"ajD" = ( +/obj/effect/spawner/lootdrop/keg, +/obj/structure/sign/poster/contraband/scum{ + pixel_x = -32 + }, +/turf/open/floor/plating, +/area/maintenance/port/aft) "ajE" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/neutral{ @@ -5093,6 +5223,16 @@ }, /turf/open/floor/plasteel, /area/security/brig) +"ajG" = ( +/obj/structure/table, +/obj/item/kitchen/rollingpin, +/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/food/condiment/sugar, +/obj/structure/sign/poster/contraband/scum{ + pixel_x = -32 + }, +/turf/open/floor/plating, +/area/maintenance/port/aft) "ajH" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 @@ -5155,6 +5295,20 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel/dark, /area/security/brig) +"ajM" = ( +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 2; + name = "2maintenance loot spawner" + }, +/obj/structure/sign/poster/contraband/scum{ + pixel_y = 32 + }, +/obj/structure/sign/poster/contraband/scum{ + pixel_y = 32 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "ajN" = ( /obj/structure/cable{ icon_state = "4-8" @@ -8917,20 +9071,6 @@ }, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) -"asZ" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, -/obj/structure/closet/wardrobe/white, -/obj/item/clothing/under/suit/waiter, -/obj/item/clothing/under/suit/waiter, -/obj/item/clothing/under/suit/waiter, -/obj/structure/sign/poster/contraband/lizard{ - pixel_x = -32 - }, -/obj/item/clothing/suit/straight_jacket, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "ata" = ( /turf/open/floor/wood, /area/lawoffice) @@ -9204,17 +9344,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/fitness) -"aua" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/closet/wardrobe/mixed, -/obj/item/clothing/under/costume/kilt, -/obj/item/clothing/under/costume/kilt, -/obj/item/clothing/under/dress/skirt/purple, -/obj/item/clothing/head/beret, -/obj/item/clothing/head/beret, -/obj/item/clothing/head/beret, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "aub" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/yellow, @@ -15667,11 +15796,6 @@ }, /turf/open/floor/wood, /area/crew_quarters/bar) -"aKK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/closet/secure_closet/hydroponics, -/turf/open/floor/plasteel, -/area/hydroponics) "aKL" = ( /obj/machinery/airalarm{ pixel_y = 24 @@ -17828,13 +17952,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/locker) -"aQU" = ( -/obj/machinery/vending/kink, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/locker) "aQV" = ( /obj/machinery/vending/autodrobe/all_access, /obj/structure/disposalpipe/segment{ @@ -21137,19 +21254,6 @@ /obj/item/reagent_containers/glass/bucket, /turf/open/floor/plasteel, /area/hydroponics) -"aYP" = ( -/obj/structure/reagent_dispensers/watertank/high, -/obj/structure/sign/poster/contraband/lizard{ - pixel_x = -32 - }, -/obj/structure/sign/poster/contraband/lizard{ - pixel_x = -32 - }, -/obj/structure/sign/poster/contraband/lizard{ - pixel_x = -32 - }, -/turf/open/floor/plasteel, -/area/hydroponics) "aYQ" = ( /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/tile/green{ @@ -24275,11 +24379,6 @@ /obj/structure/chair, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"bhf" = ( -/obj/structure/table, -/obj/item/storage/firstaid/regular, -/turf/open/floor/plasteel/white, -/area/medical/medbay/central) "bhg" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -27673,10 +27772,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"boX" = ( -/obj/machinery/holopad, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "boY" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -27717,13 +27812,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/heads/hop) -"bpa" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "bpb" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -27755,14 +27843,6 @@ }, /turf/open/floor/carpet, /area/crew_quarters/heads/hop) -"bpf" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel, -/area/crew_quarters/heads/hop) "bph" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -30936,12 +31016,6 @@ }, /turf/open/floor/plasteel/dark, /area/medical/sleeper) -"bwC" = ( -/obj/machinery/computer/med_data{ - dir = 3 - }, -/turf/open/floor/plasteel/white, -/area/medical/sleeper) "bwD" = ( /obj/machinery/sleeper{ dir = 8 @@ -44825,13 +44899,6 @@ /obj/structure/lattice/catwalk, /turf/open/space, /area/solar/port/aft) -"ccY" = ( -/obj/structure/table, -/obj/item/kitchen/rollingpin, -/obj/item/reagent_containers/food/condiment/enzyme, -/obj/item/reagent_containers/food/condiment/sugar, -/turf/open/floor/plating, -/area/maintenance/port/aft) "ccZ" = ( /obj/structure/chair/stool, /turf/open/floor/plating, @@ -55845,16 +55912,6 @@ }, /turf/open/space, /area/solar/starboard/fore) -"jJg" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4; - pixel_y = 5 - }, -/obj/structure/chair/sofa{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "jJF" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/cable{ @@ -56570,13 +56627,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/carpet, /area/crew_quarters/dorms) -"lXE" = ( -/obj/structure/chair/sofa/right, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "lZl" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance, @@ -56849,12 +56899,6 @@ }, /turf/open/floor/plasteel/dark, /area/engine/gravity_generator) -"mOO" = ( -/obj/structure/chair/sofa/left{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "mPk" = ( /obj/structure/bed, /obj/machinery/button/door{ @@ -57716,14 +57760,6 @@ /obj/item/target/syndicate, /turf/open/floor/plating, /area/security/range) -"pFX" = ( -/obj/structure/table/wood/fancy, -/obj/item/reagent_containers/food/drinks/soda_cans/starkist{ - pixel_x = -3; - pixel_y = 5 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "pHl" = ( /obj/structure/table, /obj/item/storage/box/beakers{ @@ -60342,17 +60378,6 @@ "xxp" = ( /turf/open/floor/plating, /area/security/range) -"xzd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/chair/sofa, -/obj/item/radio/intercom{ - pixel_y = 25 - }, -/obj/effect/landmark/start/assistant, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "xzv" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -79828,7 +79853,7 @@ aLH aLE aOl aPA -aQU +aiB aQN nLw sLa @@ -79867,7 +79892,7 @@ aaa aaa aaa bCq -bJP +ajD bCq bSn bCq @@ -79880,7 +79905,7 @@ aaf bCq cAy cAB -ccY +ajG cAD cAH cfw @@ -86014,7 +86039,7 @@ bjz bkT bjz bjz -boX +aiV bqv bqv bqv @@ -86271,7 +86296,7 @@ bjB bkW bmp bjz -bpa +ajh bqy cBr bqy @@ -87813,7 +87838,7 @@ bcd bcd bms bnS -bpf +ajs bqC brZ btE @@ -89810,7 +89835,7 @@ aaZ aeY acn agR -ahm +agW ahA aeE agz @@ -91097,8 +91122,8 @@ agq agV aaZ aaZ -aih agX +aih aaZ aaZ aaZ @@ -96031,7 +96056,7 @@ aYV aYV bet bfH -bhf +aiP wbE bhh wbE @@ -96042,7 +96067,7 @@ bqP bsy bEe bvh -bwC +ajv bxN bze bAp @@ -96514,8 +96539,8 @@ wig str rrM clO -asZ -aua +ahC +ahP oZl awB att @@ -97283,9 +97308,9 @@ con eVJ dqb qeA -lXE -pFX -mOO +ahm +fHG +fHG fHG fHG pPi @@ -97540,9 +97565,9 @@ fyS eVJ dqb veS -xzd +ahs sJI -jJg +ahO fHG eAJ rvr @@ -99127,7 +99152,7 @@ bsx bst bfJ bhh -bhh +ajB bwK bhh bhh @@ -100650,7 +100675,7 @@ aSR aUi aVJ aOX -aYP +aiJ bal bam aYV @@ -101154,7 +101179,7 @@ wBd aGC aIl aIq -aKK +aia aMy aIp nGf @@ -108931,7 +108956,7 @@ aaa cNW clt cQw -bNB +ajM cOe cOe cNW