Fixes foods not having the right tastes (#3019)

I forgot to do this in my old pr tastes, also includes changes from #3017.
This commit is contained in:
Alberyk
2017-07-13 15:04:31 -03:00
committed by skull132
parent 216039eb2e
commit 12bfdd2f79
10 changed files with 475 additions and 281 deletions

View File

@@ -174,6 +174,18 @@
return
..()
/datum/reagent/nutriment/protein/tofu //Good for Skrell!
name = "tofu protein"
id = "tofu"
color = "#fdffa8"
taste_description = "tofu"
/datum/reagent/nutriment/protein/tofu/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
if(alien && alien == IS_SKRELL)
digest(M,removed) //Skrell are allowed to eat tofu, but not most animal proteins
return
..()
/datum/reagent/nutriment/protein/seafood // Good for Skrell!
name = "seafood protein"
id = "seafood"
@@ -601,7 +613,7 @@
/datum/reagent/spacespice
name = "Space Spice"
id = "spacespice"
description = "An exotic blend of spices for cooking. Definitely not worms."
description = "An exotic blend of spices for cooking. It must flow."
reagent_state = SOLID
color = "#e08702"
taste_description = "spices"
@@ -613,7 +625,7 @@
description = "A dry mix for making delicious brownies."
reagent_state = SOLID
color = "#441a03"
taste_description = "dough"
taste_description = "chocolate"
/* Drinks */
@@ -714,7 +726,7 @@
id = "limejuice"
description = "The sweet-sour juice of limes."
color = "#365E30"
taste_description = "unbearable sourness"
taste_description = "tart citrus"
taste_mult = 1.1
glass_icon_state = "glass_green"

View File

@@ -321,6 +321,7 @@
color = "#C8A5DC"
overdose = REAGENTS_OVERDOSE
scannable = 1
taste_mult = 0.33 //Specifically to cut the dull toxin taste out of foods using carrot
taste_description = "dull toxin"
/datum/reagent/imidazoline/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)

View File

@@ -53,7 +53,7 @@
user << "<span class='notice'>You swallow some of contents of \the [src].</span>"
on_reagent_change()
if(icon_state == "saltshakersmall" || icon_state == "peppermillsmall" || icon_state == "flour")
if(icon_state == "saltshakersmall" || icon_state == "peppermillsmall" || icon_state == "flour" || icon_state == "spacespicebottle")
return
if(reagents.reagent_list.len > 0)
switch(reagents.get_master_reagent_id())
@@ -103,7 +103,7 @@
center_of_mass = list("x"=16, "y"=6)
if("spacespice")
name = "bottle of space spice"
desc = "An exotic blend of spices for cooking. Definitely not worms."
desc = "An exotic blend of spices for cooking. It must flow."
icon_state = "spacespicebottle"
center_of_mass = list("x"=16, "y"=6)
else
@@ -171,7 +171,7 @@
/obj/item/weapon/reagent_containers/food/condiment/spacespice
name = "space spices"
desc = "An exotic blend of spices for cooking. Definitely not worms."
desc = "An exotic blend of spices for cooking. It must flow."
icon_state = "spacespicebottle"
possible_transfer_amounts = list(1,40) //for clown turning the lid off
amount_per_transfer_from_this = 1

File diff suppressed because it is too large Load Diff