From 7b8392db55fb707b1a6f0b4cb99e397b5bc9d8cf Mon Sep 17 00:00:00 2001 From: Gandalf Date: Mon, 26 Jul 2021 15:38:50 +0100 Subject: [PATCH] Armory minidate (#6921) * a * Update NSSJourney.dmm * aaaa * FFFF * Update bullets.dm * Update gun_spawns.dm * a * Update gun_spawns.dm * a * a * Update gun_spawns.dm * a * Update guns.dm * a * aaaaaaaaaaaaaaaaaaaaaaaaaaa * a * Update gun_spawns.dm * Update rack.dm --- .../Deltastation/DeltaStation2_skyrat.dmm | 37 +- .../IceBoxStation/IceBoxStation_skyrat.dmm | 405 +++++++++--------- .../MetaStation/MetaStation_skyrat.dmm | 56 +-- _maps/map_files/NSSJourney/NSSJourney.dmm | 365 ++++++++-------- code/__DEFINES/~skyrat_defines/projectiles.dm | 3 + code/game/objects/structures/fence.dm | 4 +- .../jobs/job_types/security_officer.dm | 2 +- code/modules/jobs/job_types/warden.dm | 2 +- .../modules/aesthetics/rack/code/rack.dm | 39 ++ .../modules/aesthetics/rack/icons/rack.dmi | Bin 443 -> 511 bytes .../modules/sec_haul/code/guns/ammo.dm | 77 ++++ .../modules/sec_haul/code/guns/bullets.dm | 49 ++- .../modules/sec_haul/code/guns/gun_spawns.dm | 87 ++++ .../modules/sec_haul/code/guns/guns.dm | 88 ++-- .../code/guns/token_system/gunsets.dm | 72 +++- .../code/guns/token_system/token_system.dm | 20 +- .../security_sergeant/security_sergeant.dm | 2 +- .../modules/sec_haul/icons/guns/mags.dmi | Bin 11787 -> 11891 bytes .../modules/sec_haul/icons/guns/sas14.dmi | Bin 0 -> 405 bytes .../modules/sec_haul/icons/guns/spawner.dmi | Bin 0 -> 981 bytes .../modules/sec_haul/sound/shotgun_bm.ogg | Bin 0 -> 37917 bytes tgstation.dme | 1 + 22 files changed, 785 insertions(+), 524 deletions(-) create mode 100644 modular_skyrat/modules/sec_haul/code/guns/gun_spawns.dm create mode 100644 modular_skyrat/modules/sec_haul/icons/guns/sas14.dmi create mode 100644 modular_skyrat/modules/sec_haul/icons/guns/spawner.dmi create mode 100644 modular_skyrat/modules/sec_haul/sound/shotgun_bm.ogg diff --git a/_maps/map_files/Deltastation/DeltaStation2_skyrat.dmm b/_maps/map_files/Deltastation/DeltaStation2_skyrat.dmm index 3b2b1b2eb09..dcfe7087a7a 100644 --- a/_maps/map_files/Deltastation/DeltaStation2_skyrat.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2_skyrat.dmm @@ -8359,21 +8359,12 @@ /turf/open/floor/plating, /area/cargo/storage) "ayI" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, /obj/effect/turf_decal/bot, -/obj/structure/rack, -/obj/item/storage/box/armament_tokens_sidearm{ - pixel_x = 7 - }, -/obj/item/storage/box/armament_tokens_primary{ - pixel_x = -8 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 8 }, +/obj/structure/rack/gunrack, +/obj/effect/spawner/armory_spawn/shotguns, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "ayK" = ( @@ -92303,23 +92294,11 @@ /turf/open/space, /area/engineering/atmos/upper) "eys" = ( -/obj/structure/rack, -/obj/item/gun/ballistic/shotgun/riot{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/gun/ballistic/shotgun/riot, -/obj/item/gun/ballistic/shotgun/riot, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 8 }, +/obj/structure/rack/gunrack, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "eyA" = ( @@ -99850,15 +99829,12 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "lwn" = ( -/obj/structure/rack, -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/effect/turf_decal/bot, -/obj/item/storage/box/armament_tokens_energy, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 8 }, +/obj/structure/rack/gunrack, +/obj/effect/spawner/armory_spawn/rifles, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "lwE" = ( @@ -108978,9 +108954,6 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "ueM" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/effect/turf_decal/bot, /obj/structure/closet/secure_closet/smartgun, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ diff --git a/_maps/map_files/IceBoxStation/IceBoxStation_skyrat.dmm b/_maps/map_files/IceBoxStation/IceBoxStation_skyrat.dmm index 14778c5b410..d03b31aebab 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation_skyrat.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation_skyrat.dmm @@ -293,10 +293,9 @@ }, /area/security/prison) "abm" = ( -/obj/structure/table, -/obj/item/storage/box/firingpins, -/obj/item/storage/box/firingpins, -/obj/item/key/security, +/obj/structure/rack, +/obj/item/gun/energy/e_gun/dragnet, +/obj/item/gun/energy/e_gun/dragnet, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -307,6 +306,11 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/item/melee/hammer, +/obj/item/melee/hammer, +/obj/item/melee/hammer, +/obj/item/storage/box/firingpins, +/obj/item/storage/box/firingpins, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "abu" = ( @@ -451,43 +455,7 @@ /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "abJ" = ( -/obj/structure/rack, -/obj/item/clothing/suit/armor/bulletproof{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/clothing/suit/armor/bulletproof, -/obj/item/clothing/suit/armor/bulletproof{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/clothing/head/helmet/alt{ - layer = 3.00001; - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/clothing/head/helmet/alt{ - layer = 3.00001 - }, -/obj/item/clothing/head/helmet/alt{ - layer = 3.00001; - pixel_x = 3; - pixel_y = -3 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/camera/motion{ - c_tag = "Armory Motion Sensor" - }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/smooth, /area/ai_monitored/security/armory) "abN" = ( /obj/structure/closet/secure_closet/contraband/armory, @@ -529,9 +497,9 @@ /turf/open/floor/iron/dark/side, /area/security/prison) "aci" = ( -/obj/vehicle/ridden/secway, -/obj/effect/turf_decal/delivery/blue, -/turf/open/floor/iron/dark, +/obj/machinery/power/apc/auto_name/east, +/obj/structure/cable, +/turf/open/floor/iron/smooth, /area/ai_monitored/security/armory) "ack" = ( /obj/effect/turf_decal/stripes/line{ @@ -541,17 +509,19 @@ /area/ai_monitored/security/armory) "acl" = ( /obj/effect/turf_decal/stripes/line{ - dir = 9 + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "acm" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /obj/structure/cable, -/obj/machinery/power/apc/auto_name/east, -/turf/open/floor/iron/dark, +/obj/structure/fence{ + dir = 4 + }, +/turf/open/floor/iron/smooth, /area/ai_monitored/security/armory) "acr" = ( /obj/structure/closet/secure_closet/engineering_personal, @@ -634,15 +604,6 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) -"acM" = ( -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/obj/structure/closet/secure_closet/smartgun, -/obj/effect/turf_decal/delivery/blue, -/turf/open/floor/iron/dark, -/area/ai_monitored/security/armory) "acQ" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, @@ -749,51 +710,13 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) -"adj" = ( -/obj/effect/turf_decal/bot, -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/rack, -/obj/item/storage/box/armament_tokens_sidearm{ - pixel_x = 7 - }, -/obj/item/storage/box/armament_tokens_primary{ - pixel_x = -8 - }, -/turf/open/floor/iron/dark, -/area/ai_monitored/security/armory) -"adk" = ( -/obj/structure/rack, -/obj/item/gun/ballistic/shotgun/riot{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/gun/ballistic/shotgun/riot, -/obj/item/gun/ballistic/shotgun/riot{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/effect/turf_decal/bot, -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/ai_monitored/security/armory) "adl" = ( /obj/machinery/door/poddoor/shutters{ id = "armory"; name = "Armoury Shutter" }, /obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/delivery/blue, /turf/open/floor/iron, /area/ai_monitored/security/armory) "ads" = ( @@ -961,6 +884,9 @@ }, /area/security/prison/safe) "aes" = ( +/obj/vehicle/ridden/secway, +/obj/effect/turf_decal/delivery/blue, +/obj/item/key/security, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "aet" = ( @@ -1864,6 +1790,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "ajE" = ( @@ -10203,6 +10132,9 @@ name = "Sergeant-at-Armsky"; weaponscheck = 1 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "bkD" = ( @@ -18009,34 +17941,6 @@ /obj/machinery/space_heater, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"coS" = ( -/obj/structure/rack, -/obj/effect/turf_decal/bot, -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/obj/item/storage/box/armament_tokens_energy, -/turf/open/floor/iron/dark, -/area/ai_monitored/security/armory) -"cpg" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/item/key/security, -/obj/item/circuitboard/machine/dish_drive/bullet, -/obj/item/circuitboard/machine/dish_drive/bullet, -/obj/item/circuitboard/machine/dish_drive/bullet, -/turf/open/floor/iron/dark, -/area/ai_monitored/security/armory) "cpl" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -18049,6 +17953,9 @@ dir = 4 }, /obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "cpE" = ( @@ -21202,12 +21109,10 @@ /turf/open/floor/iron, /area/engineering/atmos) "doq" = ( -/obj/machinery/camera/motion{ - c_tag = "Armory - External"; - dir = 1 - }, -/turf/open/floor/plating/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors) +/obj/structure/closet/secure_closet/smartgun, +/obj/effect/turf_decal/delivery/blue, +/turf/open/floor/iron/smooth, +/area/ai_monitored/security/armory) "doE" = ( /obj/structure/light_construct/directional/east, /turf/open/floor/iron, @@ -21903,10 +21808,7 @@ /turf/open/floor/wood, /area/service/lawoffice) "dLc" = ( -/obj/machinery/dish_drive/bullet{ - succrange = 3 - }, -/obj/structure/reagent_dispensers/peppertank/directional/south, +/obj/machinery/rnd/production/protolathe/department/security, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "dLg" = ( @@ -22544,9 +22446,6 @@ name = "Armory"; req_access_txt = "3" }, -/obj/machinery/light{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line, /obj/structure/cable, /obj/effect/turf_decal/delivery/blue, @@ -22554,6 +22453,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, +/obj/machinery/light/directional/east, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "ebX" = ( @@ -24844,24 +24744,6 @@ }, /turf/open/floor/iron, /area/maintenance/port/aft) -"fsz" = ( -/obj/structure/rack, -/obj/item/gun/energy/ionrifle, -/obj/item/gun/energy/temperature/security, -/obj/item/clothing/suit/hooded/ablative, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/iron/dark, -/area/ai_monitored/security/armory) "fsN" = ( /obj/machinery/door/airlock/atmos{ name = "Atmospherics"; @@ -25558,6 +25440,9 @@ /obj/structure/sign/painting/library, /turf/closed/wall, /area/hallway/secondary/service) +"fPz" = ( +/turf/closed/wall, +/area/ai_monitored/security/armory) "fPW" = ( /obj/structure/sign/nanotrasen, /turf/closed/wall/r_wall, @@ -30900,6 +30785,23 @@ "iJq" = ( /turf/open/floor/iron/cafeteria, /area/maintenance/port/aft) +"iJZ" = ( +/obj/structure/rack, +/obj/item/gun/energy/ionrifle, +/obj/item/gun/energy/temperature/security, +/obj/item/clothing/suit/hooded/ablative, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/ai_monitored/security/armory) "iKd" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -32322,7 +32224,7 @@ /turf/open/floor/iron/dark, /area/science/genetics) "jyJ" = ( -/obj/machinery/gun_vendor, +/obj/structure/table/reinforced, /turf/open/floor/iron/dark, /area/security/office) "jyL" = ( @@ -36135,6 +36037,12 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/plating, /area/engineering/storage/tech) +"lyH" = ( +/obj/structure/rack/gunrack, +/obj/effect/spawner/armory_spawn/shotguns, +/obj/effect/turf_decal/delivery/red, +/turf/open/floor/iron/smooth, +/area/ai_monitored/security/armory) "lyM" = ( /obj/structure/table, /obj/item/folder/yellow, @@ -40244,24 +40152,8 @@ }, /area/security/prison/safe) "nxy" = ( -/obj/structure/rack, -/obj/item/gun/energy/e_gun/dragnet, -/obj/item/gun/energy/e_gun/dragnet, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/item/melee/hammer, -/obj/item/melee/hammer, -/obj/item/melee/hammer, -/obj/machinery/firealarm/directional/north, -/turf/open/floor/iron/dark, +/obj/structure/fence, +/turf/open/floor/iron/smooth, /area/ai_monitored/security/armory) "nxB" = ( /turf/open/floor/plating, @@ -41506,6 +41398,12 @@ "omo" = ( /turf/open/floor/iron, /area/cargo/miningdock) +"onh" = ( +/obj/structure/closet/ammunitionlocker/useful, +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/delivery/red, +/turf/open/floor/iron/smooth, +/area/ai_monitored/security/armory) "ont" = ( /obj/machinery/atmospherics/components/binary/thermomachine/freezer{ dir = 4 @@ -43350,6 +43248,12 @@ /obj/structure/cable, /turf/open/floor/plating, /area/engineering/storage/tech) +"ppC" = ( +/obj/effect/turf_decal/loading_area{ + dir = 1 + }, +/turf/open/floor/iron/smooth, +/area/ai_monitored/security/armory) "ppE" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -44646,6 +44550,12 @@ }, /turf/open/floor/iron, /area/hallway/primary/port) +"pTU" = ( +/obj/structure/fence/corner{ + dir = 1 + }, +/turf/open/floor/iron/smooth, +/area/ai_monitored/security/armory) "pUe" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/white/line, @@ -45442,6 +45352,11 @@ /obj/machinery/holopad/secure, /turf/open/floor/carpet, /area/command/heads_quarters/hos) +"qqa" = ( +/obj/effect/turf_decal/delivery/red, +/obj/structure/rack/gunrack, +/turf/open/floor/iron/smooth, +/area/ai_monitored/security/armory) "qqH" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -45956,6 +45871,13 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron/freezer, /area/command/heads_quarters/captain) +"qHA" = ( +/obj/machinery/airalarm/directional/north, +/obj/structure/rack/gunrack, +/obj/effect/spawner/armory_spawn/rifles, +/obj/effect/turf_decal/delivery/red, +/turf/open/floor/iron/smooth, +/area/ai_monitored/security/armory) "qHE" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/carbon_output{ dir = 8 @@ -51552,6 +51474,12 @@ dir = 9 }, /area/science/research) +"tAU" = ( +/obj/structure/fence{ + dir = 4 + }, +/turf/open/floor/iron/smooth, +/area/ai_monitored/security/armory) "tAY" = ( /obj/structure/table/wood, /obj/item/taperecorder{ @@ -53535,6 +53463,16 @@ }, /turf/open/floor/iron/white, /area/medical/cryo) +"uyL" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/ai_monitored/security/armory) "uyS" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -53969,6 +53907,10 @@ }, /turf/open/floor/plating, /area/engineering/supermatter) +"uIu" = ( +/obj/structure/fence/door, +/turf/open/floor/iron/smooth, +/area/ai_monitored/security/armory) "uIv" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -56155,6 +56097,45 @@ dir = 5 }, /area/maintenance/port/aft) +"vVT" = ( +/obj/structure/rack, +/obj/item/clothing/suit/armor/bulletproof{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/clothing/suit/armor/bulletproof, +/obj/item/clothing/suit/armor/bulletproof{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/clothing/head/helmet/alt{ + layer = 3.00001; + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/clothing/head/helmet/alt{ + layer = 3.00001 + }, +/obj/item/clothing/head/helmet/alt{ + layer = 3.00001; + pixel_x = 3; + pixel_y = -3 + }, +/obj/machinery/camera/motion{ + c_tag = "Armory Motion Sensor" + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/ai_monitored/security/armory) "vWA" = ( /obj/machinery/vending/modularpc, /turf/open/floor/iron, @@ -59349,6 +59330,10 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/wood, /area/commons/dorms) +"xHN" = ( +/obj/structure/reagent_dispensers/peppertank, +/turf/closed/wall/r_wall, +/area/ai_monitored/security/armory) "xHX" = ( /obj/structure/extinguisher_cabinet/directional/north, /obj/effect/turf_decal/tile/neutral{ @@ -88917,13 +88902,13 @@ abz nxw aeH aaJ -boP -boP aaZ +sdP +vVT abm -cpg -adi -adi +abH +iJZ +abN adi aaZ tsa @@ -89174,10 +89159,10 @@ aaJ aaJ aaJ aaJ -bBM -boP aaZ -abH +uyL +acl +acl acl ajC acL @@ -89431,12 +89416,12 @@ blq blq boP bBM -boP -boP aaZ nxy +nxy +nxy +pTU ack -adk adK cqG avB @@ -89688,12 +89673,12 @@ cyJ cyJ rSN bBM -boP -doq aaZ +doq abJ +abJ +tAU ack -acM adQ cwM avB @@ -89945,12 +89930,12 @@ blq blq boP bBM -boP -boP aaZ -sdP +lyH +abJ +ppC +uIu ack -coS aet cxA aeY @@ -90202,12 +90187,12 @@ vOj vOj vOj vOj -vOj -boP -aaZ -fsz +fPz +onh +abJ +abJ +tAU ack -adj arc blT ebP @@ -90459,11 +90444,11 @@ uLo rtE rIf lsk -vOj -boP -aaZ -abN -ack +fPz +qHA +abJ +ppC +uIu bkA acF aes @@ -90716,15 +90701,15 @@ uLo und koX eBY -vOj -boP -aaZ +fPz +qqa +abJ aci acm cpA qac dLc -aaZ +xHN nsp agX agQ @@ -90973,8 +90958,8 @@ uLo hak iXb abC -vOj -vOj +fPz +aaZ aaZ aaZ aaZ diff --git a/_maps/map_files/MetaStation/MetaStation_skyrat.dmm b/_maps/map_files/MetaStation/MetaStation_skyrat.dmm index b78c69a47cd..1ba92a3e9d8 100644 --- a/_maps/map_files/MetaStation/MetaStation_skyrat.dmm +++ b/_maps/map_files/MetaStation/MetaStation_skyrat.dmm @@ -1026,8 +1026,10 @@ /turf/closed/wall/r_wall, /area/ai_monitored/security/armory) "aer" = ( -/obj/machinery/suit_storage_unit/security_peacekeeper, -/turf/open/floor/iron/dark, +/obj/structure/rack/gunrack, +/obj/effect/spawner/armory_spawn/shotguns, +/obj/effect/turf_decal/delivery/red, +/turf/open/floor/iron/smooth, /area/ai_monitored/security/armory) "aes" = ( /obj/effect/decal/cleanable/dirt, @@ -1826,13 +1828,10 @@ /turf/open/floor/iron/dark, /area/security/brig) "aiA" = ( -/obj/item/storage/secure/safe{ - name = "armory safe A"; - pixel_x = 6; - pixel_y = 28 - }, -/obj/machinery/suit_storage_unit/security_peacekeeper, -/turf/open/floor/iron/dark, +/obj/structure/closet/ammunitionlocker/useful, +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/delivery/red, +/turf/open/floor/iron/smooth, /area/ai_monitored/security/armory) "aiB" = ( /obj/structure/disposalpipe/segment{ @@ -2504,17 +2503,16 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/structure/rack, -/obj/item/storage/box/armament_tokens_primary{ - pixel_x = -8 - }, -/obj/item/storage/box/armament_tokens_sidearm{ - pixel_x = 7 - }, -/obj/item/storage/box/armament_tokens_energy, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/structure/closet/secure_closet{ + name = "contraband locker"; + req_access_txt = "3" + }, +/obj/effect/spawner/lootdrop/armory_contraband/metastation, +/obj/effect/spawner/lootdrop/maintenance/three, +/obj/item/gun/ballistic/rifle/boltaction, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "alW" = ( @@ -15818,17 +15816,9 @@ /turf/open/floor/iron, /area/hallway/secondary/service) "bLT" = ( -/obj/structure/closet/secure_closet{ - name = "contraband locker"; - req_access_txt = "3" - }, -/obj/effect/spawner/lootdrop/maintenance/three, -/obj/effect/spawner/lootdrop/armory_contraband/metastation, -/obj/machinery/light{ - dir = 1 - }, -/obj/item/gun/ballistic/rifle/boltaction, -/turf/open/floor/iron/dark, +/obj/structure/rack/gunrack, +/obj/effect/turf_decal/delivery/red, +/turf/open/floor/iron/smooth, /area/ai_monitored/security/armory) "bLW" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, @@ -81117,11 +81107,11 @@ /turf/open/floor/engine, /area/science/xenobiology) "xVU" = ( -/obj/item/radio/intercom{ - pixel_y = 25 - }, -/obj/machinery/suit_storage_unit/security_peacekeeper, -/turf/open/floor/iron/dark, +/obj/machinery/airalarm/directional/north, +/obj/structure/rack/gunrack, +/obj/effect/spawner/armory_spawn/rifles, +/obj/effect/turf_decal/delivery/red, +/turf/open/floor/iron/smooth, /area/ai_monitored/security/armory) "xVX" = ( /turf/open/floor/plating/airless, diff --git a/_maps/map_files/NSSJourney/NSSJourney.dmm b/_maps/map_files/NSSJourney/NSSJourney.dmm index 4aef06865b1..30d01c28b5e 100644 --- a/_maps/map_files/NSSJourney/NSSJourney.dmm +++ b/_maps/map_files/NSSJourney/NSSJourney.dmm @@ -139,23 +139,6 @@ /turf/open/floor/carpet, /area/command/heads_quarters/hos) "abm" = ( -/obj/structure/table, -/obj/item/storage/box/firingpins, -/obj/item/storage/box/firingpins, -/obj/item/key/security, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/ai_monitored/security/armory) -"abn" = ( /obj/structure/rack, /obj/item/gun/energy/e_gun/dragnet, /obj/item/gun/energy/e_gun/dragnet, @@ -172,9 +155,14 @@ /obj/item/melee/hammer, /obj/item/melee/hammer, /obj/item/melee/hammer, -/obj/machinery/firealarm/directional/north, +/obj/item/storage/box/firingpins, +/obj/item/storage/box/firingpins, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) +"abn" = ( +/obj/structure/fence, +/turf/open/floor/iron/smooth, +/area/ai_monitored/security/armory) "abo" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -386,24 +374,9 @@ /turf/open/floor/iron, /area/cargo/qm) "abN" = ( -/turf/open/floor/iron/dark, -/area/ai_monitored/security/armory) -"abQ" = ( -/obj/structure/rack, -/obj/item/gun/energy/ionrifle, -/obj/item/gun/energy/temperature/security, -/obj/item/clothing/suit/hooded/ablative, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/airalarm/directional/north, +/obj/vehicle/ridden/secway, +/obj/effect/turf_decal/delivery/blue, +/obj/item/key/security, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "abS" = ( @@ -37416,6 +37389,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "dRT" = ( @@ -37630,6 +37606,13 @@ }, /turf/open/floor/iron/dark/textured_large, /area/cargo/storage) +"dZT" = ( +/obj/machinery/airalarm/directional/north, +/obj/structure/rack/gunrack, +/obj/effect/spawner/armory_spawn/rifles, +/obj/effect/turf_decal/delivery/red, +/turf/open/floor/iron/smooth, +/area/ai_monitored/security/armory) "eaa" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -38484,6 +38467,10 @@ /obj/effect/turf_decal/trimline/darkblue/filled/line, /turf/open/floor/iron/dark, /area/hallway/primary/fore) +"eYL" = ( +/obj/machinery/gun_vendor, +/turf/open/floor/iron/dark, +/area/security/office) "eZk" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, @@ -38560,12 +38547,11 @@ /turf/open/floor/plating, /area/maintenance/solars/port/fore) "fdm" = ( -/obj/machinery/camera/motion{ - c_tag = "Armory - External"; - dir = 1 - }, -/turf/open/space/basic, -/area/space) +/obj/structure/rack/gunrack, +/obj/effect/spawner/armory_spawn/shotguns, +/obj/effect/turf_decal/delivery/red, +/turf/open/floor/iron/smooth, +/area/ai_monitored/security/armory) "fds" = ( /obj/machinery/door/airlock/command/glass{ name = "Gravity Generator Chamber"; @@ -39190,6 +39176,11 @@ /obj/structure/trash_pile, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"fFF" = ( +/obj/structure/closet/secure_closet/smartgun, +/obj/effect/turf_decal/delivery/blue, +/turf/open/floor/iron/smooth, +/area/ai_monitored/security/armory) "fFQ" = ( /obj/structure/cable, /obj/effect/turf_decal/siding/thinplating/dark{ @@ -39494,7 +39485,7 @@ /turf/open/floor/iron/dark, /area/security/prison) "fSV" = ( -/obj/machinery/gun_vendor, +/obj/structure/table/reinforced, /turf/open/floor/iron/dark, /area/security/office) "fTd" = ( @@ -39721,6 +39712,9 @@ dir = 4 }, /obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "gdQ" = ( @@ -40541,6 +40535,23 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron/dark, /area/security/checkpoint/auxiliary) +"gYM" = ( +/obj/structure/rack, +/obj/item/gun/energy/ionrifle, +/obj/item/gun/energy/temperature/security, +/obj/item/clothing/suit/hooded/ablative, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/ai_monitored/security/armory) "gYU" = ( /obj/machinery/camera{ c_tag = "Locker Room West"; @@ -41070,6 +41081,15 @@ dir = 9 }, /area/security/prison) +"hzc" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/ai_monitored/security/armory) "hzQ" = ( /obj/structure/grille, /turf/open/floor/plating, @@ -41262,6 +41282,14 @@ /obj/effect/landmark/start/security_officer, /turf/open/floor/iron/dark, /area/security/office) +"hEU" = ( +/obj/structure/grille, +/obj/machinery/camera/motion{ + c_tag = "Armory - External"; + dir = 1 + }, +/turf/open/space/basic, +/area/space/nearstation) "hFg" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -41495,6 +41523,9 @@ name = "Sergeant-at-Armsky"; weaponscheck = 1 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "hQC" = ( @@ -42141,6 +42172,12 @@ /obj/structure/cable, /turf/open/floor/iron, /area/hallway/primary/central) +"ivZ" = ( +/obj/effect/turf_decal/loading_area{ + dir = 1 + }, +/turf/open/floor/iron/smooth, +/area/ai_monitored/security/armory) "ixq" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, @@ -42650,6 +42687,9 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron/dark, /area/security/prison) +"jgL" = ( +/turf/open/floor/iron/smooth, +/area/ai_monitored/security/armory) "jgM" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -44783,6 +44823,11 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/medical/cryo) +"kQc" = ( +/obj/machinery/power/apc/auto_name/east, +/obj/structure/cable, +/turf/open/floor/iron/smooth, +/area/ai_monitored/security/armory) "kQe" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -44854,12 +44899,11 @@ /turf/open/floor/iron/white, /area/medical/medbay/central) "kVz" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /obj/structure/cable, -/obj/machinery/power/apc/auto_name/east, -/turf/open/floor/iron/dark, +/obj/structure/fence{ + dir = 4 + }, +/turf/open/floor/iron/smooth, /area/ai_monitored/security/armory) "kWe" = ( /obj/effect/turf_decal/tile/neutral, @@ -46796,6 +46840,11 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/port) +"mQS" = ( +/obj/structure/rack/gunrack, +/obj/effect/turf_decal/delivery/red, +/turf/open/floor/iron/smooth, +/area/ai_monitored/security/armory) "mRE" = ( /obj/structure/chair/office{ dir = 8 @@ -47180,13 +47229,6 @@ "nlg" = ( /turf/open/floor/iron/dark/textured_large, /area/service/hydroponics) -"nli" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/effect/turf_decal/delivery/blue, -/turf/open/floor/iron/dark, -/area/security/office) "nlo" = ( /obj/effect/turf_decal/tile/blue/darkblue{ dir = 8 @@ -48658,6 +48700,12 @@ }, /turf/open/floor/iron/freezer, /area/maintenance/starboard/fore) +"oEV" = ( +/obj/structure/fence/corner{ + dir = 1 + }, +/turf/open/floor/iron/smooth, +/area/ai_monitored/security/armory) "oFd" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -49457,13 +49505,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/maintenance/port/aft) -"puT" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/gun_vendor, -/turf/open/floor/iron/dark, -/area/security/office) "pva" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -49492,6 +49533,16 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/commons/vacant_room/commissary) +"pvP" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/ai_monitored/security/armory) "pwd" = ( /obj/structure/flora/ausbushes/fullgrass{ pixel_x = -3; @@ -50636,16 +50687,6 @@ }, /turf/open/floor/plating, /area/cargo/storage) -"qxh" = ( -/obj/structure/rack, -/obj/effect/turf_decal/bot, -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/obj/item/storage/box/armament_tokens_energy, -/turf/open/floor/iron/dark, -/area/ai_monitored/security/armory) "qxr" = ( /obj/machinery/holopad/secure, /turf/open/floor/iron/dark, @@ -50880,27 +50921,6 @@ }, /turf/open/floor/iron, /area/security/prison) -"qJV" = ( -/obj/structure/rack, -/obj/item/gun/ballistic/shotgun/riot{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/gun/ballistic/shotgun/riot, -/obj/item/gun/ballistic/shotgun/riot{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/effect/turf_decal/bot, -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/ai_monitored/security/armory) "qKp" = ( /obj/machinery/power/apc/auto_name/north, /obj/structure/cable, @@ -51138,6 +51158,12 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/service/hydroponics) +"qXa" = ( +/obj/structure/closet/ammunitionlocker/useful, +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/delivery/red, +/turf/open/floor/iron/smooth, +/area/ai_monitored/security/armory) "qXk" = ( /obj/effect/turf_decal/vg_decals/atmos/air{ dir = 1 @@ -51612,12 +51638,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/cargo/qm) -"rtz" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/iron/dark, -/area/ai_monitored/security/armory) "rut" = ( /obj/structure/table, /obj/item/clothing/suit/apron/chef, @@ -52433,9 +52453,7 @@ /turf/open/floor/iron/dark, /area/security/prison) "snY" = ( -/obj/machinery/dish_drive/bullet{ - succrange = 3 - }, +/obj/machinery/rnd/production/protolathe/department/security, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "sol" = ( @@ -52525,10 +52543,6 @@ }, /turf/open/floor/engine, /area/science/xenobiology) -"sur" = ( -/obj/machinery/rnd/production/techfab/department/security, -/turf/open/floor/iron/dark, -/area/ai_monitored/security/armory) "suJ" = ( /obj/effect/turf_decal/arrows, /obj/effect/turf_decal/stripes/line{ @@ -53802,15 +53816,6 @@ /obj/item/pen, /turf/open/floor/wood, /area/service/lawoffice) -"tzz" = ( -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/obj/structure/closet/secure_closet/smartgun, -/obj/effect/turf_decal/delivery/blue, -/turf/open/floor/iron/dark, -/area/ai_monitored/security/armory) "tzD" = ( /obj/structure/chair/stool, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ @@ -53912,24 +53917,6 @@ }, /turf/open/floor/iron, /area/commons/fitness) -"tDP" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/item/key/security, -/obj/item/circuitboard/machine/dish_drive/bullet, -/obj/item/circuitboard/machine/dish_drive/bullet, -/obj/item/circuitboard/machine/dish_drive/bullet, -/turf/open/floor/iron/dark, -/area/ai_monitored/security/armory) "tEk" = ( /obj/structure/cable, /obj/effect/turf_decal/siding/thinplating/dark, @@ -56028,11 +56015,6 @@ }, /turf/open/floor/iron/smooth_large, /area/engineering/main) -"vAI" = ( -/obj/vehicle/ridden/secway, -/obj/effect/turf_decal/delivery/blue, -/turf/open/floor/iron/dark, -/area/ai_monitored/security/armory) "vAN" = ( /obj/effect/landmark/start/brigoff, /turf/open/floor/iron/dark, @@ -56295,6 +56277,12 @@ /obj/structure/cable, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) +"vLz" = ( +/obj/structure/fence{ + dir = 4 + }, +/turf/open/floor/iron/smooth, +/area/ai_monitored/security/armory) "vLG" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -56472,24 +56460,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/wood, /area/maintenance/port/aft) -"vVl" = ( -/obj/effect/turf_decal/bot, -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/rack, -/obj/item/storage/box/armament_tokens_sidearm{ - pixel_x = 7 - }, -/obj/item/storage/box/armament_tokens_primary{ - pixel_x = -8 - }, -/turf/open/floor/iron/dark, -/area/ai_monitored/security/armory) "vVG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 4 @@ -56513,6 +56483,9 @@ /obj/machinery/computer/cargo/request, /turf/open/floor/iron/dark, /area/security/office) +"vWE" = ( +/turf/closed/wall, +/area/ai_monitored/security/armory) "vWX" = ( /obj/machinery/door/airlock/maintenance{ name = "Genetics Lab Maintenance"; @@ -57633,6 +57606,10 @@ /obj/effect/spawner/liquids_spawner, /turf/open/floor/iron/pool, /area/security/prison) +"wTo" = ( +/obj/structure/fence/door, +/turf/open/floor/iron/smooth, +/area/ai_monitored/security/armory) "wTp" = ( /obj/machinery/chem_heater/withbuffer, /obj/structure/window/reinforced, @@ -87555,14 +87532,14 @@ abz ydU teK aaJ -xzh -xzh aaZ +abI +abJ abm -tDP +abH +gYM iSP adi -adi aaZ lzE guI @@ -87812,11 +87789,11 @@ aaJ aaJ pUm aaJ -xzh -xzh aaZ -abH -rtz +pvP +hzc +hzc +hzc dRi otg adi @@ -88069,12 +88046,12 @@ xzh xzh xzh bBM -xzh -xzh aaZ abn +abn +abn +oEV xoJ -qJV obK cRD avB @@ -88325,13 +88302,13 @@ xzh xzh xzh xzh -bBM -xzh -fdm +hEU aaZ -abJ +fFF +jgL +jgL +vLz xoJ -tzz nNO ugN avB @@ -88583,12 +88560,12 @@ xzh xzh xzh bBM -xzh -xzh aaZ -abI +fdm +jgL +ivZ +wTo xoJ -qxh gLJ qNz rDX @@ -88840,12 +88817,12 @@ abq abq abq abq -abq -xzh -aaZ -abQ +vWE +qXa +jgL +jgL +vLz xoJ -vVl mlh nHu lPd @@ -89097,11 +89074,11 @@ hgD glM ovx trX -abq -xzh -aaZ -sur -xoJ +vWE +dZT +jgL +ivZ +wTo hPF uaA abN @@ -89354,10 +89331,10 @@ hgD iVu kwy utD -abq -xzh -aaZ -vAI +vWE +mQS +jgL +kQc kVz gdu kct @@ -89611,8 +89588,8 @@ hgD xjQ ygM nDg -abq -abo +vWE +aaZ aaZ aaZ aaZ @@ -90378,8 +90355,8 @@ xzh xzh xzh abq -puT -nli +eYL +wbO fBM mNa abo diff --git a/code/__DEFINES/~skyrat_defines/projectiles.dm b/code/__DEFINES/~skyrat_defines/projectiles.dm index b90d8857d44..4e99ca1d5d5 100644 --- a/code/__DEFINES/~skyrat_defines/projectiles.dm +++ b/code/__DEFINES/~skyrat_defines/projectiles.dm @@ -9,3 +9,6 @@ /// The caliber used by the M45A5 #define CALIBER_460 ".460 RM JHP" + +/// The caliber used by Armadyne shotguns. +#define CALIBER_14GAUGE "14 Gauge" diff --git a/code/game/objects/structures/fence.dm b/code/game/objects/structures/fence.dm index 98853f8a21d..6a9fd75d80d 100644 --- a/code/game/objects/structures/fence.dm +++ b/code/game/objects/structures/fence.dm @@ -114,8 +114,8 @@ /obj/structure/fence/door/Initialize() . = ..() - - update_door_status() + if(open) //SKYRAT EDIT CHANGE + update_door_status() /obj/structure/fence/door/opened icon_state = "door_opened" diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm index 92c7c5ac112..c2d2f0cc06e 100644 --- a/code/modules/jobs/job_types/security_officer.dm +++ b/code/modules/jobs/job_types/security_officer.dm @@ -196,7 +196,7 @@ GLOBAL_LIST_EMPTY(security_officer_distribution) shoes = /obj/item/clothing/shoes/combat/peacekeeper //SKYRAT EDIT CHANGE - SEC_HAUL l_pocket = /obj/item/restraints/handcuffs r_pocket = /obj/item/assembly/flash/handheld - suit_store = /obj/item/gun/energy/taser/armadyne //SKYRAT EDIT CHANGE - SEC_HAUL + suit_store = /obj/item/gun/energy/disabler backpack_contents = list(/obj/item/melee/classic_baton/peacekeeper, /obj/item/armament_token/sidearm) //SKYRAT EDIT CHANGE - SEC_HAUL - ORIGINAL: backpack_contents = list(/obj/item/melee/baton/loaded=1) backpack = /obj/item/storage/backpack/security/peacekeeper //SKYRAT EDIT CHANGE - SEC_HAUL - ORIGINAL: backpack = /obj/item/storage/backpack/security diff --git a/code/modules/jobs/job_types/warden.dm b/code/modules/jobs/job_types/warden.dm index 47c1e9dc198..71cc8a12c7d 100644 --- a/code/modules/jobs/job_types/warden.dm +++ b/code/modules/jobs/job_types/warden.dm @@ -49,7 +49,7 @@ glasses = /obj/item/clothing/glasses/hud/security/sunglasses/peacekeeper //SKYRAT EDIT CHANGE - SEC_HAUL - ORIGINAL: /obj/item/clothing/glasses/hud/security/sunglasses r_pocket = /obj/item/assembly/flash/handheld l_pocket = /obj/item/restraints/handcuffs - //suit_store = /obj/item/gun/energy/disabler //SKYRAT EDIT REMOVAL - SEC_HAUL + suit_store = /obj/item/gun/energy/disabler backpack_contents = list(/obj/item/melee/classic_baton/peacekeeper, /obj/item/clothing/head/beret/sec/peacekeeper, /obj/item/armament_token/sidearm) //SKRYAT EDIT CHANGE - SEC_HAUL - ORIGINAL: backpack_contents = list(/obj/item/melee/baton/loaded=1) backpack = /obj/item/storage/backpack/security/peacekeeper //SKYRAT EDIT CHANGE - SEC_HAUL - ORIGINAL: backpack = /obj/item/storage/backpack/security diff --git a/modular_skyrat/modules/aesthetics/rack/code/rack.dm b/modular_skyrat/modules/aesthetics/rack/code/rack.dm index 0bc7ea39143..131e870c74f 100644 --- a/modular_skyrat/modules/aesthetics/rack/code/rack.dm +++ b/modular_skyrat/modules/aesthetics/rack/code/rack.dm @@ -6,3 +6,42 @@ icon_state = "shelf" name = "Shelf" desc = "A shelf, for storing things on. Conveinent!" + +/obj/item/gun + var/on_rack = FALSE + +/obj/item/gun/proc/place_on_rack() + on_rack = TRUE + var/matrix/M = matrix() + M.Turn(-90) + transform = M + +/obj/item/gun/proc/remove_from_rack() + if(on_rack) + var/matrix/M = matrix() + transform = M + on_rack = FALSE + +/obj/item/gun/pickup(mob/user) + . = ..() + remove_from_rack() + +/obj/structure/rack/gunrack + icon_state = "gunrack" + name = "gun rack" + desc = "A gun rack for storing guns." + +/obj/structure/rack/gunrack/attackby(obj/item/W, mob/living/user, params) + var/list/modifiers = params2list(params) + if (W.tool_behaviour == TOOL_WRENCH && !(flags_1&NODECONSTRUCT_1) && LAZYACCESS(modifiers, RIGHT_CLICK)) + W.play_tool_sound(src) + deconstruct(TRUE) + return + if(user.combat_mode) + return ..() + if(user.transferItemToLoc(W, drop_location())) + if(istype(W, /obj/item/gun)) + var/obj/item/gun/our_gun = W + our_gun.place_on_rack() + our_gun.pixel_x = rand(-10, 10) + return TRUE diff --git a/modular_skyrat/modules/aesthetics/rack/icons/rack.dmi b/modular_skyrat/modules/aesthetics/rack/icons/rack.dmi index f2f514555c469604276c3f1ea46ede2f729a722a..14e3b6eb51da0a04ac38240a832d2f4c833a1182 100644 GIT binary patch delta 399 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 delta 10736 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 diff --git a/modular_skyrat/modules/sec_haul/icons/guns/sas14.dmi b/modular_skyrat/modules/sec_haul/icons/guns/sas14.dmi new file mode 100644 index 0000000000000000000000000000000000000000..77452eaf7c1624fb7006fe769baab37d55800786 GIT binary patch literal 405 zcmV;G0c!q00001 zbW%=J06^y0W&i*Ha(Yx)bVOxyV{&P5bZKvH004NLQ&wGT`005OqL_t(YiS3d*5`-WOKndA^ zt_JRZTN7Be5l3+>Eb^p4hdlGaIm0lFQ{ZWz7Z4G!;ql|^bKOD}-Gmq;O!JKK+knO{ zZds?kj|+(?WekD@BmDl-@th~fxxgvse>z0vo92C2$hsUX*XJVb?w&2VFzb@Hff{|l zzEC?TwGEedBy@Ge?002S_5iTt)M@L7Iu4C5#0004WQchCV=- z0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zi zl2jm5sVFfoB|kSly);jWi!&v&s2C_{$i~Q#c|KCo zbVEX-!)QDnd;SmBs2#u+UTf+3%5^81K+`0d&f?K%h^QPNEm#+tTLU!hTBDulDb-#($r_L( z3;ehmw?1Gl6HFVvKDW!@2w+TS0Ao^&Fi;wXVQQF%6OV8w;3LF{kb;*xpMD$zEOZ+H zv*wK^kC~@K1W41+9NuPs{#vf=O@OollyU%9qI%Ydzg}A>_;#PqMP*R#YmNXpE^=JV zdavb*1%GL2YYE76Q!A$*H#v8J)w(J8d~BP7$jc18R{_pkWjNAiv#|x2rjos;Mw|rF z$WFX#Eb3lta4hWaPam+|+HLFj0H8YANkFk$GQiqT|DAVT2AQD@7~opF7geS}f$UE3 z@=H! zo;rcPKCJ!$!1N2q`Bibedb(7`>Jd<@rxHCA-~sg)4r@F*?A*Y&00000NkvXXu0mjf D^y#To literal 0 HcmV?d00001 diff --git a/modular_skyrat/modules/sec_haul/sound/shotgun_bm.ogg b/modular_skyrat/modules/sec_haul/sound/shotgun_bm.ogg new file mode 100644 index 0000000000000000000000000000000000000000..3ff5fff0a274367ffb96322947446c31b38f1fb6 GIT binary patch literal 37917 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�a0L-p*UP*5U9v< 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 literal 0 HcmV?d00001 diff --git a/tgstation.dme b/tgstation.dme index b108dd84e26..d3429726058 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4424,6 +4424,7 @@ #include "modular_skyrat\modules\rod-stopper\code\rodstopper.dm" #include "modular_skyrat\modules\sec_haul\code\guns\ammo.dm" #include "modular_skyrat\modules\sec_haul\code\guns\bullets.dm" +#include "modular_skyrat\modules\sec_haul\code\guns\gun_spawns.dm" #include "modular_skyrat\modules\sec_haul\code\guns\guns.dm" #include "modular_skyrat\modules\sec_haul\code\guns\token_system\gunsets.dm" #include "modular_skyrat\modules\sec_haul\code\guns\token_system\token_system.dm"