cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-29 07:59:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Epic MRE Time (Let's get this on a tray) (#14387)

Browse Source
This commit is contained in:
Wowzewow (Wezzy)
2022-08-09 17:04:06 +02:00
committed by GitHub
parent 168424cf87
commit 380a971eb3
22 changed files with 850 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
+41 -2
View File
@@ -219,7 +219,7 @@
name = "Animal Protein"
color = "#440000"
blood_factor = 3
taste_description = "meat"
taste_description = "some sort of protein"
/decl/reagent/nutriment/protein/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder)
if(alien && alien == IS_UNATHI)
@@ -400,6 +400,36 @@
condiment_desc = "A can full of chocolately powder. Try not to think of the calories."
condiment_center_of_mass = list("x"=16, "y"=8)
/decl/reagent/nutriment/instantjuice
name = "Juice Powder"
description = "Dehydrated, powdered juice of some kind."
taste_mult = 1.3
nutriment_factor = 1
/decl/reagent/nutriment/instantjuice/grape
name = "Grape Juice Powder"
description = "Dehydrated, powdered grape juice."
taste_description = "dry grapes"
color = "#863333"
/decl/reagent/nutriment/instantjuice/orange
name = "Orange Juice Powder"
description = "Dehydrated, powdered orange juice."
taste_description = "dry oranges"
color = "#e78108"
/decl/reagent/nutriment/instantjuice/watermelon
name = "Watermelon Juice Powder"
description = "Dehydrated, powdered watermelon juice."
taste_description = "dry sweet watermelon"
color = "#b83333"
/decl/reagent/nutriment/instantjuice/apple
name = "Apple Juice Powder"
description = "Dehydrated, powdered apple juice."
taste_description = "dry sweet apples"
color = "#c07c40"
/decl/reagent/nutriment/coffeegrounds
name = "Coffee Grounds"
description = "Enjoy the great taste of coffee."
@@ -1165,13 +1195,22 @@
/decl/reagent/drink/applejuice
name = "Apple Juice"
description = "Juice from an apple. The most basic beverage you can imagine."
taste_description = "apple juice"
taste_description = "sweet apples"
color = "#f2d779"
glass_icon_state = "glass_apple"
glass_name = "glass of apple juice"
glass_desc = "Juice from an apple. The most basic beverage you can imagine."
/decl/reagent/drink/pearjuice
name = "Pear Juice"
description = "Delicious sweet juice made from pears."
taste_description = "sweet pears"
color = "#ffff66"
glass_name = "pear juice"
glass_desc = "Delicious juice made from pears."
/decl/reagent/drink/dynjuice
name = "Dyn Juice"
description = "Juice from a dyn leaf. Good for you, but normally not consumed undiluted."
code/modules/reagents/Chemistry-Recipes.dm
+30 -2
View File
@@ -1537,6 +1537,34 @@
required_reagents = list(/decl/reagent/water = 5, /decl/reagent/nutriment/coco = 1)
result_amount = 5
/datum/chemical_reaction/grapejuice
name = "Grape Juice"
result = /decl/reagent/drink/grapejuice
required_reagents = list(/decl/reagent/water = 3, /decl/reagent/nutriment/instantjuice/grape = 1)
result_amount = 3
mix_message = "The solution settles into a purplish-red beverage."
/datum/chemical_reaction/orangejuice
name = "Orange Juice"
result = /decl/reagent/drink/orangejuice
required_reagents = list(/decl/reagent/water = 3, /decl/reagent/nutriment/instantjuice/orange = 1)
result_amount = 3
mix_message = "The solution settles into an orange beverage."
/datum/chemical_reaction/watermelonjuice
name = "Watermelon Juice"
result = /decl/reagent/drink/watermelonjuice
required_reagents = list(/decl/reagent/water = 3, /decl/reagent/nutriment/instantjuice/watermelon = 1)
result_amount = 3
mix_message = "The solution settles into a red beverage."
/datum/chemical_reaction/applejuice
name = "Apple Juice"
result = /decl/reagent/drink/applejuice
required_reagents = list(/decl/reagent/water = 3, /decl/reagent/nutriment/instantjuice/apple = 1)
result_amount = 3
mix_message = "The solution settles into a clear brown beverage."
/datum/chemical_reaction/soysauce
name = "Soy Sauce"
id = "soysauce"
@@ -3424,7 +3452,7 @@
id = "coffee"
result = /decl/reagent/drink/coffee
required_reagents = list(/decl/reagent/nutriment/coffeegrounds = 1, /decl/reagent/water = 5)
result_amount = 10
result_amount = 5
/datum/chemical_reaction/drink/espresso
name = "Espresso"
@@ -3774,4 +3802,4 @@
id = "ichor"
result = /decl/reagent/drink/toothpaste/ichor
required_reagents = list(/decl/reagent/alcohol/butanol/xuizijuice = 1, /decl/reagent/kois/clean = 1, /decl/reagent/drink/toothpaste = 1)
result_amount = 3
result_amount = 3
code/modules/reagents/reagent_containers/food/condiment.dm
+142 -2
View File
@@ -17,9 +17,9 @@
var/next_shake
var/fixed_state = FALSE
/obj/item/reagent_containers/food/condiment/Initialize()
/obj/item/reagent_containers/food/condiment/Initialize(var/force = TRUE)
. = ..()
on_reagent_change(force = TRUE)
on_reagent_change(force)
/obj/item/reagent_containers/food/condiment/proc/shake(var/mob/user)
if(world.time >= next_shake)
@@ -115,3 +115,143 @@
/obj/item/reagent_containers/food/condiment/pacid
name = "culinary acid"
reagents_to_add = list(/decl/reagent/acid/polyacid = 50)
//MRE condiments and drinks.
/obj/item/reagent_containers/food/condiment/small/packet
icon_state = "packet_small"
fixed_state = TRUE
w_class = ITEMSIZE_TINY
possible_transfer_amounts = list(1,5,10)
amount_per_transfer_from_this = 1
volume = 10
/obj/item/reagent_containers/food/condiment/small/packet/Initialize()
. = ..(FALSE)
/obj/item/reagent_containers/food/condiment/small/packet/salt
name = "salt packet"
desc = "Contains 5u of table salt."
icon_state = "packet_small_white"
reagents_to_add = list(/decl/reagent/sodiumchloride = 5)
/obj/item/reagent_containers/food/condiment/small/packet/pepper
name = "pepper packet"
desc = "Contains 5u of black pepper."
icon_state = "packet_small_black"
reagents_to_add = list(/decl/reagent/blackpepper = 5)
/obj/item/reagent_containers/food/condiment/small/packet/sugar
name = "sugar packet"
desc = "Contains 5u of refined sugar."
icon_state = "packet_small_white"
reagents_to_add = list(/decl/reagent/sugar = 5)
/obj/item/reagent_containers/food/condiment/small/packet/jelly
name = "jelly packet"
desc = "Contains 10u of cherry jelly. Best used for spreading on crackers."
reagents_to_add = list(/decl/reagent/nutriment/cherryjelly = 10)
icon_state = "packet_medium"
/obj/item/reagent_containers/food/condiment/small/packet/honey
name = "honey packet"
desc = "Contains 10u of honey."
reagents_to_add = list(/decl/reagent/sugar = 10)
icon_state = "packet_medium"
/obj/item/reagent_containers/food/condiment/small/packet/capsaicin
name = "hot sauce packet"
desc = "Contains 5u of hot sauce. Enjoy in moderation."
icon_state = "packet_small_red"
reagents_to_add = list(/decl/reagent/capsaicin = 5)
/obj/item/reagent_containers/food/condiment/small/packet/ketchup
name = "ketchup packet"
desc = "Contains 5u of ketchup."
icon_state = "packet_small_red"
reagents_to_add = list(/decl/reagent/nutriment/ketchup = 5)
/obj/item/reagent_containers/food/condiment/small/packet/mayo
name = "mayonnaise packet"
desc = "Contains 5u of mayonnaise."
icon_state = "packet_small_white"
reagents_to_add = list(/decl/reagent/nutriment/mayonnaise = 5)
/obj/item/reagent_containers/food/condiment/small/packet/soy
name = "soy sauce packet"
desc = "Contains 5u of soy sauce."
icon_state = "packet_small_black"
reagents_to_add = list(/decl/reagent/nutriment/soysauce = 5)
/obj/item/reagent_containers/food/condiment/small/packet/coffee
name = "instant coffee powder packet"
desc = "Contains 5u of instant coffee powder. Mix with 25u of water."
reagents_to_add = list(/decl/reagent/nutriment/coffeegrounds = 3)
/obj/item/reagent_containers/food/condiment/small/packet/tea
name = "instant tea powder packet"
desc = "Contains 5u of instant black tea powder. Mix with 25u of water."
reagents_to_add = list(/decl/reagent/nutriment/teagrounds = 5)
/obj/item/reagent_containers/food/condiment/small/packet/cocoa
name = "cocoa powder packet"
desc = "Contains 5u of cocoa powder. Mix with 25u of water and heat."
reagents_to_add = list(/decl/reagent/nutriment/coco = 5)
/obj/item/reagent_containers/food/condiment/small/packet/grape
name = "grape juice powder packet"
desc = "Contains 5u of powdered grape juice. Mix with 15u of water."
reagents_to_add = list(/decl/reagent/nutriment/instantjuice/grape = 5)
/obj/item/reagent_containers/food/condiment/small/packet/orange
name = "orange juice powder packet"
desc = "Contains 5u of powdered orange juice. Mix with 15u of water."
reagents_to_add = list(/decl/reagent/nutriment/instantjuice/orange = 5)
/obj/item/reagent_containers/food/condiment/small/packet/watermelon
name = "watermelon juice powder packet"
desc = "Contains 5u of powdered watermelon juice. Mix with 15u of water."
reagents_to_add = list(/decl/reagent/nutriment/instantjuice/watermelon = 5)
/obj/item/reagent_containers/food/condiment/small/packet/apple
name = "apple juice powder packet"
desc = "Contains 5u of powdered apple juice. Mix with 15u of water."
reagents_to_add = list(/decl/reagent/nutriment/instantjuice/apple = 5)
/obj/item/reagent_containers/food/condiment/small/packet/protein
name = "protein powder packet"
desc = "Contains 10u of powdered protein. Mix with 20u of water."
icon_state = "packet_medium"
reagents_to_add = list(/decl/reagent/nutriment/protein = 10)
/obj/item/reagent_containers/food/condiment/small/packet/crayon
name = "crayon powder packet"
desc = "Contains 10u of powdered crayon. Mix with 30u of water."
reagents_to_add = list(/decl/reagent/crayon_dust = 10)
/obj/item/reagent_containers/food/condiment/small/packet/crayon/red
reagents_to_add = list(/decl/reagent/crayon_dust/red = 10)
/obj/item/reagent_containers/food/condiment/small/packet/crayon/orange
reagents_to_add = list(/decl/reagent/crayon_dust/orange = 10)
/obj/item/reagent_containers/food/condiment/small/packet/crayon/yellow
reagents_to_add = list(/decl/reagent/crayon_dust/yellow = 10)
/obj/item/reagent_containers/food/condiment/small/packet/crayon/green
reagents_to_add = list(/decl/reagent/crayon_dust/green = 10)
/obj/item/reagent_containers/food/condiment/small/packet/crayon/blue
reagents_to_add = list(/decl/reagent/crayon_dust/blue = 10)
/obj/item/reagent_containers/food/condiment/small/packet/crayon/purple
reagents_to_add = list(/decl/reagent/crayon_dust/purple = 10)
/obj/item/reagent_containers/food/condiment/small/packet/crayon/grey
reagents_to_add = list(/decl/reagent/crayon_dust/grey = 10)
/obj/item/reagent_containers/food/condiment/small/packet/crayon/brown
reagents_to_add = list(/decl/reagent/crayon_dust/brown = 10)
//End of MRE stuff.
code/modules/reagents/reagent_containers/food/snacks.dm
+30
View File
@@ -494,6 +494,27 @@
reagents_to_add = list(/decl/reagent/nutriment = 10, /decl/reagent/sugar = 3)
/obj/item/reagent_containers/food/snacks/proteinbar
name = "protein bar"
desc = "SwoleMAX brand protein bars, guaranteed to get you feeling perfectly overconfident."
icon_state = "proteinbar"
trash = /obj/item/trash/proteinbar
bitesize = 6
/obj/item/reagent_containers/food/snacks/proteinbar/Initialize()
. = ..()
reagents.add_reagent(/decl/reagent/nutriment, 9)
reagents.add_reagent(/decl/reagent/nutriment/protein, 4)
var/list/decl_flavors = decls_repository.get_decls_of_subtype(/decl/proteinbar_flavor)
var/decl/proteinbar_flavor/PB = decls_repository.get_decl(pick(decl_flavors))
name = "[PB.name] [name]"
var/count = length(PB.reagents)
if(count)
for(var/type in PB.reagents)
reagents.add_reagent(type, round(4 / count, 0.1))
else
reagents.add_reagent(PB.reagents, 4)
/obj/item/reagent_containers/food/snacks/candy_corn
name = "candy corn"
desc = "It's a handful of candy corn. Cannot be stored in a detective's hat, alas."
@@ -3807,6 +3828,15 @@
reagent_data = list(/decl/reagent/nutriment/synthetic = list("stale bread" = 4))
reagents_to_add = list(/decl/reagent/nutriment/synthetic = 6, /decl/reagent/sodiumchloride = 3)
/obj/item/reagent_containers/food/snacks/meatcube
name = "cubed meat"
desc = "Fried, salted lean meat compressed into a cube. Not very appetizing."
icon_state = "meatcube"
filling_color = "#7a3d11"
center_of_mass = list("x"=16, "y"=16)
bitesize = 3
reagents_to_add = list(/decl/reagent/nutriment/protein = 15)
/obj/item/reagent_containers/food/snacks/ricetub
name = "packed rice bowl"
desc = "Boiled rice packed in a sealed plastic tub with the Nojosuru Foods logo on it. There appears to be a pair of chopsticks clipped to the side."