diff --git a/code/game/objects/items/devices/coins.dm b/code/game/objects/items/devices/coins.dm index 6ab79e3216d4..28f773247c04 100644 --- a/code/game/objects/items/devices/coins.dm +++ b/code/game/objects/items/devices/coins.dm @@ -29,6 +29,11 @@ icon_state = "coin_silver" black_market_value = 25 +//CO coin +/obj/item/coin/silver/falcon + name = "falling falcons challenge coin" + desc = "A small coin, bearing the falling falcons insignia." + /obj/item/coin/copper name = "copper coin" desc = "A familiar, but cheap form of currency." diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm index ffd993777644..1edac3a8f324 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm @@ -32,6 +32,8 @@ GLOBAL_LIST_EMPTY(co_secure_boxes) /obj/structure/closet/secure_closet/securecom/Initialize() . = ..() + new /obj/item/storage/box/kit/honorguard(src) + new /obj/item/storage/box/kit/honorguard(src) GLOB.co_secure_boxes += src /obj/structure/closet/secure_closet/securecom/Destroy() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/guncabinet.dm similarity index 85% rename from code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm rename to code/game/objects/structures/crates_lockers/closets/secure/guncabinet/guncabinet.dm index db20a738c8ed..4531a68c42dd 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/guncabinet.dm @@ -65,21 +65,7 @@ contents_explosion(severity - EXPLOSION_THRESHOLD_LOW) deconstruct(FALSE) -/obj/structure/closet/secure_closet/guncabinet/mp_armory -// req_access = list(ACCESS_MARINE_BRIG) - req_level = SEC_LEVEL_RED - -/obj/structure/closet/secure_closet/guncabinet/mp_armory/Initialize() - . = ..() - new /obj/item/weapon/gun/shotgun/combat(src) - new /obj/item/weapon/gun/shotgun/combat(src) - new /obj/item/ammo_magazine/shotgun/slugs(src) - new /obj/item/ammo_magazine/shotgun/buckshot(src) - new /obj/item/ammo_magazine/shotgun/buckshot(src) - new /obj/item/ammo_magazine/shotgun/buckshot(src) - - - +//this is used on corsat.(leaving it as a prop i guess) /obj/structure/closet/secure_closet/guncabinet/riot_control name = "riot control equipment closet" // req_access = list(ACCESS_MARINE_BRIG) @@ -111,15 +97,10 @@ new /obj/item/clothing/suit/armor/riot/marine(src) new /obj/item/storage/box/flashbangs(src) - /obj/structure/closet/secure_closet/guncabinet/green name = "green level gun cabinet" req_level = SEC_LEVEL_GREEN -/obj/structure/closet/secure_closet/guncabinet/blue - name = "blue level gun cabinet" - req_level = SEC_LEVEL_BLUE - /obj/structure/closet/secure_closet/guncabinet/red name = "red level gun cabinet" req_level = SEC_LEVEL_RED diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_blue.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_blue.dm new file mode 100644 index 000000000000..acc43c302e6d --- /dev/null +++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_blue.dm @@ -0,0 +1,37 @@ +/obj/structure/closet/secure_closet/guncabinet/blue + name = "blue level gun cabinet" + req_level = SEC_LEVEL_BLUE + +//riot gear control cabinet adding vehicle clamp to it to... +// make more sense than in red alert cabinet. + +/obj/structure/closet/secure_closet/guncabinet/blue/riot_control + name = "riot control equipment closet" + storage_capacity = 55 //lots of stuff to fit in + req_level = SEC_LEVEL_BLUE + +/obj/structure/closet/secure_closet/guncabinet/blue/riot_control/Initialize() + . = ..() + new /obj/item/weapon/gun/shotgun/combat/riot(src, TRUE) + new /obj/item/weapon/gun/shotgun/combat/riot(src, TRUE) + new /obj/item/weapon/gun/shotgun/combat/riot(src, TRUE) + new /obj/item/weapon/shield/riot(src) + new /obj/item/weapon/shield/riot(src) + new /obj/item/weapon/shield/riot(src) + new /obj/item/ammo_magazine/shotgun/beanbag/riot(src) + new /obj/item/ammo_magazine/shotgun/beanbag/riot(src) + new /obj/item/ammo_magazine/shotgun/beanbag/riot(src) + new /obj/item/ammo_magazine/shotgun/beanbag/riot(src) + new /obj/item/weapon/gun/launcher/grenade/m81/riot(src, TRUE) + new /obj/item/storage/box/nade_box/tear_gas(src) + new /obj/item/clothing/mask/gas(src) + new /obj/item/clothing/mask/gas(src) + new /obj/item/clothing/mask/gas(src) + new /obj/item/clothing/head/helmet/riot(src) + new /obj/item/clothing/head/helmet/riot(src) + new /obj/item/clothing/head/helmet/riot(src) + new /obj/item/clothing/suit/armor/riot/marine(src) + new /obj/item/clothing/suit/armor/riot/marine(src) + new /obj/item/clothing/suit/armor/riot/marine(src) + new /obj/item/storage/box/flashbangs(src) + new /obj/item/vehicle_clamp(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_red.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_red.dm new file mode 100644 index 000000000000..093aac33f7d0 --- /dev/null +++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_red.dm @@ -0,0 +1,105 @@ +/obj/structure/closet/secure_closet/guncabinet/red + name = "red level gun cabinet" + req_level = SEC_LEVEL_RED + +// MP ARMORY + +// 3 shotgun cabinet are in brig armory +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun + +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun/Initialize() + . = ..() + new /obj/item/weapon/gun/shotgun/combat(src) + new /obj/item/weapon/gun/shotgun/combat(src) + new /obj/item/weapon/gun/shotgun/combat(src) + new /obj/item/ammo_box/magazine/shotgun/buckshot(src) + new /obj/item/ammo_box/magazine/shotgun(src) + +// 2 M39 cabinet are in brig armory (4 M39 and 12 mags) +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun + +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun/Initialize() + . = ..() + new /obj/item/weapon/gun/smg/m39(src) + new /obj/item/weapon/gun/smg/m39(src) + new /obj/item/weapon/gun/smg/m39(src) + new /obj/item/weapon/gun/smg/m39(src) + new /obj/item/ammo_box/magazine/m39(src) + +// 2 m4ra cabinet are in brig armory (m4ra guns and 12 mags) +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle + +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle/Initialize() + . = ..() + new /obj/item/weapon/gun/rifle/m4ra(src) + new /obj/item/weapon/gun/rifle/m4ra(src) + new /obj/item/weapon/gun/rifle/m4ra(src) + new /obj/item/weapon/gun/rifle/m4ra(src) + new /obj/item/ammo_box/magazine/m4ra(src) + +// EXECUTION CHAMBER might add that here need to ask first... will reskin if asked. + + + +// CIC ARMORY + +// 4 shotgun cabinet are in cic armory +/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_shotgun + +/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_shotgun/Initialize() + . = ..() + new /obj/item/weapon/gun/shotgun/combat(src) + new /obj/item/ammo_magazine/shotgun/slugs(src) + new /obj/item/ammo_magazine/shotgun/buckshot(src) + +//4 MK1 cabinet(using guncase because it fit well here it seem) +/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle + +/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle/Initialize() + . = ..() + new /obj/item/storage/box/guncase/m41aMK1(src) + +// UPPER MEDBAY ARMORY + +//1 shotgun armory closet 2 guns and 4 mags +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun + +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun/Initialize() + . = ..() + new /obj/item/weapon/gun/shotgun/combat(src) + new /obj/item/weapon/gun/shotgun/combat(src) + new /obj/item/ammo_magazine/shotgun/slugs(src) + new /obj/item/ammo_magazine/shotgun/slugs(src) + new /obj/item/ammo_magazine/shotgun/buckshot(src) + new /obj/item/ammo_magazine/shotgun/buckshot(src) + +// 2 pistol amory closet maybe to replace with full pistol belt... +/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol + +/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol/Initialize() + . = ..() + new /obj/item/storage/belt/gun/m4a3/full(src) + new /obj/item/storage/belt/gun/m4a3/full(src) + new /obj/item/storage/belt/gun/m4a3/full(src) + new /obj/item/storage/belt/gun/m4a3/full(src) + new /obj/item/ammo_box/magazine/m4a3(src) + +// 2 M39 cabinet are in medical armory (4 M39 and 12 mags) +/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun + +/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun/Initialize() + . = ..() + new /obj/item/weapon/gun/smg/m39(src) + new /obj/item/weapon/gun/smg/m39(src) + new /obj/item/weapon/gun/smg/m39(src) + new /obj/item/weapon/gun/smg/m39(src) + new /obj/item/ammo_box/magazine/m39(src) + +// UPPER ENGI ARMORY +// same as medical + +// REQ ARMORY +// same as medical + +// Small office in hangar armory same as brig armory.... +// same as brig armory diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm index 87e713ad0af8..011fa2a17f48 100644 --- a/code/game/objects/structures/safe.dm +++ b/code/game/objects/structures/safe.dm @@ -222,3 +222,28 @@ FLOOR SAFES /obj/structure/safe/floor/hide(intact) invisibility = intact ? 101 : 0 + +//almayer + +/obj/structure/safe/co_office + +/obj/structure/safe/co_office/Initialize() + . = ..() + new /obj/item/clothing/glasses/monocle(src) + new /obj/item/book/codebook(src) + new /obj/item/coin/silver/falcon(src) + new /obj/item/weapon/telebaton(src) + new /obj/item/moneybag(src) + +/obj/structure/safe/cl_office + +/obj/structure/safe/cl_office/Initialize() + . = ..() + new /obj/item/clothing/suit/armor/bulletproof(src) + new /obj/item/weapon/gun/pistol/es4(src) + new /obj/item/ammo_magazine/pistol/es4(src) + new /obj/item/ammo_magazine/pistol/es4(src) + new /obj/item/clothing/accessory/storage/holster(src) + new /obj/item/spacecash/c1000/counterfeit(src) + new /obj/item/spacecash/c1000/counterfeit(src) + new /obj/item/coin/platinum(src) diff --git a/colonialmarines.dme b/colonialmarines.dme index 3f40c156d075..0633cb3df868 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -1248,13 +1248,15 @@ s// DM Environment file for colonialmarines.dme. #include "code\game\objects\structures\crates_lockers\closets\secure\cm_closets.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\engineering.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\freezer.dm" -#include "code\game\objects\structures\crates_lockers\closets\secure\guncabinet.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\hydroponics.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\medical.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\personal.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\scientist.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\secure_closets.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\security.dm" +#include "code\game\objects\structures\crates_lockers\closets\secure\guncabinet\guncabinet.dm" +#include "code\game\objects\structures\crates_lockers\closets\secure\guncabinet\level_blue.dm" +#include "code\game\objects\structures\crates_lockers\closets\secure\guncabinet\level_red.dm" #include "code\game\objects\structures\pipes\binary_misc.dm" #include "code\game\objects\structures\pipes\pipes.dm" #include "code\game\objects\structures\pipes\trinary_misc.dm" diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 32937d821d60..a3a12c285ca1 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -1641,15 +1641,7 @@ }, /area/space) "afo" = ( -/obj/structure/safe, -/obj/item/moneybag, -/obj/item/clothing/glasses/monocle, -/obj/item/weapon/telebaton, -/obj/item/book/codebook, -/obj/item/coin/silver{ - desc = "A small coin, bearing the falling falcons insignia."; - name = "falling falcons challenge coin" - }, +/obj/structure/safe/co_office, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) "afq" = ( @@ -2756,8 +2748,6 @@ /area/almayer/medical/upper_medical) "ajm" = ( /obj/structure/closet/secure_closet/securecom, -/obj/item/storage/box/kit/honorguard, -/obj/item/storage/box/kit/honorguard, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -3715,10 +3705,10 @@ }, /area/almayer/hallways/aft_hallway) "amE" = ( -/obj/structure/closet/secure_closet/guncabinet/red, /obj/item/clothing/suit/storage/marine/light/vest, /obj/item/clothing/suit/storage/marine/light/vest, /obj/item/clothing/suit/storage/marine/light/vest, +/obj/structure/surface/rack, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -3946,23 +3936,11 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_a_s) "anp" = ( -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/weapon/gun/pistol/m4a3, -/obj/structure/closet/secure_closet/guncabinet/red, /obj/structure/sign/safety/hazard{ pixel_x = 15; pixel_y = 32 }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -3973,31 +3951,27 @@ name = "General Listening Channel"; pixel_y = 28 }, -/obj/structure/closet/secure_closet/guncabinet/red, /obj/item/clothing/suit/storage/marine/light/vest, /obj/item/clothing/suit/storage/marine/light/vest, /obj/item/clothing/suit/storage/marine/light/vest, /obj/item/clothing/suit/storage/marine/light/vest, /obj/item/clothing/suit/storage/marine/light/vest, /obj/item/clothing/suit/storage/marine/light/vest, +/obj/structure/surface/rack, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, /turf/open/floor/almayer{ icon_state = "redfull" }, /area/almayer/medical/upper_medical) "anr" = ( -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/weapon/gun/smg/m39, -/obj/item/weapon/gun/smg/m39, -/obj/item/weapon/gun/smg/m39, -/obj/item/weapon/gun/smg/m39, -/obj/structure/closet/secure_closet/guncabinet/red, /obj/structure/sign/safety/intercom{ pixel_x = 8; pixel_y = 32 }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -5638,17 +5612,11 @@ /turf/open/floor/almayer, /area/almayer/engineering/engineering_workshop/hangar) "asu" = ( -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/weapon/gun/shotgun/combat, -/obj/structure/closet/secure_closet/guncabinet/red, /obj/structure/sign/safety/hazard{ pixel_x = 32; pixel_y = -8 }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -6077,10 +6045,7 @@ /turf/open/floor/almayer, /area/almayer/engineering/engineering_workshop/hangar) "atx" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/ammo_magazine/shotgun/buckshot, +/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_shotgun, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -6691,10 +6656,7 @@ /turf/open/floor/plating, /area/almayer/command/cic) "auR" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/ammo_magazine/rifle/m41aMK1/ap, -/obj/item/ammo_magazine/rifle/m41aMK1/ap, -/obj/item/weapon/gun/rifle/m41aMK1/ap, +/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -8093,13 +8055,7 @@ }, /area/almayer/engineering/upper_engineering) "azp" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -10577,19 +10533,7 @@ }, /area/almayer/engineering/upper_engineering) "aIV" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/weapon/gun/smg/m39, -/obj/item/weapon/gun/smg/m39, -/obj/item/weapon/gun/smg/m39, -/obj/item/weapon/gun/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, +/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -15690,15 +15634,7 @@ }, /area/almayer/living/bridgebunks) "bhM" = ( -/obj/structure/safe, -/obj/item/coin/platinum, -/obj/item/spacecash/c1000/counterfeit, -/obj/item/spacecash/c1000/counterfeit, -/obj/item/clothing/accessory/storage/holster, -/obj/item/weapon/gun/pistol/es4, -/obj/item/ammo_magazine/pistol/es4, -/obj/item/ammo_magazine/pistol/es4, -/obj/item/clothing/suit/armor/bulletproof, +/obj/structure/safe/cl_office, /turf/open/floor/wood/ship, /area/almayer/command/corporateliason) "bhT" = ( @@ -23797,13 +23733,6 @@ }, /area/almayer/squads/charlie_delta_shared) "bUo" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, /obj/structure/sign/safety/ammunition{ pixel_x = 15; pixel_y = -32 @@ -23811,6 +23740,7 @@ /obj/structure/sign/safety/hazard{ pixel_y = -32 }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -35305,16 +35235,6 @@ }, /area/almayer/shipboard/starboard_missiles) "frJ" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/weapon/gun/shotgun/combat, /obj/effect/decal/warning_stripes{ icon_state = "S" }, @@ -35325,6 +35245,7 @@ /obj/structure/sign/safety/hazard{ pixel_y = 32 }, +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, /turf/open/floor/plating/almayer, /area/almayer/shipboard/brig/armory) "frM" = ( @@ -37380,11 +37301,7 @@ }, /area/almayer/hull/lower_hull/l_a_s) "gka" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -39238,17 +39155,11 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/port_hallway) "hbI" = ( -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/weapon/gun/shotgun/combat, -/obj/structure/closet/secure_closet/guncabinet/red, /obj/structure/sign/safety/ammunition{ pixel_x = 32; pixel_y = 7 }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -46968,16 +46879,7 @@ icon_state = "N"; pixel_y = 2 }, -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/weapon/gun/rifle/m4ra, -/obj/item/weapon/gun/rifle/m4ra, -/obj/item/ammo_magazine/rifle/m4ra, -/obj/item/ammo_magazine/rifle/m4ra, -/obj/item/ammo_magazine/rifle/m4ra, -/obj/item/ammo_magazine/rifle/m4ra, -/obj/item/ammo_magazine/rifle/m4ra, -/obj/item/ammo_magazine/rifle/m4ra, -/obj/item/ammo_magazine/rifle/m4ra, +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -48141,25 +48043,13 @@ }, /area/almayer/hallways/aft_hallway) "kTc" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/weapon/gun/shotgun/combat, /obj/structure/machinery/light/small{ dir = 8 }, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/vehicle_clamp, -/obj/item/vehicle_clamp, -/obj/item/vehicle_clamp, /obj/effect/decal/warning_stripes{ icon_state = "S" }, +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, /turf/open/floor/plating/almayer, /area/almayer/shipboard/brig/armory) "kTq" = ( @@ -51737,11 +51627,8 @@ /turf/open/floor/almayer, /area/almayer/living/port_emb) "mtX" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/ammo_magazine/rifle/m41aMK1/ap, -/obj/item/ammo_magazine/rifle/m41aMK1/ap, -/obj/item/weapon/gun/rifle/m41aMK1/ap, /obj/structure/machinery/light, +/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -51981,13 +51868,10 @@ /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) "mAr" = ( -/obj/structure/closet/secure_closet/guncabinet/riot_control, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, /obj/effect/decal/warning_stripes{ icon_state = "S" }, +/obj/structure/closet/secure_closet/guncabinet/blue/riot_control, /turf/open/floor/plating/almayer, /area/almayer/shipboard/brig/armory) "mAT" = ( @@ -54506,12 +54390,6 @@ }, /area/almayer/command/lifeboat) "nDd" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, /obj/structure/sign/safety/ammunition{ pixel_x = 15; pixel_y = 32 @@ -54519,8 +54397,7 @@ /obj/structure/sign/safety/hazard{ pixel_y = 32 }, -/obj/item/weapon/gun/smg/m39, -/obj/item/weapon/gun/smg/m39, +/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -56106,19 +55983,10 @@ /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/cells) "omu" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/weapon/gun/shotgun/combat, /obj/effect/decal/warning_stripes{ icon_state = "S" }, +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, /turf/open/floor/plating/almayer, /area/almayer/shipboard/brig/armory) "omy" = ( @@ -57368,7 +57236,7 @@ "oNf" = ( /obj/item/stack/folding_barricade/three, /obj/item/stack/folding_barricade/three, -/obj/structure/closet/secure_closet/guncabinet/red, +/obj/structure/surface/rack, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -59765,19 +59633,7 @@ }, /area/almayer/hull/lower_hull/l_f_p) "pVx" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/weapon/gun/smg/m39, -/obj/item/weapon/gun/smg/m39, -/obj/item/weapon/gun/smg/m39, -/obj/item/weapon/gun/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, +/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -60819,22 +60675,10 @@ /turf/open/floor/wood/ship, /area/almayer/living/basketball) "qqr" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, /obj/structure/machinery/light{ dir = 8 }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -61582,16 +61426,10 @@ }, /area/almayer/medical/medical_science) "qJf" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, /obj/structure/machinery/light{ dir = 4 }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -65511,13 +65349,10 @@ }, /area/almayer/engineering/upper_engineering/starboard) "ssW" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/weapon/gun/shotgun/combat, /obj/structure/machinery/light{ dir = 1 }, -/obj/item/ammo_magazine/shotgun/buckshot, +/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_shotgun, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -66424,22 +66259,10 @@ /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) "sOZ" = ( -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/weapon/gun/pistol/m4a3, -/obj/structure/closet/secure_closet/guncabinet/red, /obj/structure/sign/safety/ammunition{ pixel_y = 32 }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -66845,20 +66668,11 @@ }, /area/almayer/lifeboat_pumps/south2) "sYB" = ( -/obj/structure/closet/secure_closet/guncabinet/red, /obj/effect/decal/warning_stripes{ icon_state = "N"; pixel_y = 2 }, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/weapon/gun/smg/m39, -/obj/item/weapon/gun/smg/m39, +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun, /turf/open/floor/plating/almayer, /area/almayer/shipboard/brig/armory) "sYC" = ( @@ -71842,16 +71656,13 @@ /turf/open/floor/plating, /area/almayer/hallways/repair_bay) "uZY" = ( -/obj/structure/closet/secure_closet/guncabinet/riot_control, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, /obj/effect/decal/warning_stripes{ icon_state = "S" }, /obj/structure/machinery/light/small{ dir = 1 }, +/obj/structure/closet/secure_closet/guncabinet/blue/riot_control, /turf/open/floor/plating/almayer, /area/almayer/shipboard/brig/armory) "uZZ" = ( @@ -72811,16 +72622,13 @@ }, /area/almayer/hallways/hangar) "vsI" = ( -/obj/structure/closet/secure_closet/guncabinet/riot_control, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, /obj/effect/decal/warning_stripes{ icon_state = "S" }, /obj/structure/machinery/camera/autoname/almayer{ name = "ship-grade camera" }, +/obj/structure/closet/secure_closet/guncabinet/blue/riot_control, /turf/open/floor/plating/almayer, /area/almayer/shipboard/brig/armory) "vsJ" = ( @@ -76670,22 +76478,14 @@ /turf/closed/wall/almayer/outer, /area/almayer/hull/lower_hull/l_a_s) "wVw" = ( -/obj/structure/closet/secure_closet/guncabinet/red, /obj/structure/machinery/light/small{ dir = 8 }, -/obj/item/vehicle_clamp, -/obj/item/vehicle_clamp, -/obj/item/vehicle_clamp, /obj/effect/decal/warning_stripes{ icon_state = "N"; pixel_y = 2 }, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/weapon/gun/smg/m39, -/obj/item/weapon/gun/smg/m39, +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun, /turf/open/floor/plating/almayer, /area/almayer/shipboard/brig/armory) "wVy" = ( @@ -77635,18 +77435,10 @@ icon_state = "N"; pixel_y = 2 }, -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/weapon/gun/rifle/m4ra, -/obj/item/weapon/gun/rifle/m4ra, -/obj/item/ammo_magazine/rifle/m4ra, -/obj/item/ammo_magazine/rifle/m4ra, -/obj/item/ammo_magazine/rifle/m4ra, -/obj/item/ammo_magazine/rifle/m4ra, -/obj/item/ammo_magazine/rifle/m4ra, -/obj/item/ammo_magazine/rifle/m4ra, /obj/structure/reagent_dispensers/peppertank{ pixel_y = -30 }, +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle, /turf/open/floor/almayer{ dir = 5; icon_state = "plating"