From d09ab3668fa1aeb8c98ae5ea6a3a379ca9f0c554 Mon Sep 17 00:00:00 2001 From: LightFire53 Date: Wed, 18 May 2022 05:58:22 -0700 Subject: [PATCH] Standardizes the Armory across all 3 stations (#17606) * Taking Inventory Also fixes a few area glitches (looking at you, Meta) * Further Refinement * Moar * Congratulations, you played yourself 2: electric boogaloo * Peacenik --- _maps/map_files/Delta/delta.dmm | 80 +- _maps/map_files/MetaStation/MetaStation.dmm | 478 ++++++---- _maps/map_files/cyberiad/cyberiad.dmm | 954 +++++++++++--------- 3 files changed, 886 insertions(+), 626 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 3940994b2de..f3102c67a8f 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -40622,11 +40622,6 @@ }, /area/security/processing) "bTo" = ( -/obj/structure/rack, -/obj/item/storage/toolbox/mechanical, -/obj/item/storage/toolbox/electrical, -/obj/item/screwdriver, -/obj/item/multitool, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" @@ -88558,8 +88553,6 @@ }, /area/maintenance/starboard) "fox" = ( -/obj/machinery/recharger, -/obj/structure/table/reinforced, /obj/machinery/door_control{ id = "Secure Armory"; name = "Secure Armory Shutter Control"; @@ -88567,7 +88560,8 @@ pixel_y = -28; req_access_txt = "3" }, -/obj/effect/decal/warning_stripes/northeast, +/obj/structure/rack, +/obj/item/storage/toolbox/mechanical, /turf/simulated/floor/plasteel, /area/security/securearmoury) "fqy" = ( @@ -88695,6 +88689,7 @@ /obj/item/grenade/barrier, /obj/item/grenade/barrier, /obj/item/grenade/barrier, +/obj/structure/rack, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -90429,15 +90424,12 @@ /turf/simulated/floor/plasteel, /area/security/securearmoury) "kiL" = ( -/obj/structure/rack, /obj/machinery/firealarm{ dir = 8; name = "west bump"; pixel_x = -24 }, -/obj/item/ammo_box/shotgun/rubbershot, -/obj/item/storage/box/rubbershot, -/obj/item/storage/box/rubbershot, +/obj/machinery/flasher/portable, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -90451,8 +90443,32 @@ /turf/simulated/floor/plasteel, /area/security/permabrig) "kkM" = ( -/obj/vehicle/secway, -/obj/item/key/security, +/obj/structure/rack, +/obj/item/storage/box/rubbershot{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/storage/box/rubbershot{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/storage/box/rubbershot{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/storage/box/tranquilizer, +/obj/item/storage/box/beanbag{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/box/beanbag{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/box/beanbag{ + pixel_x = 3; + pixel_y = 3 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -90614,7 +90630,10 @@ }, /area/maintenance/starboard) "kTO" = ( -/obj/structure/dispenser/oxygen, +/obj/structure/table/reinforced, +/obj/item/storage/box/chemimp, +/obj/item/storage/box/trackimp, +/obj/item/storage/lockbox/mindshield, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -91163,14 +91182,11 @@ /turf/simulated/floor/plating, /area/security/seceqstorage) "mqS" = ( -/obj/structure/table/reinforced, /obj/machinery/alarm{ name = "north bump"; pixel_y = 24 }, -/obj/item/storage/box/chemimp, -/obj/item/storage/box/trackimp, -/obj/item/storage/lockbox/mindshield, +/obj/structure/dispenser/oxygen, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -95042,21 +95058,16 @@ /turf/simulated/floor/plasteel, /area/security/securearmoury) "wMd" = ( -/obj/structure/table/reinforced, /obj/structure/reagent_dispensers/peppertank{ pixel_x = 32 }, -/obj/item/clothing/mask/gas/sechailer, -/obj/item/clothing/mask/gas/sechailer, -/obj/item/clothing/mask/gas/sechailer, -/obj/item/flashlight/seclite, -/obj/item/flashlight/seclite, -/obj/item/flashlight/seclite, /obj/machinery/power/apc{ name = "south bump"; pixel_y = -24 }, /obj/structure/cable, +/obj/vehicle/secway, +/obj/item/key/security, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -95392,10 +95403,21 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "xUI" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/teargas, +/obj/structure/rack, +/obj/item/storage/box/seccarts{ + pixel_x = 3; + pixel_y = 2 + }, /obj/item/storage/box/handcuffs, -/obj/item/storage/box/flashbangs, +/obj/item/storage/box/flashbangs{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/storage/box/handcuffs, +/obj/item/storage/box/teargas{ + pixel_x = -3; + pixel_y = -3 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 5d7c3791886..b4a27aec43e 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -1235,7 +1235,9 @@ dir = 4; network = list("SS13","Prison") }, -/turf/simulated/floor/plasteel/white, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/security/permabrig) "aeN" = ( /obj/effect/spawner/window/reinforced, @@ -1558,7 +1560,9 @@ d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/plasteel/white, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/security/permabrig) "afz" = ( /obj/structure/cable/yellow{ @@ -1566,7 +1570,9 @@ d2 = 4; icon_state = "2-4" }, -/turf/simulated/floor/plasteel/white, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/security/permabrig) "afA" = ( /obj/structure/chair/stool, @@ -1596,7 +1602,9 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/plasteel/white, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/security/permabrig) "afC" = ( /obj/machinery/atmospherics/pipe/simple/hidden, @@ -1791,7 +1799,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/turf/simulated/floor/plasteel/white, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/security/permabrig) "aga" = ( /obj/structure/cable/yellow{ @@ -1805,7 +1815,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/turf/simulated/floor/plasteel/white, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/security/permabrig) "agb" = ( /obj/structure/cable/yellow{ @@ -1829,7 +1841,7 @@ }, /obj/structure/lattice, /turf/space, -/area/security/armoury) +/area/security/securearmoury) "age" = ( /obj/structure/cable{ d1 = 1; @@ -2229,7 +2241,9 @@ pixel_x = -26; pixel_y = 34 }, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/hos) "agX" = ( /obj/effect/spawner/window/reinforced, @@ -2242,7 +2256,7 @@ dir = 8; icon_state = "vault" }, -/area/security/armoury) +/area/security/securearmoury) "aha" = ( /obj/machinery/computer/prisoner, /turf/simulated/floor/plasteel/dark, @@ -2294,15 +2308,12 @@ }, /area/security/permabrig) "ahe" = ( -/obj/structure/closet/secure_closet{ - name = "contraband locker"; - req_access_txt = "3" - }, +/obj/machinery/vending/security, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" }, -/area/security/armoury) +/area/security/securearmoury) "ahf" = ( /obj/machinery/alarm{ name = "north bump"; @@ -2319,7 +2330,7 @@ dir = 8; icon_state = "vault" }, -/area/security/armoury) +/area/security/securearmoury) "ahg" = ( /obj/machinery/door/airlock/external{ name = "Escape Pod Three" @@ -2754,19 +2765,10 @@ /turf/simulated/floor/plating, /area/security/permabrig) "ahU" = ( -/turf/simulated/floor/plasteel/dark, -/area/security/armoury) -"ahV" = ( -/obj/machinery/light/small{ - dir = 1 +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/obj/item/storage/secure/safe{ - name = "armory safe A"; - pixel_x = 6; - pixel_y = 28 - }, -/turf/simulated/floor/plasteel/dark, -/area/security/armoury) +/area/security/securearmoury) "ahW" = ( /obj/structure/closet/secure_closet/hos, /obj/machinery/light{ @@ -2782,7 +2784,9 @@ pixel_x = -28; pixel_y = 28 }, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/hos) "ahX" = ( /obj/machinery/status_display{ @@ -2790,7 +2794,9 @@ pixel_x = -32; pixel_y = 32 }, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/hos) "ahY" = ( /turf/simulated/floor/plasteel/dark, @@ -2938,11 +2944,13 @@ dir = 8; icon_state = "vault" }, -/area/security/armoury) +/area/security/securearmoury) "aiq" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/plasteel/dark, -/area/security/armoury) +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/security/securearmoury) "air" = ( /turf/simulated/floor/engine, /area/holodeck/alphadeck) @@ -2961,19 +2969,21 @@ name = "north bump"; pixel_y = 28 }, -/turf/simulated/floor/plasteel/dark, -/area/security/armoury) +/obj/item/storage/secure/safe{ + pixel_x = 32 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/security/securearmoury) "aiw" = ( /obj/machinery/light/small{ dir = 1 }, -/obj/item/storage/secure/safe{ - name = "armory safe B"; - pixel_x = 6; - pixel_y = 28 +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/turf/simulated/floor/plasteel/dark, -/area/security/armoury) +/area/security/securearmoury) "aix" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "applebush" @@ -3059,7 +3069,7 @@ req_access_txt = "3" }, /turf/simulated/wall/r_wall, -/area/security/armoury) +/area/security/securearmoury) "aiI" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -3111,7 +3121,7 @@ dir = 1; icon_state = "vault" }, -/area/security/armoury) +/area/security/securearmoury) "aiO" = ( /obj/structure/rack, /obj/item/gun/energy/laser{ @@ -3128,11 +3138,13 @@ dir = 4; icon_state = "vault" }, -/area/security/armoury) +/area/security/securearmoury) "aiP" = ( /mob/living/simple_animal/bot/secbot/armsky, -/turf/simulated/floor/plasteel/dark, -/area/security/armoury) +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/security/securearmoury) "aiQ" = ( /obj/structure/cable{ d1 = 4; @@ -3202,7 +3214,9 @@ d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/hos) "aiW" = ( /obj/structure/cable/yellow{ @@ -3210,7 +3224,9 @@ d2 = 8; icon_state = "2-8" }, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/hos) "aiX" = ( /obj/structure/table/wood, @@ -3312,11 +3328,35 @@ pixel_x = -24 }, /obj/structure/rack, +/obj/item/storage/box/rubbershot{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/storage/box/rubbershot{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/storage/box/rubbershot{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/storage/box/beanbag{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/box/beanbag{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/box/beanbag{ + pixel_x = 3; + pixel_y = 3 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "vault" }, -/area/security/armoury) +/area/security/securearmoury) "aji" = ( /obj/machinery/door/airlock{ id_tag = "FitnessShower"; @@ -3381,8 +3421,10 @@ name = "east bump"; pixel_x = 27 }, -/turf/simulated/floor/plasteel/dark, -/area/security/armoury) +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/security/securearmoury) "ajp" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -3396,10 +3438,7 @@ name = "east bump"; pixel_x = 27 }, -/obj/structure/rack, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/hardsuit/security, -/obj/item/clothing/mask/gas/sechailer, +/obj/machinery/suit_storage_unit/security, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "vault" @@ -3541,23 +3580,20 @@ /area/security/permabrig) "ajK" = ( /obj/structure/rack, -/obj/item/storage/box/rubbershot, -/obj/item/storage/box/rubbershot, -/obj/item/storage/box/rubbershot, -/obj/item/storage/box/rubbershot, /obj/item/gun/projectile/shotgun/riot{ pixel_x = -3; pixel_y = 3 }, +/obj/item/gun/projectile/shotgun/riot, /obj/item/gun/projectile/shotgun/riot{ - pixel_x = 2; - pixel_y = -1 + pixel_x = 3; + pixel_y = -3 }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "vault" }, -/area/security/armoury) +/area/security/securearmoury) "ajL" = ( /obj/structure/rack, /obj/item/gun/energy/gun{ @@ -3574,14 +3610,14 @@ dir = 4; icon_state = "vault" }, -/area/security/armoury) +/area/security/securearmoury) "ajM" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" }, -/area/security/armoury) +/area/security/securearmoury) "ajN" = ( /obj/structure/cable{ d1 = 1; @@ -3598,10 +3634,7 @@ /turf/simulated/floor/carpet, /area/security/hos) "ajP" = ( -/obj/structure/rack, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/hardsuit/security, -/obj/item/clothing/mask/gas/sechailer, +/obj/machinery/suit_storage_unit/security, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "vault" @@ -3651,20 +3684,34 @@ }, /area/security/permabrig) "ajV" = ( -/turf/simulated/wall, -/area/security/armoury) +/turf/simulated/wall/r_wall, +/area/security/securearmoury) "ajW" = ( /obj/structure/rack, -/obj/item/storage/box/teargas, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "vault" +/obj/item/storage/box/seccarts{ + pixel_x = 3; + pixel_y = 2 }, -/area/security/armoury) +/obj/item/storage/box/handcuffs, +/obj/item/storage/box/flashbangs{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/storage/box/handcuffs, +/obj/item/storage/box/teargas{ + pixel_x = -3; + pixel_y = -3 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/security/securearmoury) "ajX" = ( /obj/structure/table/wood, /obj/machinery/recharger, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/hos) "ajY" = ( /obj/structure/cable/yellow{ @@ -3675,7 +3722,9 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/hos) "ajZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -3684,7 +3733,7 @@ /turf/simulated/floor/plasteel{ icon_state = "vault" }, -/area/security/armoury) +/area/security/securearmoury) "aka" = ( /obj/machinery/hologram/holopad, /obj/structure/chair{ @@ -3712,7 +3761,7 @@ dir = 6; icon_state = "vault" }, -/area/security/armoury) +/area/security/securearmoury) "akd" = ( /obj/structure/cable/yellow{ d1 = 2; @@ -3726,7 +3775,7 @@ /turf/simulated/floor/plasteel{ icon_state = "vault" }, -/area/security/armoury) +/area/security/securearmoury) "ake" = ( /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/plating, @@ -3766,7 +3815,7 @@ /turf/simulated/floor/plasteel{ icon_state = "vault" }, -/area/security/armoury) +/area/security/securearmoury) "akh" = ( /turf/simulated/floor/plasteel, /area/crew_quarters/fitness{ @@ -3845,17 +3894,22 @@ req_access_txt = "3" }, /turf/simulated/floor/plasteel, -/area/security/armoury) +/area/security/securearmoury) "aks" = ( /obj/structure/closet/secure_closet/security, /obj/structure/extinguisher_cabinet{ name = "north bump"; pixel_y = 30 }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, -/area/security/main) +/area/security/seceqstorage) "akt" = ( /turf/simulated/wall, /area/maintenance/disposal) @@ -3871,7 +3925,7 @@ dir = 8; icon_state = "vault" }, -/area/security/armoury) +/area/security/securearmoury) "akv" = ( /obj/structure/chair/stool{ pixel_y = 8 @@ -3924,11 +3978,16 @@ /turf/simulated/floor/plating, /area/security/hos) "akA" = ( +/obj/machinery/light_switch{ + dir = 1; + name = "south bump"; + pixel_y = -24 + }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "vault" }, -/area/security/armoury) +/area/security/securearmoury) "akB" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -4035,13 +4094,14 @@ /turf/simulated/floor/plating, /area/security/armoury) "akM" = ( -/obj/structure/closet/bombcloset, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/vehicle/secway, +/obj/item/key/security, /turf/simulated/floor/plasteel, /area/security/armoury) "akN" = ( @@ -4060,7 +4120,7 @@ dir = 8; icon_state = "vault" }, -/area/security/armoury) +/area/security/securearmoury) "akP" = ( /obj/machinery/suit_storage_unit/engine/secure, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -4273,13 +4333,11 @@ name = "\improper Recreation Area" }) "alm" = ( -/obj/structure/closet/l3closet/security, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/security/armoury) "aln" = ( @@ -4469,25 +4527,45 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, -/area/security/main) +/area/security/seceqstorage) "alC" = ( /obj/structure/closet/secure_closet/security, +/obj/structure/cable/yellow{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/power/apc{ + cell_type = 25000; + dir = 1; + name = "north bump"; + pixel_y = 24 + }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, -/area/security/main) +/area/security/seceqstorage) "alD" = ( /obj/structure/closet/secure_closet/security, /obj/machinery/camera{ c_tag = "Atmospherics - Control Room" }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, -/area/security/main) +/area/security/seceqstorage) "alF" = ( /turf/simulated/floor/plasteel{ dir = 1; @@ -4499,16 +4577,21 @@ /obj/machinery/light{ dir = 1 }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, -/area/security/main) +/area/security/seceqstorage) "alH" = ( /obj/machinery/vending/secdrobe, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, -/area/security/main) +/area/security/seceqstorage) "alL" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, @@ -4589,7 +4672,7 @@ /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, -/area/security/main) +/area/security/seceqstorage) "alU" = ( /obj/structure/cable/yellow{ d2 = 2; @@ -4607,12 +4690,12 @@ /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, -/area/security/main) +/area/security/seceqstorage) "alY" = ( /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, -/area/security/main) +/area/security/seceqstorage) "alZ" = ( /obj/machinery/light{ dir = 1 @@ -4743,7 +4826,7 @@ /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, -/area/security/main) +/area/security/seceqstorage) "amr" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -5339,6 +5422,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, /turf/simulated/floor/plasteel, /area/security/armoury) "anM" = ( @@ -5357,7 +5445,7 @@ /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, -/area/security/main) +/area/security/seceqstorage) "anN" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -5371,7 +5459,7 @@ /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, -/area/security/main) +/area/security/seceqstorage) "anO" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -5383,7 +5471,7 @@ /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, -/area/security/main) +/area/security/seceqstorage) "anP" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -5409,7 +5497,7 @@ /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, -/area/security/main) +/area/security/seceqstorage) "anT" = ( /obj/machinery/newscaster/security_unit{ pixel_x = -32; @@ -5454,7 +5542,6 @@ }, /obj/item/storage/box/trackimp, /obj/item/storage/lockbox/mindshield, -/obj/item/reagent_containers/glass/bottle/morphine, /obj/machinery/light/small, /obj/item/storage/toolbox/mechanical{ pixel_x = -4; @@ -5469,9 +5556,13 @@ /turf/simulated/floor/plating, /area/security/armoury) "aob" = ( -/obj/vehicle/secway, -/obj/item/key/security, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/light_switch{ + dir = 1; + name = "south bump"; + pixel_y = -24 + }, +/obj/structure/closet/l3closet/security, /turf/simulated/floor/plasteel, /area/security/armoury) "aoc" = ( @@ -5498,7 +5589,7 @@ /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, -/area/security/main) +/area/security/seceqstorage) "aod" = ( /obj/structure/extinguisher_cabinet{ name = "east bump"; @@ -5530,7 +5621,7 @@ }, /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, -/area/security/main) +/area/security/seceqstorage) "aog" = ( /obj/machinery/camera{ c_tag = "Security - Office - Port"; @@ -5603,6 +5694,7 @@ }, /obj/machinery/disposal, /turf/simulated/floor/plasteel{ + dir = 5; icon_state = "cafeteria" }, /area/security/brig) @@ -5915,6 +6007,7 @@ pixel_y = 6 }, /turf/simulated/floor/plasteel{ + dir = 5; icon_state = "cafeteria" }, /area/security/brig) @@ -5936,6 +6029,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ + dir = 5; icon_state = "cafeteria" }, /area/security/brig) @@ -6006,12 +6100,13 @@ }, /area/security/main) "apB" = ( -/obj/effect/spawner/window/reinforced, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "red" +/obj/structure/cable/yellow{ + d2 = 2; + icon_state = "0-2" }, -/area/security/main) +/obj/effect/spawner/window/reinforced, +/turf/simulated/floor/plating, +/area/security/securearmoury) "apC" = ( /turf/simulated/floor/plasteel{ icon_state = "redfull" @@ -6391,6 +6486,7 @@ "aqL" = ( /obj/structure/table, /turf/simulated/floor/plasteel{ + dir = 5; icon_state = "cafeteria" }, /area/security/brig) @@ -6410,6 +6506,7 @@ /area/security/brig) "aqN" = ( /turf/simulated/floor/plasteel{ + dir = 5; icon_state = "cafeteria" }, /area/security/brig) @@ -6894,6 +6991,7 @@ /obj/structure/table, /obj/item/storage/fancy/donut_box, /turf/simulated/floor/plasteel{ + dir = 5; icon_state = "cafeteria" }, /area/security/brig) @@ -6917,13 +7015,13 @@ }, /area/security/brig) "asa" = ( -/obj/structure/rack, -/obj/item/storage/box/flashbangs{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/item/storage/box/handcuffs, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/cable/yellow, +/obj/machinery/power/apc{ + name = "south bump"; + pixel_y = -24 + }, +/obj/structure/closet/bombcloset, /turf/simulated/floor/plasteel, /area/security/armoury) "asd" = ( @@ -7367,7 +7465,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/machinery/vending/security, /obj/machinery/computer/security/telescreen{ desc = "Used for watching Prison Wing holding areas."; dir = 1; @@ -7534,6 +7631,7 @@ /obj/structure/table, /obj/item/storage/box/cups, /turf/simulated/floor/plasteel{ + dir = 5; icon_state = "cafeteria" }, /area/security/brig) @@ -8064,7 +8162,9 @@ name = "Labor Camp Monitoring"; network = list("Labor") }, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/brig) "auN" = ( /obj/structure/table, @@ -8080,7 +8180,9 @@ /obj/structure/window/reinforced{ dir = 4 }, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/brig) "auO" = ( /obj/structure/cable/yellow{ @@ -8172,6 +8274,7 @@ "auU" = ( /obj/machinery/vending/cigarette, /turf/simulated/floor/plasteel{ + dir = 5; icon_state = "cafeteria" }, /area/security/brig) @@ -8186,6 +8289,7 @@ "auW" = ( /obj/structure/reagent_dispensers/water_cooler, /turf/simulated/floor/plasteel{ + dir = 5; icon_state = "cafeteria" }, /area/security/brig) @@ -8239,7 +8343,10 @@ req_access_txt = "3" }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "dark" + }, /area/security/warden) "avc" = ( /obj/machinery/light/small{ @@ -8723,7 +8830,9 @@ /obj/machinery/computer/shuttle/labor{ dir = 4 }, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/brig) "awj" = ( /obj/structure/chair/office/dark{ @@ -8735,7 +8844,9 @@ icon_state = "right"; name = "Labor Camp Desk" }, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/brig) "awn" = ( /obj/structure/cable{ @@ -9418,7 +9529,9 @@ /obj/machinery/computer/prisoner{ dir = 4 }, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/brig) "axH" = ( /obj/structure/chair/stool, @@ -14336,7 +14449,9 @@ /obj/structure/window/reinforced{ dir = 4 }, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/brig) "aIE" = ( /obj/structure/cable/yellow{ @@ -37717,15 +37832,8 @@ /turf/simulated/floor/plasteel/dark, /area/bridge) "bHE" = ( -/obj/structure/bed, -/obj/item/bedsheet, -/obj/structure/chair{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "floorgrime" - }, -/area/security/brig) +/turf/simulated/wall/r_wall, +/area/security/seceqstorage) "bHG" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 @@ -71991,7 +72099,7 @@ /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, -/area/security/main) +/area/security/seceqstorage) "dom" = ( /obj/structure/reagent_dispensers/fueltank, /obj/item/radio/intercom{ @@ -74806,6 +74914,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/quartermaster/storage) +"kfV" = ( +/obj/machinery/vending/secdrobe, +/obj/machinery/alarm{ + dir = 8; + name = "east bump"; + pixel_x = 24 + }, +/turf/simulated/floor/plasteel{ + icon_state = "showroomfloor" + }, +/area/security/seceqstorage) "kgn" = ( /obj/structure/girder, /obj/structure/grille, @@ -76275,6 +76394,15 @@ }, /turf/simulated/floor/plating, /area/maintenance/asmaint) +"nZM" = ( +/obj/machinery/flasher/portable, +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/alarm{ + name = "north bump"; + pixel_y = 24 + }, +/turf/simulated/floor/plasteel, +/area/security/armoury) "oaH" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -77937,7 +78065,7 @@ /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, -/area/security/main) +/area/security/seceqstorage) "spj" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -78333,7 +78461,7 @@ /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, -/area/security/main) +/area/security/seceqstorage) "tAn" = ( /obj/structure/cable{ d1 = 4; @@ -78364,7 +78492,7 @@ }, /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, -/area/security/main) +/area/security/seceqstorage) "tEB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -105535,7 +105663,7 @@ abB ahT aiK ajI -ajV +abB agA agA agA @@ -105792,7 +105920,7 @@ abq abq abq abq -agA +abq agA ajQ akV @@ -106046,12 +106174,12 @@ abq abq abq abq +ajV +ajV +ajV +ajV agA -agA -agA -agA -agA -akW +nZM akW hIT ala @@ -106302,12 +106430,12 @@ aaa aaa abq abq -agA -agA +ajV +ajV aip ajh ajW -akL +apB akM alm anb @@ -106558,9 +106686,9 @@ aaa aaa aaa abq -agA -agA -ahV +ajV +ajV +aiw ahU ahU akc @@ -106815,7 +106943,7 @@ aaa aaa aaa abq -agA +ajV agY ahU aiM @@ -107072,13 +107200,13 @@ aaa aaa abq agc -agA +ajV ahf ahU aiP ajM akg -agA +ajV alH alX anN @@ -107329,7 +107457,7 @@ aaa aaa aaa abq -agA +ajV ahe aiq aiO @@ -107586,13 +107714,13 @@ aaa aaa aaa abq -agA -agA +ajV +ajV aiw ahU ahU akA -agA +ajV aks alY anO @@ -107844,16 +107972,16 @@ aaa aaa abq abq -agA -agA +ajV +ajV aiu ajo aku -agA +ajV alD alY tAk -atK +bHE aoq aoq arg @@ -108102,15 +108230,15 @@ aaa aaa abq abq -agA -agA -agA -agA -agA +ajV +ajV +ajV +ajV +ajV alG alY amq -atK +bHE aot apv aqR @@ -108363,11 +108491,11 @@ abq abq abq abq -atK +bHE alC dnu alS -atK +bHE aoj apu aqQ @@ -108620,11 +108748,11 @@ aaa aaa aaa abq -atK -alH +bHE +kfV alY anR -atK +bHE aow aov aqT @@ -109651,7 +109779,7 @@ ajx agC amO akZ -apB +anW aqZ asi atC @@ -109918,7 +110046,7 @@ akD avj awI akD -bHE +aFg aGE aKc aBn diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 1260a292696..52f3562c870 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -129,7 +129,9 @@ /mob/living/simple_animal/bot/secbot/armsky{ auto_patrol = 1 }, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/securearmoury) "aco" = ( /obj/effect/decal/warning_stripes/southwest, @@ -250,11 +252,6 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/security/prisonershuttle) -"acH" = ( -/turf/simulated/floor/plasteel{ - icon_state = "floorgrime" - }, -/area/security/armoury) "acK" = ( /obj/machinery/alarm{ dir = 4; @@ -268,7 +265,9 @@ }, /obj/effect/decal/warning_stripes/east, /obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/securearmoury) "acL" = ( /obj/structure/table/reinforced, @@ -380,25 +379,21 @@ }, /area/security/prisonershuttle) "ada" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/hatch/gamma{ - locked = 1; - req_access_txt = "1"; - use_power = 0 +/obj/item/grenade/barrier, +/obj/structure/window/reinforced{ + dir = 8 }, -/turf/simulated/floor/plasteel/dark, -/area/security/prisonershuttle) +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "red" + }, +/area/security/armoury) "adb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -409,10 +404,7 @@ dir = 1; layer = 2.9 }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/suit_storage_unit/security, +/obj/structure/dispenser/oxygen, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -527,25 +519,16 @@ }, /area/security/prisonershuttle) "adt" = ( -/obj/structure/sign/securearea, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" +/obj/machinery/flasher/portable, +/obj/structure/window/reinforced{ + dir = 8 }, -/obj/effect/spawner/window/reinforced, -/turf/simulated/floor/plating, -/area/security/prisonershuttle) -"adv" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/structure/window/reinforced{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ - icon_state = "floorgrime" + dir = 9; + icon_state = "red" }, /area/security/armoury) "adw" = ( @@ -554,7 +537,9 @@ location = "Armory_South" }, /obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/securearmoury) "adx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -675,15 +660,11 @@ }, /area/security/prisonershuttle) "adP" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/closet/bombclosetsecurity, +/obj/effect/decal/warning_stripes/red/hollow, /turf/simulated/floor/plasteel{ - icon_state = "floorgrime" + dir = 4; + icon_state = "redcorner" }, /area/security/armoury) "adQ" = ( @@ -810,29 +791,18 @@ /turf/simulated/floor/plating, /area/security/prisonlockers) "aei" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/item/grenade/barrier, +/obj/structure/window/reinforced{ + dir = 8 }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" +/obj/machinery/status_display{ + layer = 4; + pixel_x = -32 }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "red" }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Warden's Office"; - req_access_txt = "3" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel/dark, /area/security/armoury) "aej" = ( /obj/structure/window/reinforced{ @@ -914,13 +884,16 @@ }, /area/security/range) "aew" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -1053,11 +1026,11 @@ /turf/simulated/floor/plasteel, /area/security/prisonershuttle) "aeR" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, +/obj/vehicle/secway, +/obj/item/key/security, /turf/simulated/floor/plasteel{ - icon_state = "floorgrime" + dir = 4; + icon_state = "redcorner" }, /area/security/armoury) "aeS" = ( @@ -1069,7 +1042,9 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /obj/effect/decal/warning_stripes/northwestcorner, /obj/effect/decal/warning_stripes/northeastcorner, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/securearmoury) "aeU" = ( /obj/structure/filingcabinet/chestdrawer, @@ -1184,7 +1159,9 @@ "afe" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/securearmoury) "aff" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -1225,7 +1202,9 @@ pixel_y = -28; req_access_txt = "2" }, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/warden) "afm" = ( /obj/structure/grille, @@ -1413,10 +1392,20 @@ }, /area/security/prisonershuttle) "agD" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/turf/simulated/floor/plasteel/dark, /area/security/warden) "agL" = ( /obj/structure/cable{ @@ -1427,7 +1416,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/warden) "agM" = ( /obj/structure/cable{ @@ -1495,24 +1486,33 @@ dir = 1 }, /obj/structure/rack, -/obj/item/storage/box/beanbag{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/storage/box/beanbag, -/obj/item/storage/box/beanbag{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/storage/box/beanbag{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/storage/box/beanbag, -/obj/item/storage/box/beanbag, /obj/structure/window/reinforced{ dir = 4 }, +/obj/item/storage/box/rubbershot{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/storage/box/rubbershot{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/storage/box/rubbershot{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/storage/box/beanbag{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/storage/box/beanbag{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/storage/box/beanbag{ + pixel_x = -3; + pixel_y = 3 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -1704,34 +1704,25 @@ /turf/space, /area/shuttle/gamma/station) "ahG" = ( -/obj/structure/table, -/obj/item/storage/toolbox/mechanical, -/obj/machinery/light{ - dir = 1 +/obj/machinery/flasher/portable, +/obj/structure/window/reinforced{ + dir = 8 }, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 28 +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "red" }, -/obj/item/storage/box/chemimp{ - pixel_x = 4; - pixel_y = 3 - }, -/obj/item/storage/box/trackimp, -/obj/item/storage/lockbox/mindshield, -/obj/effect/decal/warning_stripes/red/hollow, -/turf/simulated/floor/plasteel, /area/security/armoury) "ahH" = ( /obj/item/grenade/barrier, /obj/structure/window/reinforced{ - dir = 8 + dir = 4 }, /obj/structure/window/reinforced{ dir = 1 }, /turf/simulated/floor/plasteel{ - dir = 9; + dir = 5; icon_state = "red" }, /area/security/armoury) @@ -1750,41 +1741,37 @@ }, /area/security/brig) "ahR" = ( -/obj/item/grenade/barrier, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/hatch/gamma{ + locked = 1; + req_access_txt = "1"; + use_power = 0 }, /turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "red" + icon_state = "dark" }, /area/security/armoury) "ahS" = ( -/obj/machinery/flasher/portable, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 +/obj/machinery/alarm{ + dir = 8; + name = "east bump"; + pixel_x = 24 }, /turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "red" + dir = 4; + icon_state = "redcorner" }, /area/security/armoury) "ahT" = ( /obj/machinery/flasher/portable, /obj/structure/window/reinforced{ - dir = 8 + dir = 4 }, /obj/structure/window/reinforced{ dir = 1 }, /turf/simulated/floor/plasteel{ - dir = 9; + dir = 5; icon_state = "red" }, /area/security/armoury) @@ -1799,12 +1786,16 @@ }, /obj/effect/decal/warning_stripes/northwest, /obj/effect/decal/warning_stripes/southeastcorner, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/securearmoury) "ahV" = ( /obj/effect/decal/warning_stripes/north, /obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/securearmoury) "ahW" = ( /obj/machinery/ai_status_display{ @@ -1812,7 +1803,12 @@ }, /obj/effect/decal/warning_stripes/northeast, /obj/effect/decal/warning_stripes/southwestcorner, -/turf/simulated/floor/plasteel/dark, +/obj/item/storage/secure/safe{ + pixel_x = 32 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/securearmoury) "ahX" = ( /obj/structure/chair/stool{ @@ -1863,14 +1859,10 @@ "aif" = ( /obj/item/grenade/barrier, /obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/status_display{ - layer = 4; - pixel_x = -32 + dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 10; + dir = 6; icon_state = "red" }, /area/security/armoury) @@ -1878,32 +1870,42 @@ /turf/simulated/wall/r_wall, /area/security/hos) "aij" = ( -/obj/item/grenade/barrier, -/obj/structure/window/reinforced{ - dir = 4 +/obj/structure/table, +/obj/item/storage/toolbox/mechanical, +/obj/machinery/light{ + dir = 1 }, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "red" +/obj/item/radio/intercom{ + name = "north bump"; + pixel_y = 28 }, +/obj/item/storage/box/chemimp{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/item/storage/box/trackimp, +/obj/item/storage/lockbox/mindshield, +/obj/effect/decal/warning_stripes/red/hollow, +/turf/simulated/floor/plasteel, /area/security/armoury) "aik" = ( -/obj/machinery/flasher/portable, -/obj/structure/window/reinforced{ - dir = 4 +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/hatch/gamma{ + locked = 1; + req_access_txt = "1"; + use_power = 0 }, /turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "red" + icon_state = "dark" }, -/area/security/armoury) +/area/security/prisonershuttle) "ain" = ( /obj/machinery/flasher/portable, /obj/structure/window/reinforced{ - dir = 8 + dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 10; + dir = 6; icon_state = "red" }, /area/security/armoury) @@ -1923,7 +1925,9 @@ }, /obj/effect/decal/warning_stripes/east, /obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/securearmoury) "aip" = ( /obj/structure/window/reinforced{ @@ -1970,7 +1974,9 @@ }, /obj/effect/decal/warning_stripes/west, /obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/securearmoury) "ait" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -1993,6 +1999,31 @@ /turf/simulated/wall/r_wall, /area/security/securearmoury) "aiw" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" + }, +/area/security/armoury) +"aix" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/newscaster/security_unit{ + pixel_y = 32 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "red" + }, +/area/security/brig) +"aiz" = ( /obj/machinery/power/apc{ cell_type = 5000; dir = 8; @@ -2012,29 +2043,6 @@ icon_state = "redcorner" }, /area/security/armoury) -"aix" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/newscaster/security_unit{ - pixel_y = 32 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "red" - }, -/area/security/brig) -"aiz" = ( -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "redcorner" - }, -/area/security/armoury) "aiA" = ( /obj/structure/cable{ d1 = 1; @@ -2106,7 +2114,9 @@ }, /obj/effect/decal/warning_stripes/west, /obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/securearmoury) "aiP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -2355,18 +2365,6 @@ icon_state = "floorgrime" }, /area/security/permabrig) -"ajj" = ( -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plasteel/dark, -/area/security/securearmoury) -"ajk" = ( -/obj/vehicle/secway, -/obj/item/key/security, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "redcorner" - }, -/area/security/armoury) "ajl" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel, @@ -2382,9 +2380,18 @@ }, /area/security/brig) "ajn" = ( -/obj/structure/sign/securearea, -/turf/simulated/wall/r_wall, -/area/security/armoury) +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/obj/machinery/suit_storage_unit/security, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/security/securearmoury) "ajo" = ( /obj/structure/cable{ d1 = 1; @@ -2393,7 +2400,9 @@ }, /obj/effect/decal/warning_stripes/east, /obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/securearmoury) "ajp" = ( /obj/structure/cable{ @@ -2475,7 +2484,9 @@ "ajL" = ( /obj/effect/decal/warning_stripes/west, /obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/securearmoury) "ajM" = ( /obj/structure/cable{ @@ -2636,7 +2647,9 @@ /area/security/brig) "akf" = ( /obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/securearmoury) "akg" = ( /obj/structure/cable{ @@ -2728,13 +2741,11 @@ }, /area/security/brig) "akl" = ( -/obj/machinery/door/airlock/security{ - name = "Warden's office"; - req_access = null; - req_access_txt = "3" +/obj/effect/decal/warning_stripes/north, +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/turf/simulated/floor/plasteel/dark, -/area/security/armoury) +/area/security/securearmoury) "akm" = ( /obj/structure/table, /obj/item/reagent_containers/food/drinks/mug/sec{ @@ -2789,9 +2800,15 @@ /obj/structure/window/reinforced{ dir = 4 }, +/obj/item/shield/riot{ + pixel_x = -3; + pixel_y = 3 + }, /obj/item/shield/riot, -/obj/item/shield/riot, -/obj/item/shield/riot, +/obj/item/shield/riot{ + pixel_x = 3; + pixel_y = -3 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -2813,7 +2830,9 @@ "akw" = ( /obj/effect/decal/warning_stripes/east, /obj/effect/decal/warning_stripes/northwestcorner, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/securearmoury) "akx" = ( /obj/structure/cable{ @@ -3110,37 +3129,17 @@ icon_state = "cult" }, /area/lawoffice) -"ale" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/hatch/gamma{ - locked = 1; - req_access_txt = "1"; - use_power = 0 - }, -/turf/simulated/floor/plasteel/dark, -/area/security/armoury) "alf" = ( -/obj/machinery/vending/security, -/obj/machinery/firealarm{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, -/obj/item/radio/intercom/department/security{ - pixel_x = -28 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "redcorner" - }, -/area/security/armoury) -"alg" = ( /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" }, /area/security/armoury) "alh" = ( +/obj/structure/sign/securearea, +/turf/simulated/wall/r_wall, +/area/security/armoury) +"ali" = ( /obj/structure/closet/l3closet/security, /obj/effect/decal/warning_stripes/red/hollow, /turf/simulated/floor/plasteel{ @@ -3148,26 +3147,15 @@ icon_state = "redcorner" }, /area/security/armoury) -"ali" = ( -/obj/structure/closet/bombclosetsecurity, -/obj/effect/decal/warning_stripes/red/hollow, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "redcorner" - }, -/area/security/armoury) "alj" = ( -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, /obj/structure/cable{ d1 = 2; d2 = 4; icon_state = "2-4" }, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/securearmoury) "alk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -3191,7 +3179,9 @@ d2 = 8; icon_state = "1-8" }, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/securearmoury) "all" = ( /obj/structure/cable{ @@ -3204,14 +3194,18 @@ d2 = 8; icon_state = "2-8" }, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/securearmoury) "alm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/securearmoury) "aln" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -3222,7 +3216,9 @@ d2 = 8; icon_state = "2-8" }, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/securearmoury) "alo" = ( /obj/machinery/door/firedoor, @@ -3514,7 +3510,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/warden) "alU" = ( /obj/structure/cable{ @@ -3535,8 +3533,10 @@ name = "Warden's Office"; req_access_txt = "3" }, -/turf/simulated/floor/plasteel/dark, -/area/security/warden) +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/security/securearmoury) "alW" = ( /obj/structure/cable, /obj/effect/spawner/window/reinforced, @@ -3550,7 +3550,9 @@ id_tag = "Secure Armory"; name = "Secure Armory Shutters" }, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/securearmoury) "alY" = ( /obj/structure/cable, @@ -3569,7 +3571,9 @@ name = "Secure Armory"; req_access_txt = "3" }, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/securearmoury) "ama" = ( /obj/structure/closet, @@ -3742,14 +3746,9 @@ /turf/simulated/floor/plating, /area/maintenance/fore) "amy" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel/dark, /area/security/warden) "amz" = ( /turf/simulated/floor/plasteel{ @@ -3781,7 +3780,9 @@ d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/warden) "amC" = ( /obj/structure/closet/secure_closet/warden, @@ -4178,18 +4179,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plating, /area/security/permabrig) -"anv" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/plasteel/dark, -/area/security/warden) "anw" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -4234,7 +4223,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/warden) "anz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -4243,7 +4234,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/warden) "anA" = ( /turf/simulated/wall, @@ -4259,7 +4252,9 @@ d2 = 8; icon_state = "1-8" }, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/warden) "anC" = ( /obj/machinery/door/firedoor, @@ -4494,7 +4489,9 @@ /turf/simulated/floor/plasteel, /area/security/main) "anW" = ( -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" + }, /area/security/armoury) "anX" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -4659,19 +4656,6 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/security/prison/cell_block/A) -"aor" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/plasteel/dark, -/area/security/warden) "aos" = ( /obj/structure/chair/office/dark, /obj/structure/cable{ @@ -4680,7 +4664,17 @@ icon_state = "4-8" }, /obj/effect/landmark/start/warden, -/turf/simulated/floor/plasteel/dark, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/warden) "aot" = ( /obj/structure/cable{ @@ -4696,7 +4690,9 @@ /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/warden) "aou" = ( /obj/structure/cable{ @@ -4704,12 +4700,16 @@ d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/warden) "aov" = ( /obj/structure/chair/office/dark, /obj/effect/landmark/start/warden, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/security/warden) "aow" = ( /obj/machinery/flasher{ @@ -5781,9 +5781,13 @@ /turf/simulated/floor/plating, /area/security/permabrig) "aqR" = ( +/obj/machinery/door/airlock/security{ + name = "Warden's office"; + req_access = null; + req_access_txt = "3" + }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "redcorner" + icon_state = "dark" }, /area/security/armoury) "aqS" = ( @@ -20779,34 +20783,7 @@ /turf/simulated/floor/plasteel/dark, /area/medical/morgue) "aYm" = ( -/obj/structure/rack, -/obj/item/storage/box/seccarts{ - pixel_x = 3; - pixel_y = 2 - }, -/obj/item/storage/box/handcuffs, -/obj/item/storage/box/flashbangs{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/item/storage/box/handcuffs, -/obj/item/storage/box/teargas{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, -/obj/effect/decal/warning_stripes/red/hollow, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "redcorner" - }, +/turf/simulated/floor/plasteel, /area/security/armoury) "aYn" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -57041,6 +57018,12 @@ /obj/effect/spawner/random_spawners/cobweb_left_rare, /turf/simulated/floor/plating, /area/maintenance/apmaint) +"cwE" = ( +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "redcorner" + }, +/area/security/armoury) "cwF" = ( /obj/structure/closet/wardrobe/pjs, /obj/effect/spawner/random_spawners/blood_often, @@ -76970,6 +76953,33 @@ }, /turf/simulated/wall/r_wall, /area/maintenance/fore) +"dFp" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/security/glass{ + name = "Warden's Office"; + req_access_txt = "3" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/security/armoury) "dLF" = ( /obj/machinery/door/poddoor{ density = 0; @@ -77368,6 +77378,18 @@ /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/engine, /area/engine/engineering) +"frq" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" + }, +/area/security/armoury) "fAw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow, /obj/machinery/tcomms/core/station, @@ -77377,6 +77399,9 @@ }, /turf/simulated/floor/plasteel/dark, /area/tcommsat/chamber) +"fEC" = ( +/turf/simulated/wall/r_wall, +/area/security/warden) "fFY" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -77475,6 +77500,21 @@ /obj/machinery/light, /turf/simulated/floor/plasteel/dark, /area/engine/engineering) +"gaw" = ( +/obj/machinery/vending/security, +/obj/machinery/firealarm{ + dir = 1; + name = "south bump"; + pixel_y = -24 + }, +/obj/item/radio/intercom/department/security{ + pixel_x = -28 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "redcorner" + }, +/area/security/armoury) "gei" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 @@ -77884,6 +77924,19 @@ }, /turf/simulated/floor/plasteel/white, /area/medical/medbay2) +"iwX" = ( +/obj/machinery/light_switch{ + dir = 4; + name = "west bump"; + pixel_x = -24 + }, +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = -32 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/security/securearmoury) "iyj" = ( /obj/structure/cable{ d1 = 1; @@ -79139,6 +79192,18 @@ /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/engine, /area/engine/engineering) +"qoH" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/security/warden) "qoT" = ( /obj/structure/table, /obj/item/clothing/gloves/color/black, @@ -79515,6 +79580,19 @@ icon_state = "yellow" }, /area/engine/chiefs_office) +"sMS" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkred" + }, +/area/security/warden) "sPb" = ( /obj/machinery/alarm{ name = "north bump"; @@ -79749,6 +79827,10 @@ /area/engine/engineering) "ufw" = ( /obj/structure/closet/wardrobe/orange, +/obj/machinery/status_display{ + layer = 4; + pixel_y = 32 + }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "red" @@ -79875,21 +79957,21 @@ /turf/simulated/floor/engine, /area/engine/engineering) "uZb" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, /obj/structure/cable{ d1 = 2; d2 = 8; icon_state = "2-8" }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, /obj/structure/cable{ d2 = 2; icon_state = "0-2" }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/security/prisonlockers) "uZx" = ( @@ -80178,13 +80260,14 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/dorms) "xed" = ( -/obj/effect/spawner/window/reinforced, +/obj/structure/sign/securearea, /obj/structure/cable{ - d2 = 4; - icon_state = "0-4" + d2 = 8; + icon_state = "0-8" }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, -/area/security/prisonlockers) +/area/security/prisonershuttle) "xfQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -80275,23 +80358,41 @@ /turf/simulated/floor/engine, /area/engine/engineering) "xSD" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" +/obj/structure/rack, +/obj/item/storage/box/seccarts{ + pixel_x = 3; + pixel_y = 2 }, -/turf/simulated/floor/plating, -/area/security/prisonlockers) +/obj/item/storage/box/handcuffs, +/obj/item/storage/box/flashbangs{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/storage/box/handcuffs, +/obj/item/storage/box/teargas{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/light_switch{ + dir = 4; + name = "west bump"; + pixel_x = -24 + }, +/obj/effect/decal/warning_stripes/red/hollow, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "redcorner" + }, +/area/security/armoury) "xVt" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel, /area/crew_quarters/dorms) "xVM" = ( /obj/structure/closet/secure_closet/brig, -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, /obj/machinery/light{ dir = 1 }, @@ -80307,9 +80408,18 @@ /turf/space, /area/space/nearstation) "xWL" = ( -/obj/structure/table, -/turf/simulated/floor/plasteel, -/area/security/prisonershuttle) +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/hologram/holopad, +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" + }, +/area/security/armoury) "xWN" = ( /obj/structure/cable{ d1 = 1; @@ -105386,14 +105496,14 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa +aMr +afO +abM +aab +awB +aik +xed awB -auV -aec -xWL akZ goy goy @@ -105643,14 +105753,14 @@ aaa aaa aaa aaa -aMr afO -abM -aab -awB -ada -adt -awB +ahF +ahF +ahF +ahF +ahF +ahF +ahF akZ ufw hEu @@ -105900,7 +106010,7 @@ aaa aaa aaa aaa -afO +abM ahF ahF ahF @@ -105908,7 +106018,7 @@ ahF ahF ahF ahF -akZ +aeh xVM ncT ydz @@ -106157,7 +106267,7 @@ aaa aaa aaa aaa -abM +aab ahF ahF ahF @@ -106165,7 +106275,7 @@ ahF ahF ahF ahF -xed +aeg lgS iTq ydz @@ -106671,7 +106781,7 @@ aaa aaa aaa aaa -aab +abM ahF ahF ahF @@ -106679,7 +106789,7 @@ ahF ahF ahF ahF -xSD +dsM lgS kdy uIO @@ -106928,7 +107038,7 @@ aaa aaa aaa abM -abM +afX ahF ahF ahF @@ -107186,14 +107296,14 @@ aaa abM afX afX -ahF -ahF -ahF -ahF -ahF -ahF -ahF -akZ +agt +agt +agt +ahR +agt +agt +agt +agt vDY tCY egq @@ -107442,14 +107552,14 @@ aaa abM afX afm -afX -agt -agt -agt -ale -agt -agt +aaa agt +ada +aei +alf +aiz +xSD +gaw agt aqv aqv @@ -107703,11 +107813,11 @@ aaa agt ahH aif -alg +anW aiw aYm alf -agt +alU aey aeU afk @@ -107958,14 +108068,14 @@ abM aaa aaa agt -ahR +agt aij -acH +aYm aew -anW -alg -alU -amz +xWL +frq +dFp +sMS agD aos apg @@ -108215,16 +108325,16 @@ aaa aaa aaa agt -agt +adt ahG anW adb -adv +anW adP -aei +apP amy -anv -aor +anz +aou apf aqw aqX @@ -108474,11 +108584,11 @@ aaa agt ahT ain -acH +ahS aeR -acH +cwE ali -apP +agt amz anz aou @@ -108729,17 +108839,17 @@ aab aaa aaa agt -ahS -aik -aiz -ajk +agt +agt +agt +alh aqR alh agt amA any aot -amy +qoH alT agM ash @@ -108985,14 +109095,14 @@ afX aab aaa aaa -agt -agt -agt -agt +aaa +aaa +aaa +aiv ajn akl -ajn -agt +iwX +fEC amC agL afl @@ -109247,7 +109357,7 @@ aab aaa aiv adg -ajj +akl alj alV amB @@ -109504,7 +109614,7 @@ aiv aiv aiv adh -ajj +akl all alW amE