Merge pull request #816 from CrAzYPiLoT-SS13/master

Hydro fix & colorful corgis
This commit is contained in:
ZomgPonies
2015-04-16 16:37:47 -04:00
2 changed files with 8 additions and 2 deletions
+2 -2
View File
@@ -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)
+6
View File
@@ -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)