diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 378600d5fec..fd71f164795 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -171,6 +171,8 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \ */ var/global/list/datum/stack_recipe/cardboard_recipes = list ( \ new/datum/stack_recipe("box", /obj/item/weapon/storage/box), \ + new/datum/stack_recipe("donut box", /obj/item/weapon/storage/fancy/donut_box/empty), \ + new/datum/stack_recipe("egg box", /obj/item/weapon/storage/fancy/egg_box), \ new/datum/stack_recipe("light tubes", /obj/item/weapon/storage/box/lights/tubes), \ new/datum/stack_recipe("light bulbs", /obj/item/weapon/storage/box/lights/bulbs), \ new/datum/stack_recipe("mouse traps", /obj/item/weapon/storage/box/mousetraps), \ diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 061548848cb..192f532896e 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -50,14 +50,21 @@ name = "donut box" storage_slots = 6 can_hold = list("/obj/item/weapon/reagent_containers/food/snacks/donut") - + foldable = /obj/item/stack/sheet/cardboard /obj/item/weapon/storage/fancy/donut_box/New() ..() - for(var/i=1; i <= storage_slots; i++) - new /obj/item/weapon/reagent_containers/food/snacks/donut/normal(src) + if(!istype(src,/obj/item/weapon/storage/fancy/donut_box/empty)) + for(var/i=1; i <= storage_slots; i++) + new /obj/item/weapon/reagent_containers/food/snacks/donut/normal(src) return +/obj/item/weapon/storage/fancy/donut_box/empty + icon_state = "donutbox0" + +/obj/item/weapon/storage/fancy/donut_box/empty/New() + ..() + /* * Egg Box */ diff --git a/html/changelog.html b/html/changelog.html index ccb6b5a4249..787817c2df4 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -120,6 +120,7 @@ should be listed in the changelog upon commit though. Thanks. -->