Merge pull request #9170 from Trilbyspaceclone/more_cooking2

Makes peaches used in crafting a lot more, grammer fixes and new icecreams and floats - Remakes charrie shakes into icecreams rather then drinks
This commit is contained in:
nik707
2019-09-26 23:54:17 -05:00
committed by GitHub
27 changed files with 282 additions and 48 deletions
@@ -191,6 +191,13 @@
color = "#731008" // rgb: 115, 16, 8
taste_description = "ketchup"
/datum/reagent/consumable/mustard
name = "Mustard"
id = "mustard"
description = "Mustard, mostly used on hotdogs, corndogs and burgers."
nutriment_factor = 5 * REAGENTS_METABOLISM
color = "#DDED26" // rgb: 221, 237, 38
taste_description = "mustard"
/datum/reagent/consumable/capsaicin
name = "Capsaicin Oil"
@@ -1445,9 +1445,6 @@
color = "#FFFFFF" // white
random_color_list = list("#FFFFFF") //doesn't actually change appearance at all
//////////////////////////////////Hydroponics stuff///////////////////////////////
/datum/reagent/plantnutriment
@@ -1489,16 +1486,8 @@
tox_prob = 15
pH = 1
// GOON OTHERS
/datum/reagent/oil
name = "Oil"
id = "oil"
@@ -2032,6 +2021,13 @@
qdel(original_dna)
return ..()
/datum/reagent/mustardgrind
name = "Mustardgrind"
id = "mustardgrind"
description = "A powerd that is mixed with water and enzymes to make mustard."
color = "#BCC740" //RGB: 188, 199, 64
taste_description = "plant dust"
/datum/reagent/pax/catnip
name = "catnip"
id = "catnip"
@@ -82,6 +82,12 @@
required_temp = 374
mob_react = FALSE
/datum/chemical_reaction/mustard
name = "Mustard"
id = "mustard"
results = list("mustard" = 5)
required_reagents = list("mustardgrind" = 1, "water" = 10, "enzyme"= 1)
/datum/chemical_reaction/soapification/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)