Merge pull request #7455 from Iamgoofball/patch-25

Fixes #7258
This commit is contained in:
hornygranny
2015-02-02 18:32:02 -08:00
@@ -118,8 +118,8 @@ datum/reagent/colorful_reagent
required_reagents = list("stable_plasma" = 1, "radium" = 1, "space_drugs" = 1, "cryoxadone" = 1, "triple_citrus" = 1)
result_amount = 5
datum/reagent/colorful_reagent/reaction_mob(var/mob/M, var/volume)
if(M)
datum/reagent/colorful_reagent/reaction_mob(var/mob/living/M, var/volume)
if(M && isliving(M))
M.color = pick(potential_colors)
..()
return
@@ -147,4 +147,4 @@ datum/reagent/triple_citrus
id = "triple_citrus"
result = "triple_citrus"
required_reagents = list("lemonjuice" = 1, "limejuice" = 1, "orangejuice" = 1)
result_amount = 5
result_amount = 5