From 93acbf0a1d701ce282fcd1c78901ac54c77cc631 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Tue, 15 Jan 2019 19:51:08 -0800 Subject: [PATCH] Update other_reagents.dm --- .../reagents/chemistry/reagents/other_reagents.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 53bc7e2c17..a7e4e0f590 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -1280,6 +1280,7 @@ reagent_state = SOLID color = "#FFFFFF" // rgb: 207, 54, 0 taste_description = "the back of class" + no_mob_color = TRUE /datum/reagent/colorful_reagent/crayonpowder/New() description = "\an [colorname] powder made by grinding down crayons, good for colouring chemical reagents." @@ -1481,14 +1482,16 @@ color = "#C8A5DC" var/list/random_color_list = list("#00aedb","#a200ff","#f47835","#d41243","#d11141","#00b159","#00aedb","#f37735","#ffc425","#008744","#0057e7","#d62d20","#ffa700") taste_description = "rainbows" - + var/no_mob_color = FALSE /datum/reagent/colorful_reagent/on_mob_life(mob/living/carbon/M) - M.add_atom_colour(pick(random_color_list), WASHABLE_COLOUR_PRIORITY) + if(!no_mob_color) + M.add_atom_colour(pick(random_color_list), WASHABLE_COLOUR_PRIORITY) ..() /datum/reagent/colorful_reagent/reaction_mob(mob/living/M, reac_volume) - M.add_atom_colour(pick(random_color_list), WASHABLE_COLOUR_PRIORITY) + if(!no_mob_color) + M.add_atom_colour(pick(random_color_list), WASHABLE_COLOUR_PRIORITY) ..() /datum/reagent/colorful_reagent/reaction_obj(obj/O, reac_volume)