From 2fc6583b2c3c0d1726574546da9f970bbc1565ea Mon Sep 17 00:00:00 2001 From: Goat <126099705+Goat-Real@users.noreply.github.com> Date: Fri, 28 Mar 2025 11:25:33 -0600 Subject: [PATCH] Fix Tiziran supply boxes not having the proper contents (#90267) ## About The Pull Request Tiziran canned goods boxes used the farm fresh list while the farm fresh box only gave three items. The farm fresh box now gives eight food items and the canned goods now actually give canned goods. Adds a storage type for tiziran goods. ## Why It's Good For The Game Canned goods should have canned goods. Farm fresh should provide plenty of items due to the amount of different things it can roll. (It's also how it used to be) ## Changelog :cl: Goat fix: The Tiziran Empire has now actually puts canned goods in their canned good exports along with putting more food in their farm fresh boxes. /:cl: --- code/datums/storage/subtypes/boxes.dm | 5 +++++ .../objects/items/storage/boxes/food_boxes.dm | 16 +++++----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/code/datums/storage/subtypes/boxes.dm b/code/datums/storage/subtypes/boxes.dm index 77a55ccded2..2eaf718f335 100644 --- a/code/datums/storage/subtypes/boxes.dm +++ b/code/datums/storage/subtypes/boxes.dm @@ -305,6 +305,11 @@ max_slots = 15 max_total_storage = 15 * WEIGHT_CLASS_SMALL +///Tiziran goods box +/datum/storage/box/tiziran_goods + max_slots = 8 + max_total_storage = 8 * WEIGHT_CLASS_NORMAL + ///Tiziran cans box /datum/storage/box/tiziran_cans max_slots = 8 diff --git a/code/game/objects/items/storage/boxes/food_boxes.dm b/code/game/objects/items/storage/boxes/food_boxes.dm index ce2e30033c8..528d2d15f20 100644 --- a/code/game/objects/items/storage/boxes/food_boxes.dm +++ b/code/game/objects/items/storage/boxes/food_boxes.dm @@ -433,6 +433,7 @@ desc = "A box containing an assortment of fresh Tiziran goods- perfect for making the foods of the Lizard Empire." icon_state = "lizard_package" illustration = null + storage_type = /datum/storage/box/tiziran_goods /obj/item/storage/box/tiziran_goods/PopulateContents() var/static/list/obj/item/food = list( @@ -449,7 +450,7 @@ ) var/list/obj/item/insert = list() - for(var/i in 1 to 3) + for(var/i in 1 to 8) insert += pick_weight(food) return insert @@ -463,16 +464,9 @@ /obj/item/storage/box/tiziran_cans/PopulateContents() var/static/list/obj/item/food = list( - /obj/item/food/bread/root = 2, - /obj/item/food/grown/ash_flora/seraka = 2, - /obj/item/food/grown/korta_nut = 10, - /obj/item/food/grown/korta_nut/sweet = 2, - /obj/item/food/liver_pate = 5, - /obj/item/food/lizard_dumplings = 5, - /obj/item/food/moonfish_caviar = 5, - /obj/item/food/root_flatbread = 5, - /obj/item/food/rootroll = 5, - /obj/item/food/spaghetti/nizaya = 5, + /obj/item/food/canned/jellyfish = 5, + /obj/item/food/canned/desert_snails = 5, + /obj/item/food/canned/larvae = 5, ) var/list/obj/item/insert = list()