Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adds ERP #395

Merged
merged 11 commits into from
Aug 23, 2024
Merged

Adds ERP #395

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1fbe31b
Dried Egg snack subtype added
BonniePandora Aug 20, 2024
77d386c
Chem-reactions added
BonniePandora Aug 20, 2024
19552af
Poweder packets added
BonniePandora Aug 20, 2024
c9694c7
MRE's given juice, milk-powder box added
BonniePandora Aug 20, 2024
b0232e9
Powder reagents
BonniePandora Aug 20, 2024
3020d95
Missing juice types added
BonniePandora Aug 20, 2024
e18a33a
Merge branch 'cmss13-devs:master' into Eating-RolePlay
BonniePandora Aug 22, 2024
c730ece
Update condiment.dm
BonniePandora Aug 22, 2024
94521d6
Food.dmi updated
BonniePandora Aug 22, 2024
921a68c
Updates golden_arrow.dmm
BonniePandora Aug 22, 2024
c15f2ba
No more TARDIS food storage
BonniePandora Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 71 additions & 0 deletions code/game/objects/items/reagent_containers/food/condiment.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,3 +236,74 @@
/obj/item/reagent_container/food/condiment/coldsauce/Initialize()
. = ..()
reagents.add_reagent("frostoil", 60)

/obj/item/reagent_container/food/condiment/juice
name = "Juice Packet"
desc = "A small packet of dehydrated fruit-juice powder. Mix with water for a 'tasty' beverage. This one appears to be missing the label indicating what flavor it is however."
w_class = SIZE_TINY
icon_state = "monkeycubewrap" ///Placeholder until actual sprite done, remember to swap out exception on line 89 too
amount_per_transfer_from_this = 1
volume = 6

/obj/item/reagent_container/food/condiment/juice/orange
name = "Orange Juice Packet"
desc = "A small packet of dehydrated orange-juice powder. Mix with water for a 'tasty' beverage."

/obj/item/reagent_container/food/condiment/juice/orange/Initialize()
. = ..()
reagents.add_reagent("dehydrated_orange_juice", 6)

/obj/item/reagent_container/food/condiment/juice/apple
name = "Apple Juice Packet"
desc = "A small packet of dehydrated apple-juice powder. Mix with water for a 'tasty' beverage."

/obj/item/reagent_container/food/condiment/juice/apple/Initialize()
. = ..()
reagents.add_reagent("dehydrated_apple_juice", 6)

/obj/item/reagent_container/food/condiment/juice/watermelon
name = "Watermelon Juice Packet"
desc = "A small packet of dehydrated watermelon-juice powder. Mix with water for a 'tasty' beverage."

/obj/item/reagent_container/food/condiment/juice/watermelon/Initialize()
. = ..()
reagents.add_reagent("dehydrated_watermelon_juice", 6)

/obj/item/reagent_container/food/condiment/juice/grape
name = "Grape Juice Packet"
desc = "A small packet of dehydrated grape-juice powder. Mix with water for a 'tasty' beverage."

/obj/item/reagent_container/food/condiment/juice/grape/Initialize()
. = ..()
reagents.add_reagent("dehydrated_grape_juice", 6)

/obj/item/reagent_container/food/condiment/juice/pineapple
name = "Pineapple Juice Packet"
desc = "A small packet of dehydrated pineapple-juice powder. Mix with water for a 'tasty' beverage."

/obj/item/reagent_container/food/condiment/juice/pineapple/Initialize()
. = ..()
reagents.add_reagent("dehydrated_pineapple_juice", 6)

/obj/item/reagent_container/food/condiment/juice/egg
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mmm egg juice

name = "Powdered Egg Packet"
desc = "A small packet of dehydrated egg-whites and egg-yolk powder. Mix with water for a passable alternative to the real deal."
icon_state = "monkeycubewrap" ///Placeholder until actual sprite done, ideally this and milk get different ones from the juices
volume = 10
w_class = SIZE_SMALL

/obj/item/reagent_container/food/condiment/juice/egg/Initialize()
. = ..()
reagents.add_reagent("dehydrated_egg_powder", 12)

/obj/item/reagent_container/food/condiment/juice/milk
name = "Dehydrated Milk Packet"
desc = "A small packet of dehydrated milk powder. Mix with water for a passable alternative to actual milk."
icon_state = "monkeycubewrap" ///Placeholder until actual sprite done
amount_per_transfer_from_this = 1
volume = 10
w_class = SIZE_SMALL

/obj/item/reagent_container/food/condiment/juice/milk/Initialize()
. = ..()
reagents.add_reagent("dehydrated_milk_powder", 12)
10 changes: 10 additions & 0 deletions code/game/objects/items/reagent_containers/food/snacks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,16 @@
new newegg(loc)
qdel(src)

/obj/item/reagent_container/food/snacks/egg/dried
name = "reconstituted egg"
desc = "An egg! Or it was in another life, at least. Now it's just a sad pile of goop that might work in recipes."
icon_state = "honeycomb"
filling_color = "#FDFFD1"

/obj/item/reagent_container/food/snacks/egg/dried/Initialize()
. = ..()
reagents.add_reagent("egg", 1)

/obj/item/reagent_container/food/snacks/friedegg
name = "Fried egg"
desc = "A fried egg, with a touch of salt and pepper."
Expand Down
27 changes: 25 additions & 2 deletions code/game/objects/items/storage/boxes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,7 @@
icon_state = "mealpack"
w_class = SIZE_SMALL
can_hold = list()
storage_slots = 7
storage_slots = 8
max_w_class = 0
use_sound = "rip"
var/isopened = 0
Expand All @@ -728,8 +728,9 @@
//1 in 3 chance of getting a fortune cookie
var/cookie = rand(1,3)
var/matches_type = rand(1, 5)
var/juice_type = rand(1, 5)
if(cookie == 1)
storage_slots = 8
storage_slots = 9
new /obj/item/reagent_container/food/snacks/packaged_meal(src, main)
new /obj/item/reagent_container/food/snacks/packaged_meal(src, second)
new /obj/item/reagent_container/food/snacks/packaged_meal(src, side)
Expand All @@ -749,6 +750,17 @@
new /obj/item/storage/fancy/cigar/matchbook/wy_gold(src)
if(5)
new /obj/item/storage/fancy/cigar/matchbook/brown(src)
switch(juice_type)
if(1)
new /obj/item/reagent_container/food/condiment/juice/orange(src)
if(2)
new /obj/item/reagent_container/food/condiment/juice/apple(src)
if(3)
new /obj/item/reagent_container/food/condiment/juice/watermelon(src)
if(4)
new /obj/item/reagent_container/food/condiment/juice/grape(src)
if(5)
new /obj/item/reagent_container/food/condiment/juice/pineapple(src)

/obj/item/storage/box/MRE/Initialize()
. = ..()
Expand All @@ -761,3 +773,14 @@
else if(!isopened)
isopened = 1
icon_state = "mealpackopened"

/obj/item/storage/box/powderedmilk
name = "box of powdered milk packets"
desc = "It has a weird stain on it."

/obj/item/storage/box/powderedmilk/fill_preset_inventory()
new /obj/item/reagent_container/food/condiment/juice/milk(src)
new /obj/item/reagent_container/food/condiment/juice/milk(src)
new /obj/item/reagent_container/food/condiment/juice/milk(src)
new /obj/item/reagent_container/food/condiment/juice/milk(src)
new /obj/item/reagent_container/food/condiment/juice/milk(src)
60 changes: 60 additions & 0 deletions code/modules/reagents/chemistry_reactions/food_drink.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,66 @@
required_reagents = list("hot_ramen" = 6, "hotsauce" = 1)
result_amount = 6

/datum/chemical_reaction/banana //WHO DIDN'T MAKE ALL THE JUICES SUBTYPES OF A PARENT ONE AAAAAA
name = "Banana Juice"
id = "banana"
result = "banana"
required_reagents = list("dehydrated_juice" = 1, "water" = 5)
result_amount = 5

/datum/chemical_reaction/orangejuice
name = "Orange Juice"
id = "orangejuice"
result = "orangejuice"
required_reagents = list("dehydrated_orange_juice" = 1, "water" = 5)
result_amount = 5

/datum/chemical_reaction/applejuice
name = "Apple Juice"
id = "applejuice"
result = "applejuice"
required_reagents = list("dehydrated_apple_juice" = 1, "water" = 5)
result_amount = 5

/datum/chemical_reaction/watermelonjuice
name = "Watermelon Juice"
id = "watermelonjuice"
result = "watermelonjuice"
required_reagents = list("dehydrated_watermelon_juice" = 1, "water" = 5)
result_amount = 5

/datum/chemical_reaction/grapejuice
name = "Grape Juice"
id = "grapejuice"
result = "grapejuice"
required_reagents = list("dehydrated_grape_juice" = 1, "water" = 5)
result_amount = 5

/datum/chemical_reaction/pineapplejuice
name = "Pineapple Juice"
id = "pineapplejuice"
result = "pineapplejuice"
required_reagents = list("dehydrated_pineapple_juice" = 1, "water" = 5)
result_amount = 5

/datum/chemical_reaction/egg
name = "Rehydrated Egg Product"
id = "egg"
result = "egg"
required_reagents = list("dehydrated_egg_powder" = 1, "water" = 5)
result_amount = 1

/datum/chemical_reaction/egg/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
new /obj/item/reagent_container/food/snacks/egg/dried(location)

/datum/chemical_reaction/milk
name = "Rehydrated Milk"
id = "milk"
result = "milk"
required_reagents = list("dehydrated_milk_powder" = 1, "water" = 5)
result_amount = 5


//*****************************************************************************************************/
//******************************************Cocktails**************************************************/
Expand Down
11 changes: 11 additions & 0 deletions code/modules/reagents/chemistry_reagents/drink.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,17 @@
description = "Made in the modern day with proper pomegranate substitute. Who uses real fruit, anyways?"
color = "#FF004F" // rgb: 255, 0, 79

/datum/reagent/drink/pineapplejuice
name = "Pineapple Juice"
id = "pineapplejuice"
description = "Refreshingly citric, with a pleasant flavor."
color = "#FFC000" // rgb: 255, 192, 0

/datum/reagent/drink/applejuice
name = "Apple Juice"
id = "applejuice"
description = "The pleasantly sweet taste of apples, now in liquid form."
color = "#f59a40" // rgb: 245, 154, 64


//MILK//
Expand Down
80 changes: 80 additions & 0 deletions code/modules/reagents/chemistry_reagents/food.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,3 +307,83 @@
color = "#FFFF00"
chemclass = CHEM_CLASS_RARE
flags = REAGENT_NO_GENERATION

/datum/reagent/dehydrated_juice
name = "Mystery Juice Powder"
id = "dehydrated_juice"
description = "Powderized fruit-juice ready to be mixed with water. Smells of artificial bananas."
reagent_state = SOLID
color = "#863333" // rgb: 175, 175, 0
chemclass = CHEM_CLASS_COMMON
properties = list(PROPERTY_NUTRITIOUS = 2)
flags = REAGENT_NO_GENERATION

/datum/reagent/dehydrated_orange_juice
name = "Orange Juice Powder"
id = "dehydrated_orange_juice"
description = "Powderized orange-juice ready to be mixed with water. Smells of, surprise surprise, oranges."
reagent_state = SOLID
color = "#E78108" // rgb: 231, 129, 8
chemclass = CHEM_CLASS_COMMON
properties = list(PROPERTY_NUTRITIOUS = 2)
flags = REAGENT_NO_GENERATION

/datum/reagent/dehydrated_apple_juice
name = "Apple Juice Powder"
id = "dehydrated_apple_juice"
description = "Powderized apple-juice ready to be mixed with water. Smells of, surprise surprise, apples."
reagent_state = SOLID
color = "#365E30" // rgb: 54, 94, 48
chemclass = CHEM_CLASS_COMMON
properties = list(PROPERTY_NUTRITIOUS = 2)
flags = REAGENT_NO_GENERATION

/datum/reagent/dehydrated_watermelon_juice
name = "Watermelon Juice Powder"
id = "dehydrated_watermelon_juice"
description = "Powderized watermelon-juice ready to be mixed with water. Smells of, surprise surprise, watermelons."
reagent_state = SOLID
color = "#863333" // rgb: 134, 51, 51
chemclass = CHEM_CLASS_COMMON
properties = list(PROPERTY_NUTRITIOUS = 2)
flags = REAGENT_NO_GENERATION

/datum/reagent/dehydrated_grape_juice
name = "Grape Juice Powder"
id = "dehydrated_grape_juice"
description = "Powderized grape-juice ready to be mixed with water. Smells of, surprise surprise, grapes."
reagent_state = SOLID
color = "#863333" // rgb: 134, 51, 51
chemclass = CHEM_CLASS_COMMON
properties = list(PROPERTY_NUTRITIOUS = 2)
flags = REAGENT_NO_GENERATION

/datum/reagent/dehydrated_pineapple_juice
name = "Pineapple Juice Powder"
id = "dehydrated_pineapple_juice"
description = "Powderized pineapple-juice ready to be mixed with water. Smells of, surprise surprise, pineapples."
reagent_state = SOLID
color = "#FFC000" // rgb: 255, 192, 0
chemclass = CHEM_CLASS_COMMON
properties = list(PROPERTY_NUTRITIOUS = 2)
flags = REAGENT_NO_GENERATION

/datum/reagent/dehydrated_egg_powder
name = "Powdered Egg"
id = "dehydrated_egg_powder"
description = "Powderized egg-whites and egg-yolk ready to be mixed with water."
reagent_state = SOLID
color = "#FFFFFF" // rgb: 255,255,255
chemclass = CHEM_CLASS_COMMON
properties = list(PROPERTY_NUTRITIOUS = 2)
flags = REAGENT_NO_GENERATION

/datum/reagent/dehydrated_milk_powder
name = "Dehydrated Milk Powder"
id = "dehydrated_milk_powder"
description = "Dehydrated milk-product powder waiting to be mixed with water."
reagent_state = SOLID
color = "#DFDFDF" // rgb: 223, 223, 223
chemclass = CHEM_CLASS_COMMON
properties = list(PROPERTY_NUTRITIOUS = 2)
flags = REAGENT_NO_GENERATION
Loading