From b201c253bea0cd4b34838aa240a5476784e86d3f Mon Sep 17 00:00:00 2001 From: Da Cool Boss <142358580+DaCoolBoss@users.noreply.github.com> Date: Wed, 17 Dec 2025 02:57:33 +0000 Subject: [PATCH] Donk shotgun shell boxes can now hold shotgun shells (#94498) ## About The Pull Request Shells spawn in the box, but when removed they can't be put back in. This is because they hold only donk pockets. Fixes this, and also allows you to refill it with other shotgun shells, since they're all more or less the same shape. This mirrors how the other donk boxes can store donk pockets of any kind. ## Why It's Good For The Game Exit-only boxes for ammo are very frustrating for players. They expect to be able to put the ammo back inside. ## Changelog :cl: fix: The Donk Co. 'Donk Spike' boxes now properly store shotgun shells. /:cl: --- code/datums/storage/subtypes/boxes.dm | 7 +++++++ code/game/objects/items/storage/boxes/food_boxes.dm | 1 + 2 files changed, 8 insertions(+) diff --git a/code/datums/storage/subtypes/boxes.dm b/code/datums/storage/subtypes/boxes.dm index a8acd98884b..2a50119749f 100644 --- a/code/datums/storage/subtypes/boxes.dm +++ b/code/datums/storage/subtypes/boxes.dm @@ -16,6 +16,13 @@ . = ..() set_holdable(/obj/item/food/donkpocket) +/datum/storage/box/donk_bullets/New(atom/parent, max_slots, max_specific_storage, max_total_storage, rustle_sound, remove_rustle_sound) + . = ..() + set_holdable(list( + /obj/item/food/donkpocket, + /obj/item/ammo_casing/shotgun, + )) + ///Coffee box /datum/storage/box/coffee max_slots = 5 diff --git a/code/game/objects/items/storage/boxes/food_boxes.dm b/code/game/objects/items/storage/boxes/food_boxes.dm index 016d7c9ec7d..4a33f6ac7e7 100644 --- a/code/game/objects/items/storage/boxes/food_boxes.dm +++ b/code/game/objects/items/storage/boxes/food_boxes.dm @@ -48,6 +48,7 @@ desc = "Instructions: DO NOT heat in microwave. Product will remove all hostile threats with cutting edge Donk Co. technology." icon_state = "donkpocketboxshell" donktype = /obj/item/ammo_casing/shotgun/flechette/donk + storage_type = /datum/storage/box/donk_bullets /obj/item/storage/box/papersack name = "paper sack"