Ports MREs from Baystation (#6424)

* Ports MREs from Baystation

- Ports MREs from Baystation
- Adds an 'Emergency ration' that contains liquidfood rations
- Two new ration packs that have the new rations.

* Placates travis

* Lynxlog

* Adds liquidprotein rations

* Sacrifice for travis

* Changes desc

* Fixing missing filling in crayon paste

* Fixes missing side for random rations

* Renames Paste Supplypack

* aaaaa minor error

* Slight organization

* Fixes some errors

* Why am I like this
This commit is contained in:
Novacat
2019-08-31 18:00:14 -04:00
committed by Atermonera
parent 9b5573eee6
commit 7f49c680e5
14 changed files with 827 additions and 8 deletions

View File

@@ -142,6 +142,24 @@
if(!istype(T, /turf/space))
new /obj/effect/decal/cleanable/flour(T)
/datum/reagent/nutriment/coffee
name = "Coffee Powder"
id = "coffeepowder"
description = "A bitter powder made by grinding coffee beans."
taste_description = "bitterness"
taste_mult = 1.3
nutriment_factor = 1
color = "#482000"
/datum/reagent/nutriment/tea
name = "Tea Powder"
id = "teapowder"
description = "A dark, tart powder made from black tea leaves."
taste_description = "tartness"
taste_mult = 1.3
nutriment_factor = 1
color = "#101000"
/datum/reagent/nutriment/coco
name = "Coco Powder"
id = "coco"
@@ -152,6 +170,41 @@
nutriment_factor = 5
color = "#302000"
/datum/reagent/nutriment/instantjuice
name = "Juice Powder"
id = "instantjuice"
description = "Dehydrated, powdered juice of some kind."
taste_mult = 1.3
nutriment_factor = 1
/datum/reagent/nutriment/instantjuice/grape
name = "Grape Juice Powder"
id = "instantgrape"
description = "Dehydrated, powdered grape juice."
taste_description = "dry grapes"
color = "#863333"
/datum/reagent/nutriment/instantjuice/orange
name = "Orange Juice Powder"
id = "instantorange"
description = "Dehydrated, powdered orange juice."
taste_description = "dry oranges"
color = "#e78108"
/datum/reagent/nutriment/instantjuice/watermelon
name = "Watermelon Juice Powder"
id = "instantwatermelon"
description = "Dehydrated, powdered watermelon juice."
taste_description = "dry sweet watermelon"
color = "#b83333"
/datum/reagent/nutriment/instantjuice/apple
name = "Apple Juice Powder"
id = "instantapple"
description = "Dehydrated, powdered apple juice."
taste_description = "dry sweet apples"
color = "#c07c40"
/datum/reagent/nutriment/soysauce
name = "Soysauce"
id = "soysauce"

View File

@@ -1183,6 +1183,20 @@
new /obj/item/weapon/reagent_containers/food/snacks/chocolatebar(location)
return
/datum/chemical_reaction/drinks/coffee
name = "Coffee"
id = "coffee"
result = "coffee"
required_reagents = list("water" = 5, "coffeepowder" = 1)
result_amount = 5
/datum/chemical_reaction/drinks/tea
name = "Black tea"
id = "tea"
result = "tea"
required_reagents = list("water" = 5, "teapowder" = 1)
result_amount = 5
/datum/chemical_reaction/drinks/hot_coco
name = "Hot Coco"
id = "hot_coco"
@@ -1197,6 +1211,34 @@
required_reagents = list("soymilk" = 4, "sacid" = 1)
result_amount = 5
/datum/chemical_reaction/drinks/grapejuice
name = "Grape Juice"
id = "grapejuice"
result = "grapejuice"
required_reagents = list("water" = 3, "instantgrape" = 1)
result_amount = 3
/datum/chemical_reaction/drinks/orangejuice
name = "Orange Juice"
id = "orangejuice"
result = "orangejuice"
required_reagents = list("water" = 3, "instantorange" = 1)
result_amount = 3
/datum/chemical_reaction/drinks/watermelonjuice
name = "Watermelon Juice"
id = "watermelonjuice"
result = "watermelonjuice"
required_reagents = list("water" = 3, "instantwatermelon" = 1)
result_amount = 3
/datum/chemical_reaction/drinks/applejuice
name = "Apple Juice"
id = "applejuice"
result = "applejuice"
required_reagents = list("water" = 3, "instantapple" = 1)
result_amount = 3
/datum/chemical_reaction/food/ketchup
name = "Ketchup"
id = "ketchup"