diff --git a/code/datums/storage/subtypes/others/fancy_storage.dm b/code/datums/storage/subtypes/others/fancy_storage.dm index a194fcfff74..2e70d835d8d 100644 --- a/code/datums/storage/subtypes/others/fancy_storage.dm +++ b/code/datums/storage/subtypes/others/fancy_storage.dm @@ -80,7 +80,7 @@ /// Nugget Boxes /datum/storage/nugget_box - max_slots = 6 + max_slots = 7 /datum/storage/nugget_box/New(atom/parent, max_slots, max_specific_storage, max_total_storage, rustle_sound, remove_rustle_sound) . = ..() @@ -89,6 +89,28 @@ /obj/item/fish/fryish, )) +/// Wing Boxes +/datum/storage/wing_box + max_slots = 5 + +/datum/storage/wing_box/New(atom/parent, max_slots, max_specific_storage, max_total_storage, rustle_sound, remove_rustle_sound) + . = ..() + set_holdable(list( + /obj/item/food/fried_chicken, + )) + +/// Fry Boxes +/datum/storage/fry_box + max_slots = 2 + +/datum/storage/fry_box/New(atom/parent, max_slots, max_specific_storage, max_total_storage, rustle_sound, remove_rustle_sound) + . = ..() + set_holdable(list( + /obj/item/food/fries, + /obj/item/food/cheesyfries, + /obj/item/food/carrotfries, + )) + /// Jars of Pickles /datum/storage/pickles_jar max_slots = 10 diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 16f0e675e55..a8169715d35 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -668,6 +668,9 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( \ new /datum/stack_recipe("donk-pockets honk box", /obj/item/storage/box/donkpockets/donkpockethonk, crafting_flags = NONE, category = CAT_CONTAINERS), \ new /datum/stack_recipe("monkey cube box", /obj/item/storage/box/monkeycubes, crafting_flags = NONE, category = CAT_CONTAINERS), new /datum/stack_recipe("nugget box", /obj/item/storage/fancy/nugget_box, crafting_flags = NONE, category = CAT_CONTAINERS), \ + new /datum/stack_recipe("red nugget box", /obj/item/storage/fancy/nugget_box/red, crafting_flags = NONE, category = CAT_CONTAINERS), \ + new /datum/stack_recipe("red wing box", /obj/item/storage/fancy/wing_box, crafting_flags = NONE, category = CAT_CONTAINERS), \ + new /datum/stack_recipe("red fry box", /obj/item/storage/fancy/fry_box, crafting_flags = NONE, category = CAT_CONTAINERS), \ new /datum/stack_recipe("drinking glasses box", /obj/item/storage/box/drinkingglasses, crafting_flags = NONE, category = CAT_CONTAINERS), \ new /datum/stack_recipe("paper cups box", /obj/item/storage/box/cups, crafting_flags = NONE, category = CAT_CONTAINERS), \ new /datum/stack_recipe("cigar case", /obj/item/storage/fancy/cigarettes/cigars, crafting_flags = NONE, category = CAT_CONTAINERS), \ diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index 91285a98c80..3f0847af09b 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -591,10 +591,13 @@ icon = 'icons/obj/food/containers.dmi' icon_state = "nuggetbox" base_icon_state = "nuggetbox" + inhand_icon_state = "nuggetbox" + lefthand_file = 'icons/mob/inhands/items/food_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/food_righthand.dmi' contents_tag = "nugget" w_class = WEIGHT_CLASS_SMALL spawn_type = /obj/item/food/nugget - spawn_count = 6 + spawn_count = 7 storage_type = /datum/storage/nugget_box /obj/item/storage/fancy/nugget_box/Initialize(mapload) @@ -602,6 +605,44 @@ // It's a safe place for the Fryish/Fritterish AddElement(/datum/element/fish_safe_storage) +/obj/item/storage/fancy/nugget_box/red + name = "red nugget box" + icon_state = "rednuggetbox" + base_icon_state = "rednuggetbox" + inhand_icon_state = "rednuggetbox" + +/obj/item/storage/fancy/wing_box + name = "red wing box" + desc = "A cardboard box used for holding chicken wangs." + icon = 'icons/obj/food/containers.dmi' + icon_state = "redwingbox5" + base_icon_state = "redwingbox" + inhand_icon_state = "redwingbox" + lefthand_file = 'icons/mob/inhands/items/food_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/food_righthand.dmi' + contents_tag = "wings" + w_class = WEIGHT_CLASS_SMALL + spawn_type = /obj/item/food/fried_chicken + spawn_count = 5 + storage_type = /datum/storage/wing_box + open_status = FANCY_CONTAINER_ALWAYS_OPEN + +/obj/item/storage/fancy/fry_box + name = "red fry box" + desc = "A cardboard box used for holding fries." + icon = 'icons/obj/food/containers.dmi' + icon_state = "redfrybox2" + base_icon_state = "redfrybox" + inhand_icon_state = "redfrybox" + lefthand_file = 'icons/mob/inhands/items/food_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/food_righthand.dmi' + contents_tag = "fries" + w_class = WEIGHT_CLASS_SMALL + spawn_type = /obj/item/food/fries + spawn_count = 2 + storage_type = /datum/storage/fry_box + open_status = FANCY_CONTAINER_ALWAYS_OPEN + /* * Jar of pickles */ diff --git a/icons/mob/inhands/items/food_lefthand.dmi b/icons/mob/inhands/items/food_lefthand.dmi index 5dabacf53db..60fb50b554e 100644 Binary files a/icons/mob/inhands/items/food_lefthand.dmi and b/icons/mob/inhands/items/food_lefthand.dmi differ diff --git a/icons/mob/inhands/items/food_righthand.dmi b/icons/mob/inhands/items/food_righthand.dmi index 7cd6569508c..0f18abb6ef7 100644 Binary files a/icons/mob/inhands/items/food_righthand.dmi and b/icons/mob/inhands/items/food_righthand.dmi differ diff --git a/icons/obj/food/containers.dmi b/icons/obj/food/containers.dmi index bd3bd177bfe..ea5433eadf4 100644 Binary files a/icons/obj/food/containers.dmi and b/icons/obj/food/containers.dmi differ