From 6d9e485497f472cd9c54db5427ccaa519f09633a Mon Sep 17 00:00:00 2001 From: Doubleumc Date: Thu, 26 Sep 2024 02:30:24 -0400 Subject: [PATCH 1/3] Medical vendor Create&Destroy fix (#478) --- code/game/machinery/vending/vendor_types/medical.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/machinery/vending/vendor_types/medical.dm b/code/game/machinery/vending/vendor_types/medical.dm index e73add9046..9137ab35c1 100644 --- a/code/game/machinery/vending/vendor_types/medical.dm +++ b/code/game/machinery/vending/vendor_types/medical.dm @@ -268,6 +268,7 @@ ) /obj/structure/machinery/cm_vending/sorted/medical/Destroy() + STOP_PROCESSING(SSslowobj, src) QDEL_NULL(last_health_display) . = ..() From b0e7f821643f6cd03f5f2b73ddc0751dc8604276 Mon Sep 17 00:00:00 2001 From: AmoryBlaine <32080743+AmoryBlaine@users.noreply.github.com> Date: Fri, 27 Sep 2024 17:49:19 -0400 Subject: [PATCH 2/3] M41 Magazine Can Sprite Fix (#475) --- code/modules/projectiles/ammo_boxes/magazine_boxes.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/ammo_boxes/magazine_boxes.dm b/code/modules/projectiles/ammo_boxes/magazine_boxes.dm index 9146922bea..881a730bcc 100644 --- a/code/modules/projectiles/ammo_boxes/magazine_boxes.dm +++ b/code/modules/projectiles/ammo_boxes/magazine_boxes.dm @@ -557,7 +557,7 @@ /obj/item/ammo_box/magazine/mk1 name = "magazine box (M41A MK1 x 10)" overlay_ammo_type = "_reg_mk1" - overlay_gun_type = "_mk1" + overlay_gun_type = "_m41" overlay_content = "_reg" magazine_type = /obj/item/ammo_magazine/rifle/m41aMK1 allowed_magazines = list(/obj/item/ammo_magazine/rifle/m41aMK1/recon) From fdf2f5d2a12c299abef5475169fcd515cbb25cf0 Mon Sep 17 00:00:00 2001 From: AmoryBlaine <32080743+AmoryBlaine@users.noreply.github.com> Date: Fri, 27 Sep 2024 17:52:36 -0400 Subject: [PATCH 3/3] literally just empty gun racks (#466) Co-authored-by: Doubleumc --- 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..40e5bfe17f 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/empty + 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