From 29efbab4498010493b9ffb43e62ac2732272bbb7 Mon Sep 17 00:00:00 2001 From: AmoryBlaine Date: Sun, 22 Sep 2024 01:12:10 -0400 Subject: [PATCH 1/2] Update gun_rack.dm --- code/game/objects/structures/gun_rack.dm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/code/game/objects/structures/gun_rack.dm b/code/game/objects/structures/gun_rack.dm index 45a63e46f3..b908fc3f9f 100644 --- a/code/game/objects/structures/gun_rack.dm +++ b/code/game/objects/structures/gun_rack.dm @@ -53,6 +53,9 @@ /obj/structure/gun_rack/m41/unloaded populate_type = /obj/item/weapon/gun/rifle/m41aMK1/unloaded +/obj/structure/gun_rack/m41/empty + initial_stored = 0 + /obj/structure/gun_rack/type71 icon_state = "type71" desc = "Some off-branded gun rack. Per SOF and UPPA regulations, weapons should be stored in secure safes and only given out when necessary. Of course, most (but not all!) units overlook this regulation, only storing their firearms in safes when inspection arrives." @@ -64,6 +67,9 @@ /obj/structure/gun_rack/type71/unloaded populate_type = /obj/item/weapon/gun/rifle/type71/unloaded +/obj/structure/gun_rack/type71/empty + initial_stored = 0 + /obj/structure/gun_rack/apc name = "APC ammo compartment" icon_state = "frontal" @@ -104,6 +110,9 @@ /obj/structure/gun_rack/flamer/unloaded populate_type = /obj/item/weapon/gun/flamer/unloaded +/obj/structure/gun_rack/flamer/unloaded + initial_stored = 0 + /obj/structure/gun_rack/mk221 name = "M120 shotgun rack" icon_state = "mk221" @@ -112,3 +121,6 @@ initial_stored = 2 allowed_type = /obj/item/weapon/gun/shotgun/combat populate_type = /obj/item/weapon/gun/shotgun/combat + +/obj/structure/gun_rack/mk221/empty + initial_stored = 0 From 50069df33127289209b1bb7178a682f27f55d170 Mon Sep 17 00:00:00 2001 From: AmoryBlaine <32080743+AmoryBlaine@users.noreply.github.com> Date: Mon, 23 Sep 2024 01:14:41 -0400 Subject: [PATCH 2/2] Update code/game/objects/structures/gun_rack.dm Co-authored-by: Doubleumc --- code/game/objects/structures/gun_rack.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/gun_rack.dm b/code/game/objects/structures/gun_rack.dm index b908fc3f9f..40e5bfe17f 100644 --- a/code/game/objects/structures/gun_rack.dm +++ b/code/game/objects/structures/gun_rack.dm @@ -110,7 +110,7 @@ /obj/structure/gun_rack/flamer/unloaded populate_type = /obj/item/weapon/gun/flamer/unloaded -/obj/structure/gun_rack/flamer/unloaded +/obj/structure/gun_rack/flamer/empty initial_stored = 0 /obj/structure/gun_rack/mk221