From 21929eded3c0c43e1205e203a44f7c7e87768f5b Mon Sep 17 00:00:00 2001 From: Matt Date: Wed, 15 Apr 2015 11:31:31 +0200 Subject: [PATCH] Hydro fix & colorful corgis Hydro fix, fixes http://www.github.com/ParadiseSS13/Paradise/issue/683 Added corgis random color when splashed with colorful reagent. --- code/game/machinery/hydroponics.dm | 4 ++-- code/modules/reagents/newchem/other.dm | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/hydroponics.dm b/code/game/machinery/hydroponics.dm index 7c177419318..d5fb43f4d97 100644 --- a/code/game/machinery/hydroponics.dm +++ b/code/game/machinery/hydroponics.dm @@ -901,8 +901,8 @@ usr << "The plant looks \red unhealthy." else usr << "[src] is empty." - usr << "Water: [round(waterlevel,0.1)]/100" - usr << "Nutrient: [round(nutrilevel,0.1)]/10" + usr << "Water: [round(waterlevel,0.1)]/[maxwater]" + usr << "Nutrient: [round(nutrilevel,0.1)]/[maxnutri]" if(weedlevel >= 5) usr << "[src] is \red filled with weeds!" if(pestlevel >= 5) diff --git a/code/modules/reagents/newchem/other.dm b/code/modules/reagents/newchem/other.dm index d20416d2418..cf8fb9f0c44 100644 --- a/code/modules/reagents/newchem/other.dm +++ b/code/modules/reagents/newchem/other.dm @@ -117,6 +117,12 @@ datum/reagent/colorful_reagent result_amount = 6 mix_message = "The substance flashes multiple colors and emits the smell of a pocket protector." +datum/reagent/colorful_reagent/reaction_mob(var/mob/living/simple_animal/M, var/method=TOUCH, var/volume) + if(M) + M.color = pick(random_color_list) + ..() + return + datum/reagent/colorful_reagent/reaction_obj(var/obj/O, var/volume) if(O) O.color = pick(random_color_list)