From 4dd0d32d13a0a346c4793fba8aa8ff7fc616ed56 Mon Sep 17 00:00:00 2001 From: FlitchTime Date: Thu, 19 Dec 2024 10:30:44 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=B5=D0=BA=D0=B0=D0=BB=D0=B8,=20=D1=81?= =?UTF-8?q?=D0=BE=D1=80=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B0,=20?= =?UTF-8?q?=D0=BF=D0=B8=D0=BA=D1=81=D0=B5=D0=BB=D1=8C=D1=88=D0=B8=D1=84?= =?UTF-8?q?=D1=82,=20=D0=BA=D0=B0=D1=80=D0=B3=D0=BE,=20=D1=81=D1=83=D0=BC?= =?UTF-8?q?=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _maps/map_files/Delta/delta.dmm | 239 +++--- _maps/map_files/celestation/celestation.dmm | 733 +++++++++--------- _maps/map_files/cerestation/cerestation.dmm | 700 +++++++++-------- _maps/map_files/cyberiad/cyberiad.dmm | 206 +++-- _maps/map_files/nova/nova.dmm | 275 ++++--- code/datums/supplypacks.dm | 20 +- .../objects/items/weapons/storage/backpack.dm | 22 +- 7 files changed, 1150 insertions(+), 1045 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 1b185ff4b54..4b7da603c3c 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -16459,12 +16459,18 @@ layer = 2.9 }, /obj/effect/decal/warning_stripes/red/hollow, -/obj/item/shield/riot, -/obj/item/shield/riot, -/obj/item/shield/riot, -/obj/item/shield/riot, -/obj/structure/window/reinforced{ - dir = 8 +/obj/item/storage/box/flashbangs, +/obj/item/storage/box/flashbangs{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/grenade/flashbang{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/grenade/flashbang{ + pixel_x = 3; + pixel_y = -3 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -19107,6 +19113,7 @@ pixel_x = 6; pixel_y = -6 }, +/obj/effect/decal/warning_stripes/red/hollow, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -33005,8 +33012,7 @@ pixel_x = -4 }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "vault" + icon_state = "dark" }, /area/security/securearmory) "dtm" = ( @@ -40484,6 +40490,9 @@ pixel_x = 6; pixel_y = -6 }, +/obj/structure/window/reinforced{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -57021,18 +57030,27 @@ /turf/simulated/floor/plasteel, /area/engineering/engine) "hWb" = ( -/obj/effect/decal/warning_stripes/red/hollow, /obj/structure/rack{ dir = 8; layer = 2.9 }, -/obj/item/storage/lockbox/mindshield, -/obj/item/storage/box/trackimp, -/obj/item/storage/box/chemimp{ - pixel_x = 4; +/obj/effect/decal/warning_stripes/red/hollow, +/obj/item/shield/riot{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/shield/riot, +/obj/item/shield/riot{ + pixel_x = 3; pixel_y = 3 }, -/obj/item/lock_buster, +/obj/item/shield/riot{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -57755,6 +57773,8 @@ pixel_x = 3; pixel_y = -3 }, +/obj/effect/decal/warning_stripes/red/hollow, +/obj/structure/window/reinforced, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -63622,6 +63642,9 @@ /area/bridge/vip) "jBm" = ( /obj/effect/decal/warning_stripes/northeast, +/obj/item/radio/intercom{ + pixel_x = 28 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -63827,11 +63850,10 @@ }, /area/crew_quarters/kitchen) "jDw" = ( -/obj/effect/decal/warning_stripes/red, -/obj/structure/closet/l3closet/security, -/obj/structure/window/reinforced, +/obj/machinery/flasher/portable, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 8; + icon_state = "vault" }, /area/security/securearmory) "jDz" = ( @@ -65535,17 +65557,12 @@ }, /area/crew_quarters/theatre) "kaB" = ( +/obj/effect/decal/warning_stripes/red/hollow, +/obj/item/clothing/suit/armor/laserproof, /obj/structure/rack{ dir = 8; layer = 2.9 }, -/obj/structure/window/reinforced, -/obj/item/gun/energy/ionrifle, -/obj/machinery/door/window{ - dir = 8; - name = "Secure Armory"; - req_access = list(1) - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -72529,26 +72546,26 @@ }, /area/medical/virology/lab) "lSA" = ( -/obj/structure/window/reinforced{ - dir = 4 +/obj/effect/decal/warning_stripes/red/hollow, +/obj/item/ammo_box/magazine/enforcer/lethal{ + pixel_x = -6; + pixel_y = 6 }, -/obj/structure/rack{ - dir = 8; - layer = 2.9 +/obj/item/ammo_box/magazine/enforcer/lethal{ + pixel_x = -3; + pixel_y = 3 }, -/obj/effect/decal/warning_stripes/red/hollow, -/obj/item/storage/box/flashbangs, -/obj/item/storage/box/flashbangs{ +/obj/item/ammo_box/magazine/enforcer/lethal, +/obj/item/ammo_box/magazine/enforcer/lethal{ pixel_x = 3; pixel_y = -3 }, -/obj/item/grenade/flashbang{ - pixel_x = 6; - pixel_y = -6 +/obj/structure/closet/secure_closet/guncabinet{ + anchored = 1; + name = "Lethal Bullets" }, -/obj/item/grenade/flashbang{ - pixel_x = 3; - pixel_y = -3 +/obj/structure/window/reinforced{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -80219,11 +80236,11 @@ }, /area/medical/virology/lab) "nGa" = ( -/obj/effect/decal/warning_stripes/red/hollow, /obj/machinery/flasher/portable, /obj/structure/window/reinforced, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 8; + icon_state = "vault" }, /area/security/securearmory) "nGg" = ( @@ -85323,13 +85340,11 @@ /obj/structure/rack/gunrack, /obj/effect/decal/warning_stripes/red/hollow, /obj/item/gun/energy/laser{ - pixel_x = -8 - }, -/obj/item/gun/energy/laser{ - pixel_x = 10 + pixel_x = -6 }, +/obj/item/gun/energy/laser, /obj/item/gun/energy/laser{ - pixel_x = 1 + pixel_x = 6 }, /obj/structure/window/reinforced{ dir = 1 @@ -86326,6 +86341,17 @@ icon_state = "red" }, /area/security/customs) +"pcu" = ( +/obj/machinery/flasher/portable, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "vault" + }, +/area/security/securearmory) "pcG" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -89771,7 +89797,7 @@ /turf/simulated/floor/plasteel, /area/security/securehallway) "pNI" = ( -/obj/effect/decal/warning_stripes/north, +/obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -96696,8 +96722,7 @@ pixel_x = -7 }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "vault" + icon_state = "dark" }, /area/security/securearmory) "rrr" = ( @@ -97704,11 +97729,10 @@ }, /area/security/customs) "rDM" = ( -/obj/machinery/flasher/portable, -/obj/effect/decal/warning_stripes/red/hollow, +/obj/structure/closet/l3closet/security, +/obj/effect/decal/warning_stripes/red, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "vault" + icon_state = "dark" }, /area/security/securearmory) "rDP" = ( @@ -97960,14 +97984,23 @@ /turf/simulated/floor/plating, /area/maintenance/starboardsolar) "rGK" = ( -/obj/machinery/flasher/portable, /obj/effect/decal/warning_stripes/red/hollow, +/obj/structure/rack{ + dir = 8; + layer = 2.9 + }, +/obj/item/storage/lockbox/mindshield, +/obj/item/storage/box/trackimp, +/obj/item/storage/box/chemimp{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/item/lock_buster, /obj/structure/window/reinforced{ dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "vault" + icon_state = "dark" }, /area/security/securearmory) "rGM" = ( @@ -97987,8 +98020,7 @@ }, /obj/machinery/suit_storage_unit/security, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "vault" + icon_state = "dark" }, /area/security/securearmory) "rHl" = ( @@ -98166,7 +98198,10 @@ /area/medical/research/nhallway) "rJG" = ( /obj/machinery/suit_storage_unit/security, -/obj/effect/decal/warning_stripes/red/hollow, +/obj/effect/decal/warning_stripes/red, +/obj/structure/window/reinforced{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -98365,7 +98400,6 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint4) "rLF" = ( -/obj/effect/decal/warning_stripes/east, /obj/effect/decal/warning_stripes/red/hollow, /obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/plasteel{ @@ -101031,11 +101065,11 @@ /obj/structure/rack/gunrack, /obj/structure/window/reinforced, /obj/item/gun/energy/gun{ - pixel_x = -7 + pixel_x = -6 }, /obj/item/gun/energy/gun, /obj/item/gun/energy/gun{ - pixel_x = 9 + pixel_x = 6 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -102508,12 +102542,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/asmaint2) -"sMP" = ( -/obj/machinery/hologram/holopad, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/security/securearmory) "sMS" = ( /obj/structure/cable{ icon_state = "1-2" @@ -104008,13 +104036,9 @@ pixel_x = 26 }, /obj/machinery/flasher/portable, -/obj/effect/decal/warning_stripes/red/hollow, -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 8; + icon_state = "vault" }, /area/security/securearmory) "tfk" = ( @@ -109435,24 +109459,9 @@ }, /area/security/securearmory) "uqM" = ( -/obj/structure/closet/secure_closet/guncabinet{ - anchored = 1; - name = "Lethal Bullets" - }, -/obj/item/ammo_box/magazine/enforcer/lethal{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/ammo_box/magazine/enforcer/lethal, -/obj/item/ammo_box/magazine/enforcer/lethal{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/ammo_box/magazine/enforcer/lethal{ - pixel_x = -6; - pixel_y = 6 - }, /obj/effect/decal/warning_stripes/red/hollow, +/obj/item/gun/energy/ionrifle, +/obj/structure/rack/gunrack, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -109479,11 +109488,13 @@ name = "Riot shotguns" }, /obj/item/gun/projectile/shotgun/riot{ - pixel_x = -7 + pixel_x = -3; + pixel_y = -3 }, /obj/item/gun/projectile/shotgun/riot, /obj/item/gun/projectile/shotgun/riot{ - pixel_x = 7 + pixel_x = 3; + pixel_y = 3 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -113469,17 +113480,7 @@ /obj/machinery/newscaster/security_unit{ pixel_x = 28 }, -/obj/structure/rack{ - dir = 8; - layer = 2.9 - }, -/obj/machinery/door/window{ - dir = 8; - name = "Secure Armory"; - req_access = list(1) - }, -/obj/structure/window/reinforced, -/obj/item/clothing/suit/armor/laserproof, +/obj/vehicle/ridden/secway, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -113953,15 +113954,14 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/item/ammo_box/shotgun{ - pixel_x = -3; - pixel_y = 6 - }, /obj/item/ammo_box/shotgun/buck{ + pixel_x = -3; pixel_y = 3 }, -/obj/item/ammo_box/shotgun/buck{ - pixel_x = 3 +/obj/item/ammo_box/shotgun/buck, +/obj/item/ammo_box/shotgun{ + pixel_x = 3; + pixel_y = -3 }, /obj/structure/closet/secure_closet/guncabinet{ anchored = 1; @@ -116485,6 +116485,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ icon_state = "darkredfull" }, @@ -121059,16 +121060,6 @@ icon_state = "whitepurple" }, /area/medical/research/shallway) -"xfi" = ( -/obj/item/radio/intercom{ - pixel_x = 28 - }, -/obj/vehicle/ridden/secway, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" - }, -/area/security/securearmory) "xfj" = ( /obj/machinery/light/small{ dir = 4 @@ -179057,7 +179048,7 @@ lYj tzh ciT igH -lhS +vYL lhS kNt tLv @@ -180079,7 +180070,7 @@ iUI lhS rJG tHS -sMP +toP qdp vNX pyk @@ -181368,9 +181359,9 @@ tfh nGa vpi kaB -vYL +pcu jDw -xfi +lhS lhS oHJ unN diff --git a/_maps/map_files/celestation/celestation.dmm b/_maps/map_files/celestation/celestation.dmm index 1d131dd8f5b..b50487c94c0 100644 --- a/_maps/map_files/celestation/celestation.dmm +++ b/_maps/map_files/celestation/celestation.dmm @@ -1312,9 +1312,7 @@ /turf/simulated/floor/carpet/green, /area/library) "alF" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "darkredfull" }, @@ -4862,8 +4860,22 @@ /turf/simulated/floor/glass, /area/security/prison/cell_block/A) "aOM" = ( -/obj/machinery/flasher/portable, /obj/effect/decal/warning_stripes/red/hollow, +/obj/structure/closet/secure_closet/guncabinet{ + anchored = 1; + name = "Magazines for SP-91-RC"; + req_access = list(1) + }, +/obj/item/ammo_box/magazine/sp91rc{ + pixel_x = 8 + }, +/obj/item/ammo_box/magazine/sp91rc{ + pixel_x = 4 + }, +/obj/item/ammo_box/magazine/sp91rc, +/obj/item/ammo_box/magazine/sp91rc{ + pixel_x = -4 + }, /obj/item/radio/intercom{ pixel_y = 28 }, @@ -9031,7 +9043,7 @@ /obj/item/clothing/shoes/jackboots/armored, /obj/item/clothing/shoes/jackboots/armored, /turf/simulated/floor/plasteel{ - dir = 1; + dir = 10; icon_state = "darkred" }, /area/security/armory) @@ -10970,6 +10982,12 @@ /turf/simulated/floor/plating/asteroid, /area/maintenance/cele/medbay) "bAW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkredaltstrip" @@ -12490,10 +12508,23 @@ }, /area/medical/cmostore) "bKc" = ( +/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 = 3; + pixel_y = -3 + }, +/obj/structure/closet/secure_closet/guncabinet{ + anchored = 1; + name = "Riot shotguns" + }, +/obj/effect/decal/warning_stripes/red/hollow, /obj/structure/railing/corner{ dir = 1 }, -/obj/machinery/suit_storage_unit/security, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "darkred" @@ -13594,10 +13625,11 @@ /turf/simulated/floor/wood/fancy/light, /area/security/hos) "bQd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plating, /area/security/main) "bQg" = ( @@ -19108,8 +19140,7 @@ /area/security/permabrig) "cyd" = ( /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "darkred" + icon_state = "dark" }, /area/security/armory) "cyi" = ( @@ -20004,20 +20035,8 @@ }, /area/security/brig) "cFr" = ( -/obj/structure/rack, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/item/ammo_box/shotgun/tranquilizer{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/ammo_box/shotgun/beanbag, -/obj/item/ammo_box/shotgun/beanbag, -/obj/item/ammo_box/shotgun/beanbag{ - pixel_x = -3; - pixel_y = 3 - }, +/obj/machinery/suit_storage_unit/security, +/obj/effect/decal/warning_stripes/red, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "darkred" @@ -26668,6 +26687,14 @@ icon_state = "neutralfull" }, /area/hallway/primary/fore/east) +"dGM" = ( +/obj/machinery/suit_storage_unit/security, +/obj/effect/decal/warning_stripes/red, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkred" + }, +/area/security/armory) "dGW" = ( /obj/machinery/door/airlock/public/glass{ name = "Central Access" @@ -28047,9 +28074,11 @@ }, /area/medical/genetics) "dUh" = ( +/obj/effect/decal/warning_stripes/red, /obj/machinery/newscaster/security_unit{ pixel_x = 32 }, +/obj/structure/closet/bombclosetsecurity, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkred" @@ -28935,17 +28964,15 @@ /turf/simulated/floor/engine, /area/toxins/misc_lab) "ega" = ( +/obj/structure/cable/orange{ + icon_state = "2-4" + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/structure/cable/orange{ - icon_state = "2-4" - }, -/obj/machinery/flasher/portable, -/obj/effect/decal/warning_stripes/red/hollow, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkred" @@ -29462,21 +29489,17 @@ }, /area/toxins/explab_chamber) "ekN" = ( -/obj/structure/rack, -/obj/item/clothing/suit/armor/laserproof, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/window{ - dir = 1; - name = "Secure Armory"; - req_access = list(1) +/obj/effect/decal/warning_stripes/red/hollow, +/obj/structure/rack/gunrack, +/obj/item/gun/energy/gun{ + pixel_x = -6 }, -/obj/item/gun/energy/ionrifle, -/obj/structure/sign/poster/official/ion_rifle{ - pixel_y = -32 +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun{ + pixel_x = 6 }, /turf/simulated/floor/plasteel{ + dir = 10; icon_state = "darkred" }, /area/security/armory) @@ -29837,6 +29860,14 @@ icon_state = "whiteyellow" }, /area/medical/medbay) +"epP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkredaltstrip" + }, +/area/security/armory) "eqe" = ( /obj/structure/chair/office/light{ dir = 1 @@ -31083,25 +31114,8 @@ }, /area/crew_quarters/bar/atrium) "eBQ" = ( -/obj/structure/closet/secure_closet/guncabinet{ - anchored = 1; - name = "Lethal Bullets" - }, -/obj/item/ammo_box/magazine/enforcer/lethal{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/ammo_box/magazine/enforcer/lethal, -/obj/item/ammo_box/magazine/enforcer/lethal{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/ammo_box/magazine/enforcer/lethal{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/ammo_box/magazine/enforcer/lethal, -/obj/item/ammo_box/magazine/enforcer/lethal, +/obj/machinery/suit_storage_unit/security, +/obj/effect/decal/warning_stripes/red, /turf/simulated/floor/plasteel{ icon_state = "darkred" }, @@ -31272,8 +31286,23 @@ }, /area/hallway/primary/central) "eEt" = ( -/obj/machinery/flasher/portable, +/obj/structure/closet/secure_closet/guncabinet{ + anchored = 1; + name = "Security SMG's" + }, +/obj/item/gun/projectile/automatic/wt550{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/gun/projectile/automatic/wt550, +/obj/item/gun/projectile/automatic/wt550{ + pixel_x = 3; + pixel_y = -3 + }, /obj/effect/decal/warning_stripes/red/hollow, +/obj/structure/window/reinforced{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkred" @@ -31903,7 +31932,7 @@ /obj/item/clothing/shoes/combat/riot, /obj/item/clothing/shoes/combat/riot, /turf/simulated/floor/plasteel{ - dir = 1; + dir = 9; icon_state = "darkred" }, /area/security/armory) @@ -33789,6 +33818,11 @@ "feR" = ( /turf/simulated/wall/r_wall, /area/medical/medbreak) +"feW" = ( +/turf/simulated/floor/plasteel{ + icon_state = "darkredfull" + }, +/area/security/armory) "feY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -36173,7 +36207,29 @@ /turf/simulated/floor/plating, /area/hallway/spacebridge/dockmed) "fCO" = ( -/obj/machinery/suit_storage_unit/security, +/obj/effect/decal/warning_stripes/red/hollow, +/obj/item/ammo_box/shotgun/buck{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/ammo_box/shotgun/buck, +/obj/item/ammo_box/shotgun{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/structure/closet/secure_closet/guncabinet{ + anchored = 1; + name = "Lethal Bullets" + }, +/obj/item/ammo_box/shotgun/beanbag, +/obj/item/ammo_box/shotgun/beanbag{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/ammo_box/shotgun/tranquilizer{ + pixel_x = -6; + pixel_y = 6 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkred" @@ -39706,7 +39762,7 @@ /obj/item/clothing/head/helmet/riot, /obj/item/clothing/head/helmet/riot, /turf/simulated/floor/plasteel{ - dir = 1; + dir = 5; icon_state = "darkred" }, /area/security/armory) @@ -46521,31 +46577,6 @@ icon_state = "neutral" }, /area/security/lobby) -"hxu" = ( -/obj/structure/rack, -/obj/item/grenade/barrier{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/grenade/barrier, -/obj/item/grenade/barrier{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/grenade/barrier{ - pixel_x = 6; - pixel_y = -6 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkred" - }, -/area/security/armory) "hxE" = ( /obj/machinery/light{ dir = 1 @@ -47202,34 +47233,7 @@ /area/security/execution) "hDF" = ( /obj/effect/decal/warning_stripes/red/hollow, -/obj/item/ammo_box/shotgun/buck{ - pixel_x = 3 - }, -/obj/item/ammo_box/shotgun/buck{ - pixel_y = 3 - }, -/obj/item/ammo_box/shotgun{ - pixel_x = -3; - pixel_y = 6 - }, -/obj/structure/closet/secure_closet/guncabinet{ - anchored = 1; - name = "Lethal Bullets" - }, -/obj/item/ammo_box/shotgun{ - pixel_x = -3; - pixel_y = 6 - }, -/obj/item/ammo_box/shotgun{ - pixel_x = -3; - pixel_y = 6 - }, -/obj/item/ammo_box/shotgun/buck{ - pixel_y = 3 - }, -/obj/item/ammo_box/shotgun/buck{ - pixel_y = 3 - }, +/obj/structure/dispenser/oxygen, /obj/machinery/ai_status_display{ pixel_y = -32 }, @@ -53643,6 +53647,12 @@ }, /area/teleporter/research) "iRq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "darkredaltstrip" }, @@ -55546,18 +55556,6 @@ icon_state = "neutralcorner" }, /area/crew_quarters/serviceyard) -"jjf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "darkredaltstrip" - }, -/area/security/armory) "jjg" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance/tripple, @@ -55892,16 +55890,6 @@ icon_state = "darkyellow" }, /area/engineering/mechanic_workshop/hangar) -"jnc" = ( -/obj/machinery/alarm{ - dir = 4; - pixel_x = -26 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "darkred" - }, -/area/security/armory) "jng" = ( /obj/machinery/door/poddoor/shutters/preopen{ dir = 2; @@ -59388,17 +59376,6 @@ icon_state = "caution" }, /area/atmos/distribution) -"jXF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkredfull" - }, -/area/security/armory) "jXK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -60062,24 +60039,8 @@ }, /area/medical/research) "kfn" = ( -/obj/structure/rack{ - dir = 8; - layer = 2.9 - }, /obj/effect/decal/warning_stripes/red/hollow, -/obj/item/ammo_box/shotgun/beanbag, -/obj/item/ammo_box/shotgun/beanbag{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/ammo_box/shotgun/tranquilizer{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/light, +/obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/plasteel{ icon_state = "darkred" }, @@ -61320,8 +61281,7 @@ }, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "darkred" + icon_state = "dark" }, /area/security/armory) "kqy" = ( @@ -62924,23 +62884,11 @@ /turf/simulated/floor/wood/fancy/oak, /area/hallway/primary/port) "kFc" = ( -/obj/item/gun/energy/laser{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/gun/energy/laser, -/obj/item/gun/energy/laser{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/rack/gunrack, -/obj/item/gun/energy/laser, +/obj/effect/decal/warning_stripes/red, /obj/machinery/status_display{ pixel_x = 32 }, +/obj/structure/closet/l3closet/security, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkred" @@ -69506,7 +69454,31 @@ }, /area/turret_protected/aisat) "lXa" = ( -/obj/machinery/flasher/portable, +/obj/structure/closet/secure_closet/guncabinet{ + anchored = 1; + name = "Magazines for SMG" + }, +/obj/item/ammo_box/magazine/wt550m9{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/ammo_box/magazine/wt550m9{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/ammo_box/magazine/wt550m9, +/obj/item/ammo_box/magazine/wt550m9{ + pixel_x = 2; + pixel_y = -2 + }, +/obj/item/ammo_box/magazine/wt550m9{ + pixel_x = 4; + pixel_y = -4 + }, +/obj/item/ammo_box/magazine/wt550m9{ + pixel_x = 6; + pixel_y = -6 + }, /obj/effect/decal/warning_stripes/red/hollow, /turf/simulated/floor/plasteel{ dir = 9; @@ -71398,6 +71370,29 @@ }, /turf/simulated/floor/plating, /area/crew_quarters/kitchen) +"mqp" = ( +/obj/structure/rack{ + dir = 8; + layer = 2.9 + }, +/obj/effect/decal/warning_stripes/red/hollow, +/obj/item/storage/box/flashbangs, +/obj/item/storage/box/flashbangs{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/grenade/flashbang{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/grenade/flashbang{ + pixel_x = 3; + pixel_y = -3 + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkred" + }, +/area/security/armory) "mqC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -73605,6 +73600,32 @@ icon_state = "grimy" }, /area/crew_quarters/heads/hop) +"mLO" = ( +/obj/structure/rack{ + dir = 8; + layer = 2.9 + }, +/obj/effect/decal/warning_stripes/red/hollow, +/obj/item/storage/box/teargas, +/obj/item/storage/box/teargas{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/grenade/chem_grenade/teargas{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/grenade/chem_grenade/teargas{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkred" + }, +/area/security/armory) "mLQ" = ( /obj/structure/girder, /turf/simulated/floor/plating/asteroid, @@ -76851,6 +76872,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/effect/decal/warning_stripes/red/hollow, +/obj/machinery/flasher/portable, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkred" @@ -78952,7 +78975,8 @@ }, /area/medical/genetics) "nPL" = ( -/obj/machinery/suit_storage_unit/security, +/obj/effect/decal/warning_stripes/red/hollow, +/obj/vehicle/ridden/secway, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "darkred" @@ -80708,6 +80732,8 @@ }, /area/medical/medbay2) "oiP" = ( +/obj/effect/decal/warning_stripes/red/hollow, +/obj/machinery/flasher/portable, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkred" @@ -86239,21 +86265,6 @@ icon_state = "whiteblue" }, /area/medical/cloning) -"pkA" = ( -/obj/structure/rack, -/obj/item/ammo_box/shotgun/tranquilizer{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/ammo_box/shotgun/beanbag, -/obj/item/ammo_box/shotgun/beanbag{ - pixel_x = -3; - pixel_y = 3 - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkred" - }, -/area/security/armory) "pkP" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -87214,25 +87225,11 @@ }, /area/security/lobby) "psw" = ( -/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 = 3; - pixel_y = -3 - }, -/obj/structure/rack/gunrack, -/obj/item/gun/projectile/shotgun/riot, -/obj/structure/window/reinforced, +/obj/machinery/suit_storage_unit/security, +/obj/effect/decal/warning_stripes/red, /obj/machinery/status_display{ pixel_x = -32 }, -/obj/machinery/door/window{ - name = "Secure Armory"; - req_access = list(1) - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkred" @@ -89631,24 +89628,6 @@ icon_state = "neutral" }, /area/toxins/misc_lab) -"pQf" = ( -/obj/item/gun/energy/gun{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/gun/energy/gun, -/obj/item/gun/energy/gun{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/structure/rack/gunrack, -/obj/item/gun/energy/gun, -/obj/structure/window/reinforced, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "darkred" - }, -/area/security/armory) "pQi" = ( /obj/structure/railing, /obj/machinery/door/firedoor/border_only, @@ -92975,26 +92954,8 @@ }, /area/clownoffice) "qyI" = ( -/obj/structure/rack{ - dir = 8; - layer = 2.9 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/window{ - name = "Secure Armory"; - req_access = list(1) - }, /obj/effect/decal/warning_stripes/red/hollow, -/obj/item/storage/lockbox/mindshield, -/obj/item/storage/box/trackimp, -/obj/item/storage/box/chemimp{ - pixel_x = 4; - pixel_y = 3 - }, -/obj/item/lock_buster, +/obj/machinery/flasher/portable, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "darkred" @@ -96806,6 +96767,7 @@ /obj/item/clothing/head/helmet/alt, /obj/item/clothing/head/helmet/alt, /turf/simulated/floor/plasteel{ + dir = 6; icon_state = "darkred" }, /area/security/armory) @@ -102058,35 +102020,8 @@ }, /area/toxins/xenobiology) "sps" = ( -/obj/structure/closet/secure_closet/guncabinet{ - anchored = 1; - name = "Magazines for SMG" - }, -/obj/item/ammo_box/magazine/wt550m9{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/ammo_box/magazine/wt550m9{ - pixel_x = -2; - pixel_y = 2 - }, -/obj/item/ammo_box/magazine/wt550m9, -/obj/item/ammo_box/magazine/wt550m9{ - pixel_x = 2; - pixel_y = -2 - }, -/obj/item/ammo_box/magazine/wt550m9{ - pixel_x = 4; - pixel_y = -4 - }, -/obj/item/ammo_box/magazine/wt550m9{ - pixel_x = 6; - pixel_y = -6 - }, -/obj/item/ammo_box/magazine/wt550m9, -/obj/item/ammo_box/magazine/wt550m9, -/obj/item/ammo_box/magazine/wt550m9, -/obj/item/ammo_box/magazine/wt550m9, +/obj/machinery/suit_storage_unit/security, +/obj/effect/decal/warning_stripes/red, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkred" @@ -102872,11 +102807,34 @@ }, /area/storage/primary) "sxN" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 +/obj/structure/rack{ + dir = 8; + layer = 2.9 + }, +/obj/effect/decal/warning_stripes/red/hollow, +/obj/item/shield/riot{ + pixel_x = -6; + pixel_y = -3 + }, +/obj/item/shield/riot{ + pixel_x = -3 + }, +/obj/item/shield/riot{ + pixel_y = 3 + }, +/obj/item/shield/riot{ + pixel_x = 3; + pixel_y = 6 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/sign/poster/official/random{ + pixel_x = 32 + }, +/obj/structure/window/reinforced{ + dir = 1 }, -/obj/structure/dispenser/oxygen, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkred" @@ -105346,8 +105304,21 @@ /turf/simulated/floor/wood/fancy/oak, /area/maintenance/gambling_den2) "sUZ" = ( -/obj/machinery/suit_storage_unit/security, -/obj/machinery/light, +/obj/effect/decal/warning_stripes/red/hollow, +/obj/structure/rack{ + dir = 8; + layer = 2.9 + }, +/obj/item/storage/lockbox/mindshield, +/obj/item/storage/box/trackimp, +/obj/item/storage/box/chemimp{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/item/lock_buster, +/obj/structure/window/reinforced{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "darkred" }, @@ -106018,11 +105989,26 @@ }, /area/civilian/vacantoffice) "tct" = ( -/obj/machinery/flasher/portable, /obj/effect/decal/warning_stripes/red/hollow, +/obj/structure/rack/gunrack, +/obj/item/gun/projectile/automatic/sp91rc{ + pixel_x = 7 + }, +/obj/item/gun/projectile/automatic/sp91rc{ + pixel_x = 2 + }, +/obj/item/gun/projectile/automatic/sp91rc{ + pixel_x = -2 + }, +/obj/item/gun/projectile/automatic/sp91rc{ + pixel_x = -7 + }, /obj/machinery/light{ dir = 1 }, +/obj/structure/window/reinforced{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkred" @@ -114709,7 +114695,16 @@ }, /area/medical/cmostore) "uGo" = ( -/obj/machinery/suit_storage_unit/security, +/obj/effect/decal/warning_stripes/red/hollow, +/obj/item/clothing/suit/armor/laserproof, +/obj/structure/rack{ + dir = 8; + layer = 2.9 + }, +/obj/item/gun/energy/ionrifle, +/obj/structure/sign/poster/official/ion_rifle{ + pixel_y = -32 + }, /turf/simulated/floor/plasteel{ icon_state = "darkred" }, @@ -117788,19 +117783,18 @@ }, /area/hallway/primary/fore) "vnx" = ( -/obj/structure/rack, -/obj/machinery/door/window{ - dir = 1; - name = "Secure Armory"; - req_access = list(1) +/obj/structure/rack/gunrack, +/obj/effect/decal/warning_stripes/red/hollow, +/obj/item/gun/energy/laser{ + pixel_x = -6 + }, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser{ + pixel_x = 6 }, /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/shield/riot, -/obj/item/shield/riot, -/obj/item/shield/riot, -/obj/item/shield/riot, /turf/simulated/floor/plasteel{ icon_state = "darkred" }, @@ -122210,8 +122204,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "darkred" + icon_state = "dark" }, /area/security/armory) "wgm" = ( @@ -122854,13 +122847,31 @@ }, /area/hydroponics) "wmu" = ( -/obj/structure/sign/poster/official/random{ - pixel_x = 32 +/obj/effect/decal/warning_stripes/red/hollow, +/obj/item/ammo_box/magazine/enforcer/lethal{ + pixel_x = -6; + pixel_y = 6 }, -/obj/machinery/light{ - dir = 4 +/obj/item/ammo_box/magazine/enforcer/lethal{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/ammo_box/magazine/enforcer/lethal, +/obj/item/ammo_box/magazine/enforcer/lethal{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/structure/closet/secure_closet/guncabinet{ + anchored = 1; + name = "Lethal Bullets" + }, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 26 + }, +/obj/structure/window/reinforced{ + dir = 1 }, -/obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkred" @@ -123363,16 +123374,6 @@ icon_state = "neutral" }, /area/hallway/secondary/entry/north) -"wrc" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/security/main) "wrg" = ( /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -124286,8 +124287,7 @@ "wAq" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "darkred" + icon_state = "dark" }, /area/security/armory) "wAt" = ( @@ -130178,23 +130178,11 @@ }, /area/crew_quarters/serviceyard) "xFV" = ( -/obj/structure/closet/secure_closet/guncabinet{ - anchored = 1; - name = "Security SMG's" - }, -/obj/item/gun/projectile/automatic/wt550{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/gun/projectile/automatic/wt550, -/obj/item/gun/projectile/automatic/wt550{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/gun/projectile/automatic/wt550, -/obj/machinery/door/window{ - name = "Secure Armory"; - req_access = list(1) +/obj/effect/decal/warning_stripes/red/hollow, +/obj/machinery/flasher/portable, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -26 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -130669,28 +130657,12 @@ }, /area/security/processing) "xKk" = ( -/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/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "darkred" + dir = 8; + icon_state = "darkredalt" }, /area/security/armory) "xKm" = ( @@ -131731,6 +131703,29 @@ }, /turf/simulated/floor/plasteel, /area/engineering/mechanic_workshop/expedition) +"xUf" = ( +/obj/structure/rack{ + dir = 8; + layer = 2.9 + }, +/obj/effect/decal/warning_stripes/red/hollow, +/obj/item/storage/box/barrier{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/storage/box/barrier, +/obj/item/grenade/barrier{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/grenade/barrier{ + pixel_x = 6; + pixel_y = -6 + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkred" + }, +/area/security/armory) "xUg" = ( /turf/simulated/floor/plasteel{ icon_state = "darkyellowfull" @@ -218554,7 +218549,7 @@ pNG eEt qJm vpy -hxu +xKk xKk ybD jkR @@ -218810,7 +218805,7 @@ rEc pNG aOM jgB -iWY +cyd bpY eLh wAq @@ -219324,12 +219319,12 @@ mWc pNG lHu fQm -iWY +cyd kYX xqw -iWY +cyd eGv -uGo +mqp pNG mWc pNG @@ -219586,7 +219581,7 @@ rnQ gic cyd eGv -uGo +xUf pNG mWc pNG @@ -219843,7 +219838,7 @@ ttu ttu vmo tbX -uGo +mLO pNG mWc pNG @@ -220098,7 +220093,7 @@ bKc fCO wmu sxN -iWY +cyd iWY nPL pNG @@ -283833,7 +283828,7 @@ sPj sPj lBY sPj -wrc +sPj bQd ffK aeM @@ -284090,8 +284085,8 @@ pNG pNG pNG pNG -wsO pNG +wsO pNG pNG aeM @@ -284347,8 +284342,8 @@ pNG qyI xFV psw +dGM xBi -jnc sps pNG aeM @@ -284604,7 +284599,7 @@ pNG oiP xJl jRb -jjf +jRb bAW eBQ pNG @@ -284860,8 +284855,8 @@ aeM pNG ntJ ngV +feW kkI -jXF iRq hDF pNG @@ -285119,7 +285114,7 @@ xjn aym mZK alF -iRq +epP kfn pNG aeM @@ -285377,7 +285372,7 @@ iUH ucp ucp aFu -pkA +eBQ pNG aeM aeM @@ -285633,7 +285628,7 @@ rmd puS dUh kFc -pQf +iWY cFr pNG aeM diff --git a/_maps/map_files/cerestation/cerestation.dmm b/_maps/map_files/cerestation/cerestation.dmm index 12a0d45fb06..84cc7f97449 100644 --- a/_maps/map_files/cerestation/cerestation.dmm +++ b/_maps/map_files/cerestation/cerestation.dmm @@ -4705,8 +4705,15 @@ }, /area/security/warden) "aOM" = ( -/obj/machinery/flasher/portable, /obj/effect/decal/warning_stripes/red/hollow, +/obj/structure/rack/gunrack, +/obj/item/gun/energy/gun{ + pixel_x = -6 + }, +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun{ + pixel_x = 6 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -5531,12 +5538,8 @@ }, /area/maintenance/starboard) "aUW" = ( -/obj/machinery/navbeacon{ - codes_txt = "patrol;next_patrol=Armory_South_East"; - location = "Armory_North" - }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + icon_state = "darkredalt" }, /area/security/armory) "aUY" = ( @@ -5694,9 +5697,26 @@ /turf/simulated/wall/r_wall, /area/bridge) "aVT" = ( -/obj/machinery/navbeacon{ - codes_txt = "patrol;next_patrol=Armory_South"; - location = "Armory_South_East" +/obj/structure/rack{ + dir = 8; + layer = 2.9 + }, +/obj/effect/decal/warning_stripes/red/hollow, +/obj/item/storage/box/teargas, +/obj/item/storage/box/teargas{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/grenade/chem_grenade/teargas{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/grenade/chem_grenade/teargas{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/structure/window/reinforced{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -7114,16 +7134,6 @@ /obj/structure/flora/grass/jungle, /turf/simulated/floor/grass, /area/hallway/secondary/garden) -"beX" = ( -/obj/structure/sign/poster/official/random{ - pixel_x = 32 - }, -/obj/machinery/suit_storage_unit/security, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" - }, -/area/security/armory) "beY" = ( /obj/machinery/hologram/holopad, /obj/structure/cable{ @@ -11160,32 +11170,10 @@ /turf/simulated/wall/r_wall, /area/engineering/break_room) "bBX" = ( -/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 = 3; - pixel_y = -3 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/obj/machinery/camera{ - c_tag = "Brig Secure Armory" - }, -/obj/structure/closet/secure_closet/guncabinet{ - anchored = 1; - name = "Riot shotguns" - }, +/obj/machinery/suit_storage_unit/security, +/obj/effect/decal/warning_stripes/red, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" + icon_state = "dark" }, /area/security/armory) "bCa" = ( @@ -12052,8 +12040,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 4; + icon_state = "darkredcorners" }, /area/security/armory) "bGB" = ( @@ -15120,7 +15110,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + icon_state = "darkredalt" }, /area/security/armory) "bVn" = ( @@ -17222,29 +17212,9 @@ }, /area/hallway/primary/port/east) "cgG" = ( -/obj/structure/closet/secure_closet/guncabinet{ - anchored = 1; - name = "Lethal Bullets" - }, -/obj/item/ammo_box/magazine/enforcer/lethal{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/ammo_box/magazine/enforcer/lethal, -/obj/item/ammo_box/magazine/enforcer/lethal{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/ammo_box/magazine/enforcer/lethal{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" + dir = 4; + icon_state = "darkredalt" }, /area/security/armory) "cgJ" = ( @@ -17269,50 +17239,23 @@ }, /area/hallway/primary/aft/west) "cgL" = ( -/obj/structure/rack/gunrack, -/obj/item/gun/projectile/automatic/sp91rc{ - pixel_x = -7 - }, -/obj/item/gun/projectile/automatic/sp91rc{ - pixel_x = -2 - }, -/obj/item/gun/projectile/automatic/sp91rc{ - pixel_x = 2 - }, -/obj/item/gun/projectile/automatic/sp91rc{ - pixel_x = 7 - }, +/obj/machinery/suit_storage_unit/security, +/obj/effect/decal/warning_stripes/red, /obj/structure/window/reinforced{ dir = 8 }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" + icon_state = "dark" }, /area/security/armory) "cgR" = ( -/obj/structure/closet/secure_closet/guncabinet{ - anchored = 1; - name = "Magazines for SP-91-RC"; - req_access = list(1) - }, -/obj/item/ammo_box/magazine/sp91rc{ - pixel_x = 8 - }, -/obj/item/ammo_box/magazine/sp91rc{ - pixel_x = 4 - }, -/obj/item/ammo_box/magazine/sp91rc, -/obj/item/ammo_box/magazine/sp91rc{ - pixel_x = -4 - }, /obj/structure/window/reinforced{ - dir = 4; - layer = 2.9 + dir = 4 }, +/obj/machinery/suit_storage_unit/security, +/obj/effect/decal/warning_stripes/red, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" + icon_state = "dark" }, /area/security/armory) "chc" = ( @@ -17558,7 +17501,8 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 1; + icon_state = "darkredalt" }, /area/security/armory) "cjm" = ( @@ -17609,7 +17553,8 @@ "cjA" = ( /mob/living/simple_animal/bot/secbot/armsky, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 1; + icon_state = "darkredalt" }, /area/security/armory) "cjC" = ( @@ -18173,20 +18118,6 @@ /obj/structure/cable/orange, /turf/simulated/floor/plating, /area/security/armory) -"cov" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, -/obj/machinery/flasher/portable, -/obj/effect/decal/warning_stripes/red/hollow, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/security/armory) "coy" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, @@ -27106,6 +27037,21 @@ icon_state = "red" }, /area/security/main) +"dGg" = ( +/obj/structure/rack{ + dir = 8; + layer = 2.9 + }, +/obj/effect/decal/warning_stripes/red/hollow, +/obj/item/clothing/suit/armor/laserproof, +/obj/item/gun/energy/ionrifle{ + pixel_y = 3 + }, +/obj/structure/window/reinforced, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/security/armory) "dGr" = ( /obj/machinery/computer/mech_bay_power_console{ dir = 8 @@ -29198,6 +29144,24 @@ "epP" = ( /turf/simulated/wall, /area/medical/cloning) +"epU" = ( +/obj/item/storage/lockbox/mindshield, +/obj/item/storage/box/trackimp, +/obj/item/storage/box/chemimp{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/item/lock_buster, +/obj/structure/rack, +/obj/effect/decal/warning_stripes/red/hollow, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/security/armory) "eqj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/landmark/event/lightsout, @@ -29659,6 +29623,37 @@ icon_state = "whitegreen" }, /area/medical/virology/lab) +"eze" = ( +/obj/effect/decal/warning_stripes/red/hollow, +/obj/item/ammo_box/shotgun/buck{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/ammo_box/shotgun/buck, +/obj/item/ammo_box/shotgun{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/structure/closet/secure_closet/guncabinet{ + anchored = 1; + name = "Lethal Bullets" + }, +/obj/item/ammo_box/shotgun/beanbag, +/obj/item/ammo_box/shotgun/beanbag{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/ammo_box/shotgun/tranquilizer{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/security/armory) "ezi" = ( /obj/machinery/hydroponics/constructable, /obj/machinery/light{ @@ -34109,7 +34104,7 @@ }, /obj/effect/landmark/event/lightsout, /turf/simulated/floor/plasteel{ - icon_state = "dark" + icon_state = "darkredcorners" }, /area/security/armory) "fWe" = ( @@ -37846,29 +37841,23 @@ "hbk" = ( /obj/structure/rack, /obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4; - layer = 2.9 +/obj/item/storage/backpack/duffel/security/riot_armory{ + pixel_x = -6; + pixel_y = -3 + }, +/obj/item/storage/backpack/duffel/security/riot_armory{ + pixel_x = -3 + }, +/obj/item/storage/backpack/duffel/security/riot_armory{ + pixel_y = 3 + }, +/obj/item/storage/backpack/duffel/security/riot_armory{ + pixel_x = 3; + pixel_y = 6 }, -/obj/item/clothing/head/helmet/riot, -/obj/item/clothing/head/helmet/riot, -/obj/item/clothing/head/helmet/riot, -/obj/item/clothing/head/helmet/riot, -/obj/item/clothing/suit/armor/riot, -/obj/item/clothing/suit/armor/riot, -/obj/item/clothing/suit/armor/riot, -/obj/item/clothing/suit/armor/riot, -/obj/item/clothing/gloves/combat/riot, -/obj/item/clothing/gloves/combat/riot, -/obj/item/clothing/gloves/combat/riot, -/obj/item/clothing/gloves/combat/riot, -/obj/item/clothing/shoes/combat/riot, -/obj/item/clothing/shoes/combat/riot, -/obj/item/clothing/shoes/combat/riot, -/obj/item/clothing/shoes/combat/riot, +/obj/effect/decal/warning_stripes/red/hollow, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" + icon_state = "dark" }, /area/security/armory) "hbo" = ( @@ -41217,24 +41206,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/security/processing) -"hXX" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/structure/rack, -/obj/item/lock_buster, -/obj/item/storage/box/chemimp{ - pixel_x = 4; - pixel_y = 3 - }, -/obj/item/storage/box/trackimp, -/obj/item/storage/lockbox/mindshield, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" - }, -/area/security/armory) "hYg" = ( /obj/structure/extinguisher_cabinet{ pixel_y = 28 @@ -41256,9 +41227,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 1; + icon_state = "darkredalt" }, /area/security/armory) "hZh" = ( @@ -47236,6 +47207,12 @@ icon_state = "neutral" }, /area/hallway/secondary/entry/south) +"jIX" = ( +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkredalt" + }, +/area/security/armory) "jIY" = ( /obj/structure/cable{ icon_state = "1-8" @@ -49249,27 +49226,13 @@ }, /area/toxins/lab) "kqo" = ( -/obj/structure/rack{ - dir = 8; - layer = 2.9 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/window{ - dir = 8; - name = "Secure Armory"; - req_access = list(1) +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=Armory_South_East"; + location = "Armory_North" }, -/obj/effect/decal/warning_stripes/red/hollow, -/obj/item/clothing/suit/armor/laserproof, -/obj/item/gun/energy/ionrifle, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 8; + icon_state = "darkredcorners" }, /area/security/armory) "kqs" = ( @@ -52633,6 +52596,33 @@ icon_state = "whiteblue" }, /area/medical/medbay) +"lkK" = ( +/obj/structure/rack{ + dir = 8; + layer = 2.9 + }, +/obj/effect/decal/warning_stripes/red/hollow, +/obj/item/shield/riot{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/shield/riot, +/obj/item/shield/riot{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/shield/riot{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/security/armory) "lkT" = ( /obj/machinery/light/small{ dir = 4 @@ -54028,12 +54018,12 @@ pixel_x = 6; pixel_y = -6 }, +/obj/effect/decal/warning_stripes/red/hollow, /obj/machinery/alarm{ pixel_y = 26 }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" + icon_state = "dark" }, /area/security/armory) "lHw" = ( @@ -55926,25 +55916,23 @@ dir = 8 }, /obj/structure/window/reinforced, -/obj/item/clothing/head/helmet/alt, -/obj/item/clothing/head/helmet/alt, -/obj/item/clothing/head/helmet/alt, -/obj/item/clothing/head/helmet/alt, -/obj/item/clothing/suit/armor/bulletproof, -/obj/item/clothing/suit/armor/bulletproof, -/obj/item/clothing/suit/armor/bulletproof, -/obj/item/clothing/suit/armor/bulletproof, -/obj/item/clothing/gloves/color/black/ballistic, -/obj/item/clothing/gloves/color/black/ballistic, -/obj/item/clothing/gloves/color/black/ballistic, -/obj/item/clothing/gloves/color/black/ballistic, -/obj/item/clothing/shoes/jackboots/armored, -/obj/item/clothing/shoes/jackboots/armored, -/obj/item/clothing/shoes/jackboots/armored, -/obj/item/clothing/shoes/jackboots/armored, +/obj/item/storage/backpack/duffel/security/bulletproof_armory{ + pixel_x = -6; + pixel_y = -3 + }, +/obj/item/storage/backpack/duffel/security/bulletproof_armory{ + pixel_x = -3 + }, +/obj/item/storage/backpack/duffel/security/bulletproof_armory{ + pixel_y = 3 + }, +/obj/item/storage/backpack/duffel/security/bulletproof_armory{ + pixel_x = 3; + pixel_y = 6 + }, +/obj/effect/decal/warning_stripes/red/hollow, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" + icon_state = "dark" }, /area/security/armory) "mhs" = ( @@ -65846,6 +65834,25 @@ icon_state = "neutral" }, /area/hallway/primary/fore) +"oVB" = ( +/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 = 3; + pixel_y = -3 + }, +/obj/structure/closet/secure_closet/guncabinet{ + anchored = 1; + name = "Riot shotguns" + }, +/obj/effect/decal/warning_stripes/red/hollow, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/security/armory) "oVC" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 @@ -69944,12 +69951,16 @@ /turf/simulated/floor/engine/o2, /area/atmos) "qdq" = ( -/obj/structure/rack, -/obj/item/grenade/barrier{ - pixel_x = -3; - pixel_y = 3 +/obj/structure/rack{ + dir = 8; + layer = 2.9 + }, +/obj/effect/decal/warning_stripes/red/hollow, +/obj/item/storage/box/barrier{ + pixel_x = 3; + pixel_y = -3 }, -/obj/item/grenade/barrier, +/obj/item/storage/box/barrier, /obj/item/grenade/barrier{ pixel_x = 3; pixel_y = -3 @@ -69958,12 +69969,8 @@ pixel_x = 6; pixel_y = -6 }, -/obj/structure/window/reinforced{ - dir = 4 - }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" + icon_state = "dark" }, /area/security/armory) "qdP" = ( @@ -70313,9 +70320,6 @@ }, /area/engineering/engine/smes) "qhx" = ( -/obj/item/radio/intercom{ - pixel_y = 23 - }, /obj/structure/closet/secure_closet/guncabinet{ anchored = 1; name = "Security SMG's" @@ -70329,12 +70333,15 @@ pixel_x = 3; pixel_y = -3 }, +/obj/effect/decal/warning_stripes/red/hollow, /obj/structure/window/reinforced{ dir = 8 }, +/obj/item/radio/intercom{ + pixel_y = 23 + }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" + icon_state = "dark" }, /area/security/armory) "qhP" = ( @@ -73700,6 +73707,16 @@ icon_state = "darkblue" }, /area/medical/morgue) +"rgz" = ( +/obj/structure/sign/poster/official/random{ + pixel_x = 32 + }, +/obj/effect/decal/warning_stripes/red/hollow, +/obj/vehicle/ridden/secway, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/security/armory) "rgJ" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/carpet/orange, @@ -74050,7 +74067,7 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + icon_state = "darkredalt" }, /area/security/armory) "rnT" = ( @@ -74512,41 +74529,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/fsmaint3) -"rud" = ( -/obj/structure/rack, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/obj/item/ammo_box/shotgun{ - pixel_x = -3; - pixel_y = 6 - }, -/obj/item/ammo_box/shotgun/buck{ - pixel_y = 3 - }, -/obj/item/ammo_box/shotgun/buck, -/obj/item/ammo_box/shotgun/beanbag, -/obj/item/ammo_box/shotgun/beanbag{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/ammo_box/shotgun/tranquilizer{ - pixel_x = 6; - pixel_y = -6 - }, -/obj/structure/closet/secure_closet/guncabinet{ - anchored = 1; - name = "Lethal Bullets" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" - }, -/area/security/armory) "rug" = ( /obj/structure/disposalpipe/junction/reversed{ dir = 8 @@ -75308,6 +75290,18 @@ icon_state = "whitepurple" }, /area/toxins/lab) +"rEv" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/flasher/portable, +/obj/machinery/flasher/portable, +/obj/machinery/flasher/portable, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "vault" + }, +/area/security/armory) "rEy" = ( /obj/machinery/light{ dir = 1 @@ -76012,6 +76006,29 @@ icon_state = "red" }, /area/security/main) +"rPP" = ( +/obj/effect/decal/warning_stripes/red/hollow, +/obj/item/ammo_box/magazine/enforcer/lethal{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/ammo_box/magazine/enforcer/lethal{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/ammo_box/magazine/enforcer/lethal, +/obj/item/ammo_box/magazine/enforcer/lethal{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/structure/closet/secure_closet/guncabinet{ + anchored = 1; + name = "Lethal Bullets" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/security/armory) "rQf" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/plasteel{ @@ -82029,6 +82046,20 @@ icon_state = "neutralfull" }, /area/hallway/primary/starboard/south) +"tBA" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 24 + }, +/obj/machinery/flasher/portable, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "vault" + }, +/area/security/armory) "tBK" = ( /obj/machinery/computer/supplycomp{ dir = 8 @@ -84872,6 +84903,23 @@ icon_state = "darkred" }, /area/security/brig) +"uto" = ( +/obj/structure/rack/gunrack, +/obj/effect/decal/warning_stripes/red/hollow, +/obj/item/gun/energy/laser{ + pixel_x = -6 + }, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser{ + pixel_x = 6 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/security/armory) "utp" = ( /obj/machinery/constructable_frame/machine_frame, /turf/simulated/floor/plasteel{ @@ -85652,10 +85700,13 @@ }, /area/toxins/lab) "uGo" = ( -/obj/machinery/suit_storage_unit/security, +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=Armory_South"; + location = "Armory_South_East" + }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" + dir = 1; + icon_state = "darkredcorners" }, /area/security/armory) "uGA" = ( @@ -87524,19 +87575,24 @@ }, /area/quartermaster/qm) "vnx" = ( -/obj/item/gun/energy/gun{ - pixel_x = -3; - pixel_y = 3 +/obj/structure/closet/secure_closet/guncabinet{ + anchored = 1; + name = "Magazines for SP-91-RC"; + req_access = list(1) }, -/obj/item/gun/energy/gun, -/obj/item/gun/energy/gun{ - pixel_x = 3; - pixel_y = -3 +/obj/item/ammo_box/magazine/sp91rc{ + pixel_x = 8 }, -/obj/structure/rack/gunrack, +/obj/item/ammo_box/magazine/sp91rc{ + pixel_x = 4 + }, +/obj/item/ammo_box/magazine/sp91rc, +/obj/item/ammo_box/magazine/sp91rc{ + pixel_x = -4 + }, +/obj/effect/decal/warning_stripes/red/hollow, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" + icon_state = "dark" }, /area/security/armory) "vnM" = ( @@ -92232,27 +92288,29 @@ /turf/simulated/floor/engine, /area/engineering/engine) "wDS" = ( -/obj/structure/rack, -/obj/item/storage/box/seccarts{ - pixel_x = 3; - pixel_y = 2 +/obj/structure/rack{ + dir = 8; + layer = 2.9 }, -/obj/item/storage/box/handcuffs, +/obj/effect/decal/warning_stripes/red/hollow, +/obj/item/storage/box/flashbangs, /obj/item/storage/box/flashbangs{ - pixel_x = -2; - pixel_y = -2 + pixel_x = 3; + pixel_y = -3 }, -/obj/item/storage/box/handcuffs, -/obj/item/storage/box/teargas{ - pixel_x = -3; +/obj/item/grenade/flashbang{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/grenade/flashbang{ + pixel_x = 3; pixel_y = -3 }, /obj/structure/window/reinforced{ dir = 8 }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" + icon_state = "dark" }, /area/security/armory) "wDX" = ( @@ -94114,16 +94172,6 @@ /obj/structure/grille/broken, /turf/simulated/floor/plating/asteroid/ancient, /area/maintenance/engineering) -"xgR" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/flasher/portable, -/obj/effect/decal/warning_stripes/red/hollow, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/security/armory) "xhc" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -96081,22 +96129,23 @@ /turf/simulated/floor/engine, /area/engineering/engine) "xJl" = ( -/obj/item/gun/energy/laser{ - pixel_x = -3; - pixel_y = 3 +/obj/structure/rack/gunrack, +/obj/item/gun/projectile/automatic/sp91rc{ + pixel_x = -3 }, -/obj/item/gun/energy/laser, -/obj/item/gun/energy/laser{ - pixel_x = 3; - pixel_y = -3 +/obj/item/gun/projectile/automatic/sp91rc, +/obj/item/gun/projectile/automatic/sp91rc{ + pixel_x = 3 + }, +/obj/item/gun/projectile/automatic/sp91rc{ + pixel_x = 6 }, +/obj/effect/decal/warning_stripes/red/hollow, /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/rack/gunrack, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" + icon_state = "dark" }, /area/security/armory) "xJn" = ( @@ -96751,6 +96800,15 @@ /obj/structure/grille, /turf/simulated/floor/plating, /area/toxins/mixing) +"xTE" = ( +/obj/machinery/flasher/portable, +/obj/machinery/flasher/portable, +/obj/machinery/flasher/portable, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "vault" + }, +/area/security/armory) "xTG" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -97044,7 +97102,11 @@ }, /area/engineering/mechanic_workshop/hangar) "xYM" = ( -/turf/space, +/obj/machinery/flasher/portable, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "vault" + }, /area/security/armory) "xYT" = ( /obj/structure/cable/orange{ @@ -119728,7 +119790,7 @@ bBH qhx ioE fWa -hXX +cgG cgG bGA ioE @@ -120496,10 +120558,10 @@ bDn psy wOD dkF -rud +cgR ioE aUW -ioE +lkK aVT cjA ioE @@ -120753,13 +120815,13 @@ brk psy aBy bBH -aOM -xgR +oVB +ioE kqo -beX +jIX +jIX uGo -uGo -cov +ioE aOM bBH lii @@ -121010,14 +121072,14 @@ njM pCS psy bBH -bBH -bBH -bBH -bBH -bBH -bBH -bBH -bBH +eze +ioE +ioE +ioE +ioE +ioE +ioE +uto bBH lii nBo @@ -121267,13 +121329,13 @@ myx wOD tSH bBH -xYM -xYM -xYM -xYM -xYM -xYM -xYM +xTE +rEv +dGg +rgz +rPP +epU +tBA xYM bBH jLQ diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 9cc980e86d9..1a9dc33773b 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -228,13 +228,11 @@ "acB" = ( /obj/structure/rack/gunrack, /obj/item/gun/energy/laser{ - pixel_x = -2; - pixel_y = 3 + pixel_x = -3 }, /obj/item/gun/energy/laser, /obj/item/gun/energy/laser{ - pixel_x = 3; - pixel_y = -3 + pixel_x = 3 }, /obj/effect/decal/warning_stripes/red/hollow, /obj/structure/window/reinforced, @@ -345,7 +343,8 @@ pixel_y = -3 }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 5; + icon_state = "darkred" }, /area/security/securearmory) "acP" = ( @@ -356,9 +355,10 @@ /area/security/range) "acR" = ( /obj/machinery/suit_storage_unit/security, -/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/effect/decal/warning_stripes/red, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 9; + icon_state = "darkred" }, /area/security/securearmory) "acV" = ( @@ -383,9 +383,10 @@ /area/security/prisonershuttle) "acY" = ( /obj/machinery/portable_atmospherics/canister/oxygen, -/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/effect/decal/warning_stripes/red/hollow, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 1; + icon_state = "darkred" }, /area/security/securearmory) "acZ" = ( @@ -408,9 +409,10 @@ dir = 1 }, /obj/structure/dispenser/oxygen, -/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/effect/decal/warning_stripes/red/hollow, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 1; + icon_state = "darkred" }, /area/security/securearmory) "adb" = ( @@ -434,7 +436,8 @@ pixel_y = 24 }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 1; + icon_state = "darkred" }, /area/security/securearmory) "adi" = ( @@ -448,13 +451,12 @@ /obj/machinery/light{ dir = 1 }, -/obj/effect/decal/warning_stripes/red/hollow, /obj/machinery/alarm{ pixel_y = 24 }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" + dir = 1; + icon_state = "darkred" }, /area/security/securearmory) "adk" = ( @@ -483,7 +485,8 @@ }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 5; + icon_state = "darkred" }, /area/security/securearmory) "adn" = ( @@ -863,8 +866,7 @@ location = "Armory_sleva" }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" + icon_state = "dark" }, /area/security/securearmory) "aew" = ( @@ -985,8 +987,7 @@ pixel_y = 28 }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" + icon_state = "dark" }, /area/security/securearmory) "aeT" = ( @@ -1597,8 +1598,10 @@ /obj/item/clothing/suit/armor/bulletproof, /obj/item/clothing/suit/armor/bulletproof, /obj/item/clothing/suit/armor/bulletproof, +/obj/effect/decal/warning_stripes/red/hollow, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 4; + icon_state = "darkred" }, /area/security/securearmory) "ahE" = ( @@ -1828,7 +1831,8 @@ req_access = list(1) }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 4; + icon_state = "darkred" }, /area/security/securearmory) "ail" = ( @@ -2979,8 +2983,10 @@ /obj/item/shield/riot, /obj/item/shield/riot, /obj/item/shield/riot, +/obj/effect/decal/warning_stripes/red/hollow, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 8; + icon_state = "darkred" }, /area/security/securearmory) "amb" = ( @@ -3042,8 +3048,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" + icon_state = "dark" }, /area/security/securearmory) "amm" = ( @@ -3095,8 +3100,7 @@ pixel_y = -28 }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" + icon_state = "darkred" }, /area/security/securearmory) "amx" = ( @@ -4893,8 +4897,10 @@ /obj/item/clothing/head/helmet/riot, /obj/item/clothing/head/helmet/riot, /obj/item/clothing/head/helmet/riot, +/obj/effect/decal/warning_stripes/red/hollow, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 8; + icon_state = "darkred" }, /area/security/securearmory) "arH" = ( @@ -4925,8 +4931,10 @@ /obj/structure/window/reinforced{ dir = 1 }, +/obj/effect/decal/warning_stripes/red/hollow, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 4; + icon_state = "darkred" }, /area/security/securearmory) "arJ" = ( @@ -7568,8 +7576,10 @@ /obj/item/clothing/shoes/jackboots/armored, /obj/item/clothing/shoes/jackboots/armored, /obj/item/clothing/shoes/jackboots/armored, +/obj/effect/decal/warning_stripes/red/hollow, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 6; + icon_state = "darkred" }, /area/security/securearmory) "ayH" = ( @@ -21864,8 +21874,7 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" + icon_state = "dark" }, /area/security/securearmory) "brX" = ( @@ -50902,8 +50911,7 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" + icon_state = "darkredcorners" }, /area/security/securearmory) "dbo" = ( @@ -59227,6 +59235,14 @@ /obj/structure/fans/tiny, /turf/simulated/floor/plating, /area/maintenance/disposal) +"fxj" = ( +/obj/effect/decal/warning_stripes/red/hollow, +/obj/machinery/flasher/portable, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkred" + }, +/area/security/securearmory) "fxl" = ( /obj/structure/chair{ dir = 8 @@ -59557,6 +59573,14 @@ icon_state = "neutralfull" }, /area/engineering/chiefs_office) +"fIt" = ( +/obj/machinery/flasher/portable, +/obj/effect/decal/warning_stripes/red/hollow, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "darkred" + }, +/area/security/securearmory) "fIu" = ( /obj/structure/cable{ icon_state = "1-2" @@ -59802,8 +59826,10 @@ }, /obj/item/clothing/suit/armor/laserproof, /obj/item/clothing/suit/armor/laserproof, +/obj/effect/decal/warning_stripes/red/hollow, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 8; + icon_state = "darkred" }, /area/security/securearmory) "fRf" = ( @@ -59860,7 +59886,8 @@ /obj/effect/decal/warning_stripes/red/hollow, /obj/machinery/flasher/portable, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 6; + icon_state = "darkred" }, /area/security/securearmory) "fSG" = ( @@ -61125,7 +61152,8 @@ /obj/machinery/flasher/portable, /obj/effect/decal/warning_stripes/red/hollow, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 8; + icon_state = "darkred" }, /area/security/securearmory) "gID" = ( @@ -63219,8 +63247,10 @@ name = "Secure Armory"; req_access = list(1) }, +/obj/effect/decal/warning_stripes/red/hollow, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 4; + icon_state = "darkred" }, /area/security/securearmory) "icM" = ( @@ -66077,10 +66107,11 @@ }, /obj/structure/rack/gunrack, /obj/item/gun/energy/ionrifle{ - pixel_x = 3; - pixel_y = 3 + pixel_x = 3 + }, +/obj/item/gun/energy/ionrifle{ + pixel_x = 3 }, -/obj/item/gun/energy/ionrifle, /obj/effect/decal/warning_stripes/red/hollow, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -70316,8 +70347,10 @@ /obj/item/clothing/suit/armor/riot, /obj/item/clothing/suit/armor/riot, /obj/item/clothing/suit/armor/riot, +/obj/effect/decal/warning_stripes/red/hollow, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 8; + icon_state = "darkred" }, /area/security/securearmory) "mTq" = ( @@ -74037,7 +74070,7 @@ dir = 9 }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + icon_state = "darkred" }, /area/security/securearmory) "pyQ" = ( @@ -74689,8 +74722,10 @@ /obj/item/clothing/gloves/combat/riot, /obj/item/clothing/gloves/combat/riot, /obj/item/clothing/gloves/combat/riot, +/obj/effect/decal/warning_stripes/red/hollow, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 8; + icon_state = "darkred" }, /area/security/securearmory) "pUG" = ( @@ -74935,8 +74970,10 @@ /obj/item/clothing/gloves/color/black/ballistic, /obj/item/clothing/gloves/color/black/ballistic, /obj/item/clothing/gloves/color/black/ballistic, +/obj/effect/decal/warning_stripes/red/hollow, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 4; + icon_state = "darkred" }, /area/security/securearmory) "qcJ" = ( @@ -77604,8 +77641,10 @@ /obj/item/clothing/shoes/combat/riot, /obj/item/clothing/shoes/combat/riot, /obj/item/clothing/shoes/combat/riot, +/obj/effect/decal/warning_stripes/red/hollow, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 10; + icon_state = "darkred" }, /area/security/securearmory) "rIH" = ( @@ -77729,6 +77768,17 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/maintenance/port) +"rNu" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkred" + }, +/area/security/securearmory) "rNJ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -78274,6 +78324,14 @@ /obj/effect/decal/remains/human, /turf/simulated/floor/plating, /area/maintenance/xenozoo) +"sfG" = ( +/obj/machinery/suit_storage_unit/security, +/obj/effect/decal/warning_stripes/red, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkred" + }, +/area/security/securearmory) "sfL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -80972,13 +81030,11 @@ "tRQ" = ( /obj/structure/rack/gunrack, /obj/item/gun/energy/gun{ - pixel_x = -3; - pixel_y = 3 + pixel_x = -3 }, /obj/item/gun/energy/gun, /obj/item/gun/energy/gun{ - pixel_x = 3; - pixel_y = -3 + pixel_x = 3 }, /obj/structure/window/reinforced, /obj/effect/decal/warning_stripes/red/hollow, @@ -86564,7 +86620,8 @@ req_access = list(1) }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 4; + icon_state = "darkred" }, /area/security/securearmory) "xnH" = ( @@ -87859,8 +87916,7 @@ /area/maintenance/fsmaint2) "yjg" = ( /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" + icon_state = "darkred" }, /area/security/securearmory) "yjl" = ( @@ -114755,7 +114811,7 @@ aiv abO aiv aiv -gGq +fIt qzT gGq fQF @@ -115012,14 +115068,14 @@ aiv abO aiv acR -yjg qzT qzT -yjg -yjg -yjg -yjg -yjg +qzT +qzT +qzT +qzT +qzT +qzT yjg aAl aqv @@ -115268,7 +115324,7 @@ lTl aiv abO aiv -acR +sfG aev ahU akv @@ -115525,15 +115581,15 @@ uTI aiv abO aiv -acR -yjg +sfG +qzT tRQ kgn amh qzT -yjg -yjg -yjg +qzT +qzT +qzT yjg aAr aBT @@ -115783,7 +115839,7 @@ aiv abO aiv acY -yjg +qzT acB akl dbn @@ -116040,10 +116096,10 @@ aiv abO aiv ada -yjg +qzT ale akn -dbn +rNu aiv aiv aiv @@ -116296,8 +116352,8 @@ lTl aiv abO aiv -fSC -yjg +fxj +qzT adt akt amv @@ -116553,8 +116609,8 @@ uTI aiv abO aiv -fSC -yjg +fxj +qzT jfS qYF brW @@ -117326,8 +117382,8 @@ abO aiv adm aeR -yjg -yjg +qzT +qzT qzT qzT qzT diff --git a/_maps/map_files/nova/nova.dmm b/_maps/map_files/nova/nova.dmm index cbf246e52b6..a43ed31b19a 100644 --- a/_maps/map_files/nova/nova.dmm +++ b/_maps/map_files/nova/nova.dmm @@ -5290,12 +5290,13 @@ layer = 2.9 }, /obj/item/gun/energy/gun/advtaser{ - pixel_x = 3; pixel_y = -3 }, -/obj/item/gun/energy/gun/advtaser, /obj/item/gun/energy/gun/advtaser{ - pixel_x = -3; + pixel_x = 3 + }, +/obj/item/gun/energy/gun/advtaser{ + pixel_x = 6; pixel_y = 3 }, /turf/simulated/floor/plasteel{ @@ -12140,10 +12141,6 @@ /area/maintenance/tourist) "bJK" = ( /obj/effect/decal/warning_stripes/red/hollow, -/obj/structure/rack{ - dir = 8; - layer = 2.9 - }, /obj/structure/window/reinforced{ color = "red" }, @@ -29238,23 +29235,32 @@ /turf/simulated/floor/plating, /area/security/permabrig) "ejJ" = ( +/obj/structure/rack{ + dir = 8; + layer = 2.9 + }, /obj/effect/decal/warning_stripes/red/hollow, -/obj/structure/rack/gunrack, -/obj/item/gun/energy/gun, +/obj/structure/window/reinforced{ + color = "red" + }, +/obj/item/storage/box/flashbangs, +/obj/item/storage/box/flashbangs{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/grenade/flashbang{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/grenade/flashbang{ + pixel_x = 6; + pixel_y = -6 + }, /obj/machinery/door/window{ color = "red"; name = "Secure Armory"; req_access = list(1) }, -/obj/item/gun/energy/gun{ - pixel_x = 3 - }, -/obj/item/gun/energy/gun{ - pixel_x = 6 - }, -/obj/structure/window/reinforced{ - color = "red" - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -60329,16 +60335,14 @@ "iPd" = ( /obj/structure/rack/gunrack, /obj/item/gun/projectile/automatic/sp91rc{ - pixel_x = -7 - }, -/obj/item/gun/projectile/automatic/sp91rc{ - pixel_x = -2 + pixel_x = 3 }, +/obj/item/gun/projectile/automatic/sp91rc, /obj/item/gun/projectile/automatic/sp91rc{ - pixel_x = 2 + pixel_x = -3 }, /obj/item/gun/projectile/automatic/sp91rc{ - pixel_x = 7 + pixel_x = -6 }, /obj/structure/window/reinforced{ color = "red" @@ -60349,9 +60353,9 @@ name = "Secure Armory"; req_access = list(1) }, +/obj/effect/decal/warning_stripes/red/hollow, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" + icon_state = "dark" }, /area/security/securearmory) "iPl" = ( @@ -62603,10 +62607,10 @@ }, /obj/item/gun/projectile/automatic/wt550, /obj/item/gun/projectile/automatic/wt550{ - pixel_x = 3 + pixel_x = -3 }, /obj/item/gun/projectile/automatic/wt550{ - pixel_x = 6 + pixel_x = -6 }, /obj/structure/rack/gunrack, /turf/simulated/floor/plasteel{ @@ -63464,23 +63468,32 @@ /turf/simulated/wall, /area/hallway/primary/central) "jnj" = ( +/obj/structure/rack{ + dir = 8; + layer = 2.9 + }, /obj/effect/decal/warning_stripes/red/hollow, /obj/structure/window/reinforced{ color = "red" }, -/obj/structure/rack{ - dir = 8; - layer = 2.9 +/obj/item/storage/box/teargas, +/obj/item/storage/box/teargas{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/grenade/chem_grenade/teargas{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/grenade/chem_grenade/teargas{ + pixel_x = 3; + pixel_y = -3 }, /obj/machinery/door/window{ color = "red"; name = "Secure Armory"; req_access = list(1) }, -/obj/item/shield/riot, -/obj/item/shield/riot, -/obj/item/shield/riot, -/obj/item/shield/riot, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -79206,28 +79219,6 @@ icon_state = "dark" }, /area/turret_protected/aisat_interior) -"lJx" = ( -/obj/effect/decal/warning_stripes/red/hollow, -/obj/structure/rack/gunrack, -/obj/structure/window/reinforced{ - color = "red" - }, -/obj/machinery/door/window{ - color = "red"; - name = "Secure Armory"; - req_access = list(1) - }, -/obj/item/gun/energy/laser, -/obj/item/gun/energy/laser{ - pixel_x = 3 - }, -/obj/item/gun/energy/laser{ - pixel_x = 6 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/security/securearmory) "lJK" = ( /obj/structure/cable{ icon_state = "2-4" @@ -84829,10 +84820,6 @@ dir = 8; layer = 2.9 }, -/obj/structure/window/reinforced{ - color = "red"; - dir = 8 - }, /obj/machinery/door/window{ color = "red"; dir = 1; @@ -84850,16 +84837,13 @@ dir = 4 }, /obj/item/gun/projectile/automatic/pistol/enforcer/lethal{ - pixel_x = -2; - pixel_y = 0 - }, -/obj/item/gun/projectile/automatic/pistol/enforcer/lethal{ - pixel_x = 2; - pixel_y = 0 + pixel_x = -3; + pixel_y = 3 }, +/obj/item/gun/projectile/automatic/pistol/enforcer/lethal, /obj/item/gun/projectile/automatic/pistol/enforcer/lethal{ - pixel_x = 6; - pixel_y = 0 + pixel_x = 3; + pixel_y = -3 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -106605,20 +106589,19 @@ name = "Secure Armory"; req_access = list(1) }, -/obj/item/gun/energy/dominator, /obj/structure/window/reinforced{ color = "red"; dir = 8 }, -/obj/structure/window/reinforced{ - color = "red"; - dir = 4 +/obj/item/gun/energy/dominator{ + pixel_y = -3 }, /obj/item/gun/energy/dominator{ - pixel_x = 2 + pixel_x = 3 }, /obj/item/gun/energy/dominator{ - pixel_x = 4 + pixel_x = 6; + pixel_y = 3 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -107948,10 +107931,6 @@ }, /area/hallway/primary/central/east) "pTO" = ( -/obj/structure/window/reinforced{ - color = "red"; - dir = 8 - }, /obj/machinery/door/window{ color = "red"; dir = 1; @@ -113903,32 +113882,32 @@ }, /area/toxins/xenobiology) "qMH" = ( -/obj/structure/rack{ - dir = 8; - layer = 2.9 - }, /obj/effect/decal/warning_stripes/red/hollow, -/obj/machinery/door/window{ - color = "red"; - dir = 8; - name = "Secure Armory"; - req_access = list(1) - }, /obj/structure/window/reinforced{ color = "red" }, -/obj/item/storage/box/flashbangs, -/obj/item/storage/box/flashbangs{ - pixel_x = 3; +/obj/structure/rack{ + dir = 8; + layer = 2.9 + }, +/obj/item/shield/riot{ + pixel_x = -3; pixel_y = -3 }, -/obj/item/grenade/flashbang{ +/obj/item/shield/riot, +/obj/item/shield/riot{ pixel_x = 3; - pixel_y = -3 + pixel_y = 3 }, -/obj/item/grenade/flashbang{ +/obj/item/shield/riot{ pixel_x = 6; - pixel_y = -6 + pixel_y = 6 + }, +/obj/machinery/door/window{ + color = "red"; + dir = 8; + name = "Secure Armory"; + req_access = list(1) }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -116082,33 +116061,24 @@ /turf/simulated/floor/plating, /area/maintenance/tourist) "rdX" = ( -/obj/structure/rack{ - dir = 8; - layer = 2.9 - }, /obj/effect/decal/warning_stripes/red/hollow, +/obj/structure/rack/gunrack, +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun{ + pixel_x = 3 + }, +/obj/item/gun/energy/gun{ + pixel_x = 6 + }, +/obj/structure/window/reinforced{ + color = "red" + }, /obj/machinery/door/window{ color = "red"; dir = 8; name = "Secure Armory"; req_access = list(1) }, -/obj/item/storage/box/barrier{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/storage/box/barrier, -/obj/item/grenade/barrier{ - pixel_x = 6; - pixel_y = -6 - }, -/obj/item/grenade/barrier{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/structure/window/reinforced{ - color = "red" - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -118252,6 +118222,37 @@ dir = 1 }, /area/security/interrogation) +"ruD" = ( +/obj/structure/rack{ + dir = 8; + layer = 2.9 + }, +/obj/effect/decal/warning_stripes/red/hollow, +/obj/item/storage/box/barrier{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/storage/box/barrier, +/obj/item/grenade/barrier{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/grenade/barrier{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/structure/window/reinforced{ + color = "red" + }, +/obj/machinery/door/window{ + color = "red"; + name = "Secure Armory"; + req_access = list(1) + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/security/securearmory) "ruF" = ( /obj/effect/decal/cleanable/dust, /obj/item/radio/intercom{ @@ -159346,33 +159347,24 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/entry/eastarrival) "xrS" = ( -/obj/structure/rack{ - dir = 8; - layer = 2.9 - }, /obj/effect/decal/warning_stripes/red/hollow, +/obj/structure/rack/gunrack, /obj/structure/window/reinforced{ color = "red" }, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser{ + pixel_x = 3 + }, +/obj/item/gun/energy/laser{ + pixel_x = 6 + }, /obj/machinery/door/window{ color = "red"; dir = 8; name = "Secure Armory"; req_access = list(1) }, -/obj/item/storage/box/teargas, -/obj/item/storage/box/teargas{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/grenade/chem_grenade/teargas{ - pixel_x = 6; - pixel_y = -6 - }, -/obj/item/grenade/chem_grenade/teargas{ - pixel_x = 3; - pixel_y = -3 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -163154,13 +163146,6 @@ /area/hallway/secondary/exit) "xTO" = ( /obj/effect/decal/warning_stripes/red/hollow, -/obj/item/gun/projectile/shotgun/riot, -/obj/item/gun/projectile/shotgun/riot{ - pixel_x = 7 - }, -/obj/item/gun/projectile/shotgun/riot{ - pixel_x = -7 - }, /obj/structure/window/reinforced{ color = "red" }, @@ -163170,8 +163155,12 @@ name = "Secure Armory"; req_access = list(1) }, +/obj/item/gun/projectile/shotgun/riot, /obj/item/gun/projectile/shotgun/riot{ - pixel_x = -9 + pixel_x = -3 + }, +/obj/item/gun/projectile/shotgun/riot{ + pixel_x = -6 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -245823,9 +245812,9 @@ bkc xoL ajW xoL -lJx -ejJ qKn +ejJ +ruD jnj bhh fZC diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 676c181ae90..d7c778a7974 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -497,26 +497,20 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY /datum/supply_packs/security/armory/riothelmets name = "Riot Bundle Crate" - contains = list(/obj/item/clothing/head/helmet/riot, - /obj/item/clothing/head/helmet/riot, - /obj/item/clothing/head/helmet/riot, + contains = list(/obj/item/storage/backpack/duffel/security/riot_armory, + /obj/item/storage/backpack/duffel/security/riot_armory, + /obj/item/storage/backpack/duffel/security/riot_armory, /obj/item/shield/riot, /obj/item/shield/riot, - /obj/item/shield/riot, - /obj/item/clothing/suit/armor/riot, - /obj/item/clothing/suit/armor/riot, - /obj/item/clothing/suit/armor/riot) + /obj/item/shield/riot) cost = 80 containername = "riot bundle crate" /datum/supply_packs/security/armory/bulletarmor name = "Bulletproof Armor Crate" - contains = list(/obj/item/clothing/suit/armor/bulletproof, - /obj/item/clothing/suit/armor/bulletproof, - /obj/item/clothing/suit/armor/bulletproof, - /obj/item/clothing/head/helmet/alt, - /obj/item/clothing/head/helmet/alt, - /obj/item/clothing/head/helmet/alt) + contains = list(/obj/item/storage/backpack/duffel/security/bulletproof_armory, + /obj/item/storage/backpack/duffel/security/bulletproof_armory, + /obj/item/storage/backpack/duffel/security/bulletproof_armory) cost = 40 containername = "tactical armor crate" diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 9085b6dbe40..06a5ae6518c 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -750,8 +750,8 @@ /obj/item/storage/backpack/duffel/security/riot/populate_contents() new /obj/item/clothing/head/helmet/riot (src) new /obj/item/clothing/suit/armor/riot (src) - new /obj/item/clothing/gloves/combat (src) - new /obj/item/clothing/shoes/combat/swat (src) + new /obj/item/clothing/gloves/combat/riot (src) + new /obj/item/clothing/shoes/combat/riot (src) new /obj/item/melee/baton (src) new /obj/item/shield/riot/tele (src) new /obj/item/gun/energy/gun/pdw9 (src) @@ -760,6 +760,24 @@ new /obj/item/storage/box/zipties (src) new /obj/item/storage/box/bola (src) +/obj/item/storage/backpack/duffel/security/riot_armory + name = "Riot Armor Kit" + +/obj/item/storage/backpack/duffel/security/riot_armory/populate_contents() + new /obj/item/clothing/head/helmet/riot (src) + new /obj/item/clothing/suit/armor/riot (src) + new /obj/item/clothing/gloves/combat/riot (src) + new /obj/item/clothing/shoes/combat/riot (src) + +/obj/item/storage/backpack/duffel/security/bulletproof_armory + name = "Bulletproof Armor Kit" + +/obj/item/storage/backpack/duffel/security/bulletproof_armory/populate_contents() + new /obj/item/clothing/head/helmet/alt (src) + new /obj/item/clothing/suit/armor/bulletproof (src) + new /obj/item/clothing/gloves/color/black/ballistic (src) + new /obj/item/clothing/shoes/jackboots/armored (src) + /obj/item/storage/backpack/duffel/security/war name = "Wartime Emergency Kit"