From 983d39925f84af829eef283a8423c7f7d56deacd Mon Sep 17 00:00:00 2001 From: SabreML <57483089+SabreML@users.noreply.github.com> Date: Tue, 2 Mar 2021 09:30:18 +0000 Subject: [PATCH] Blood colouring in syringes (#15626) * Blood reagent colours * Clarification --- code/modules/reagents/chemistry/colors.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/colors.dm b/code/modules/reagents/chemistry/colors.dm index f5f4f252a01..cd7fcc84eb3 100644 --- a/code/modules/reagents/chemistry/colors.dm +++ b/code/modules/reagents/chemistry/colors.dm @@ -16,6 +16,8 @@ GLOBAL_LIST_INIT(random_color_list, list("#00aedb","#a200ff","#f47835","#d41243" for(var/datum/reagent/reagent in reagent_list) if(reagent.id == "blood" && reagent.data && reagent.data["blood_color"]) reagent_color = reagent.data["blood_color"] + else if(reagent.id == "slimejelly" && reagent.data && reagent.data["colour"]) + reagent_color = reagent.data["colour"] else reagent_color = reagent.color @@ -23,7 +25,7 @@ GLOBAL_LIST_INIT(random_color_list, list("#00aedb","#a200ff","#f47835","#d41243" vol_counter += vol_temp if(isnull(color)) - color = reagent.color + color = reagent_color else if(length(color) >= length(reagent_color)) color = BlendRGB(color, reagent_color, vol_temp/vol_counter) else