diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index 88b8631cf1f..d70e63f29eb 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -246,6 +246,7 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items /obj/item/food/canned/peaches/maint = 1, /obj/item/storage/box/donkpockets = 1, /obj/item/storage/box/gum/happiness = 1, + /obj/item/storage/box/ramen_beef = 1, list(//Donk Varieties /obj/item/storage/box/donkpockets/donkpocketberry = 1, /obj/item/storage/box/donkpockets/donkpockethonk = 1, diff --git a/code/datums/storage/subtypes/boxes.dm b/code/datums/storage/subtypes/boxes.dm index 2a50119749f..1bff890dc2c 100644 --- a/code/datums/storage/subtypes/boxes.dm +++ b/code/datums/storage/subtypes/boxes.dm @@ -183,3 +183,14 @@ max_total_storage = WEIGHT_CLASS_SMALL * slots . = ..() set_holdable(/obj/item/fishing_lure) //can only hold lures + +/datum/storage/box/ramen_beef + max_slots = 2 + +/datum/storage/box/ramen_beef/New(atom/parent, max_slots, max_specific_storage, max_total_storage, rustle_sound, remove_rustle_sound) + . = ..() + set_holdable(list( + /obj/item/reagent_containers/condiment/pack/beef_flavour, + /obj/item/food/spaghetti/ramen_dry, + )) + diff --git a/code/game/objects/items/food/martian.dm b/code/game/objects/items/food/martian.dm index c6d6c3e51f8..ce92aa45558 100644 --- a/code/game/objects/items/food/martian.dm +++ b/code/game/objects/items/food/martian.dm @@ -171,6 +171,31 @@ foodtypes = GRAIN crafting_complexity = FOOD_COMPLEXITY_3 +/obj/item/food/spaghetti/ramen_dry + name = "dry space ramen" + desc = "Compressed dehydrated noodles." + icon = 'icons/obj/food/martian.dmi' + icon_state = "raw_ramen" + + food_reagents = list( + /datum/reagent/consumable/nutriment = 3 + ) + tastes = list("ramen" = 1) + foodtypes = GRAIN + crafting_complexity = FOOD_COMPLEXITY_2 + +/obj/item/food/spaghetti/ramen_beef + name = "beef space ramen" + desc = "Steaming springy noodles dripping with rich artificial beef broth. Somehow both comforting and vaguely chemical." + icon = 'icons/obj/food/martian.dmi' + icon_state = "cooked_ramen" + food_reagents = list( + /datum/reagent/consumable/nutriment = 3 + ) + tastes = list("ramen" = 1, "beef" = 1) + foodtypes = GRAIN + crafting_complexity = FOOD_COMPLEXITY_3 + /obj/item/food/bread/reispan name = "reispan" desc = "Though the concept of rice bread has been common in Asia for centuries, the reispan as we know it today is most commonly associated with Mars- where limited arable land has forced ingenuity." diff --git a/code/game/objects/items/storage/boxes/food_boxes.dm b/code/game/objects/items/storage/boxes/food_boxes.dm index fa4ecbda4fb..738cb6e5120 100644 --- a/code/game/objects/items/storage/boxes/food_boxes.dm +++ b/code/game/objects/items/storage/boxes/food_boxes.dm @@ -593,3 +593,15 @@ name = "robusta beans" desc = "A bag containing fresh, dry coffee robusta beans. Ethically sourced and packaged by Waffle Corp." beantype = /obj/item/food/grown/coffee/robusta + +/obj/item/storage/box/ramen_beef + name = "beef space ramen" + desc = "A box containing a brick of dehydrated ramen and a beef flavour sachet." + icon_state = "ramen_box" + illustration = null + storage_type = /datum/storage/box/ramen_beef + w_class = WEIGHT_CLASS_SMALL //it's meant to come in packs of five and the box can only hold two items, beef flavour or dry ramen + +/obj/item/storage/box/ramen_beef/PopulateContents() + new /obj/item/reagent_containers/condiment/pack/beef_flavour(src) + new /obj/item/food/spaghetti/ramen_dry(src) diff --git a/code/modules/food_and_drinks/recipes/soup_mixtures.dm b/code/modules/food_and_drinks/recipes/soup_mixtures.dm index ab9a2175a89..e9f0aa096ea 100644 --- a/code/modules/food_and_drinks/recipes/soup_mixtures.dm +++ b/code/modules/food_and_drinks/recipes/soup_mixtures.dm @@ -1865,6 +1865,17 @@ resulting_food_path = /obj/item/food/spaghetti/boilednoodles ingredient_reagent_multiplier = 0 +// Space Ramen +/datum/chemical_reaction/food/soup/beef_ramen + required_reagents = list( + /datum/reagent/consumable/beef_flavour = 5 + ) + required_ingredients = list( + /obj/item/food/spaghetti/ramen_dry = 1 + ) + resulting_food_path = /obj/item/food/spaghetti/ramen_beef + ingredient_reagent_multiplier = 0 + // Dashi Broth /datum/reagent/consumable/nutriment/soup/dashi name = "Dashi" diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index 8d9f0989c1c..7484372eafb 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -1368,3 +1368,13 @@ nutriment_factor = 0.5 randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS +/datum/reagent/consumable/beef_flavour + name = "Beef Space Ramen Flavouring" + description = "Powdered beef flavouring with enough salt to preserve a corpse." + nutriment_factor = 5 + color = "#5f3e00" // rgb: 115, 16, 8 + taste_description = "beef" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS + default_container = /obj/item/reagent_containers/condiment/pack/beef_flavour + diff --git a/code/modules/reagents/reagent_containers/condiment.dm b/code/modules/reagents/reagent_containers/condiment.dm index 6d015f43760..e6fd128b3ea 100644 --- a/code/modules/reagents/reagent_containers/condiment.dm +++ b/code/modules/reagents/reagent_containers/condiment.dm @@ -493,7 +493,7 @@ desc = temp_list[3] else icon_state = "condi_mixed" - desc = "A small condiment pack. The label says it contains [originalname]" + desc = "A small condiment pack. The label says it contains [originalname]." //Ketchup /obj/item/reagent_containers/condiment/pack/ketchup @@ -541,3 +541,9 @@ originalname = "mayonnaise" volume = 5 list_reagents = list(/datum/reagent/consumable/mayonnaise = 5) + +/obj/item/reagent_containers/condiment/pack/beef_flavour + name = "beef space ramen flavouring" + originalname = "beef flavour" + volume = 5 + list_reagents = list(/datum/reagent/consumable/beef_flavour = 5) diff --git a/icons/obj/food/martian.dmi b/icons/obj/food/martian.dmi index fb5528818a1..f2baab58506 100644 Binary files a/icons/obj/food/martian.dmi and b/icons/obj/food/martian.dmi differ diff --git a/icons/obj/storage/box.dmi b/icons/obj/storage/box.dmi index 4101697250c..e59cb192412 100644 Binary files a/icons/obj/storage/box.dmi and b/icons/obj/storage/box.dmi differ