From b5b05a11af04d03255193fb506f7a8490881af42 Mon Sep 17 00:00:00 2001 From: Burzah <116982774+Burzah@users.noreply.github.com> Date: Wed, 16 Apr 2025 06:30:57 -0700 Subject: [PATCH] Changes the colors of some chemicals while in glass containers (#28510) * Initial commit * made color changes --- .../objects/items/weapons/storage/backpack.dm | 2 +- .../food_and_drinks/food/foods/candy.dm | 2 +- .../chemistry/reagents/admin_reagents.dm | 2 +- .../chemistry/reagents/food_reagents.dm | 6 ++-- .../reagents/chemistry/reagents/medicine.dm | 30 +++++++++---------- .../chemistry/reagents/misc_reagents.dm | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index e844d64fd10..fbc328822b8 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -789,7 +789,7 @@ name = "drop of immortality" desc = "Drinking this will make you immortal. For a moment or two, at least." icon_state = "holyflask" - color = "#C8A5DC" + color = "#437fb8" volume = 5 list_reagents = list("adminordrazine" = 5) diff --git a/code/modules/food_and_drinks/food/foods/candy.dm b/code/modules/food_and_drinks/food/foods/candy.dm index 486c47a3161..004cba5b4f5 100644 --- a/code/modules/food_and_drinks/food/foods/candy.dm +++ b/code/modules/food_and_drinks/food/foods/candy.dm @@ -590,7 +590,7 @@ desc = "Light and fluffy, it's like eating a cloud made from sugar!" icon_state = "cottoncandy_rainbow" trash = /obj/item/c_tube - filling_color = "#C8A5DC" + filling_color = "#eb0dc6" list_reagents = list("omnizine" = 20) goal_difficulty = FOOD_GOAL_HARD diff --git a/code/modules/reagents/chemistry/reagents/admin_reagents.dm b/code/modules/reagents/chemistry/reagents/admin_reagents.dm index 1cb1ac17363..87622d97419 100644 --- a/code/modules/reagents/chemistry/reagents/admin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/admin_reagents.dm @@ -4,7 +4,7 @@ id = "adminordrazine" description = "It's magic. We don't have to explain it." reagent_state = LIQUID - color = "#C8A5DC" // rgb: 200, 165, 220 + color = "#600694" process_flags = ORGANIC | SYNTHETIC //Adminbuse knows no bounds! taste_description = "admin abuse" diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index c1848642e05..e9acabc3877 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -486,7 +486,7 @@ id = "corn_starch" description = "The powdered starch of maize, derived from the kernel's endosperm. Used as a thickener for gravies and puddings." reagent_state = LIQUID - color = "#C8A5DC" + color = "#ffeb91" taste_description = "flour" /datum/reagent/consumable/corn_syrup @@ -494,7 +494,7 @@ id = "corn_syrup" description = "A sweet syrup derived from corn starch that has had its starches converted into maltose and other sugars." reagent_state = LIQUID - color = "#C8A5DC" + color = "#ada537" taste_description = "cheap sugar substitute" /datum/reagent/consumable/corn_syrup/on_mob_life(mob/living/M) @@ -506,7 +506,7 @@ id = "vhfcs" description = "An incredibly sweet syrup, created from corn syrup treated with enzymes to convert its sugars into fructose." reagent_state = LIQUID - color = "#C8A5DC" + color = "#484917" taste_description = "diabetes" /datum/reagent/consumable/vhfcs/on_mob_life(mob/living/M) diff --git a/code/modules/reagents/chemistry/reagents/medicine.dm b/code/modules/reagents/chemistry/reagents/medicine.dm index ae7364408aa..a9209ff92bd 100644 --- a/code/modules/reagents/chemistry/reagents/medicine.dm +++ b/code/modules/reagents/chemistry/reagents/medicine.dm @@ -135,7 +135,7 @@ id = "mitocholide" description = "A specialized drug that stimulates the mitochondria of cells to encourage healing of internal organs." reagent_state = LIQUID - color = "#C8A5DC" // rgb: 200, 165, 220 + color = "#8523be" taste_description = "nurturing" goal_difficulty = REAGENT_GOAL_NORMAL @@ -264,7 +264,7 @@ id = "salglu_solution" description = "This saline and glucose solution can help stabilize critically injured patients and cleanse wounds." reagent_state = LIQUID - color = "#C8A5DC" + color = "#cbc6ce" penetrates_skin = TRUE metabolization_rate = 0.15 taste_description = "salt" @@ -460,7 +460,7 @@ id = "omnizine" description = "Omnizine is a highly potent healing medication that can be used to treat a wide range of injuries." reagent_state = LIQUID - color = "#C8A5DC" + color = "#d6047f" metabolization_rate = 0.2 overdose_threshold = 30 addiction_chance = 1 @@ -572,7 +572,7 @@ id = "pen_acid" description = "Pentetic Acid is an aggressive chelation agent. May cause tissue damage. Use with caution." reagent_state = LIQUID - color = "#C8A5DC" + color = "#058605" harmless = FALSE taste_description = "a purge" goal_difficulty = REAGENT_GOAL_HARD @@ -649,7 +649,7 @@ id = "perfluorodecalin" description = "This experimental perfluoronated solvent has applications in liquid breathing and tissue oxygenation. Use with caution." reagent_state = LIQUID - color = "#C8A5DC" + color = "#54abfc" metabolization_rate = 0.2 overdose_threshold = 4 allowed_overdose_process = TRUE @@ -679,7 +679,7 @@ id = "ephedrine" description = "Ephedrine is a plant-derived stimulant." reagent_state = LIQUID - color = "#C8A5DC" + color = "#a185b1" metabolization_rate = 0.3 overdose_threshold = 35 harmless = FALSE @@ -797,7 +797,7 @@ id = "morphine" description = "A strong but highly addictive opiate painkiller with sedative side effects." reagent_state = LIQUID - color = "#C8A5DC" + color = "#700258" overdose_threshold = 20 addiction_chance = 10 addiction_threshold = 15 @@ -826,7 +826,7 @@ id = "oculine" description = "Oculine is a saline eye medication with mydriatic and antibiotic effects." reagent_state = LIQUID - color = "#C8A5DC" + color = "#757377" taste_description = "clarity" goal_difficulty = REAGENT_GOAL_HARD @@ -1141,7 +1141,7 @@ name = "Stimulants" id = "stimulants" description = "An illegal compound that dramatically enhances the body's performance and healing capabilities." - color = "#C8A5DC" + color = "#a12c3c" harmless = FALSE taste_description = "an unstoppable force" @@ -1184,7 +1184,7 @@ name = "Stimulative Agent" id = "stimulative_agent" description = "Increases run speed and eliminates stuns, can heal minor damage. If overdosed it will deal toxin damage and be less effective for healing stamina." - color = "#C8A5DC" + color = "#96210de3" metabolization_rate = 0.5 * REAGENTS_METABOLISM overdose_threshold = 60 harmless = FALSE @@ -1257,7 +1257,7 @@ id = "insulin" description = "A hormone generated by the pancreas responsible for metabolizing carbohydrates and fat in the bloodstream." reagent_state = LIQUID - color = "#C8A5DC" + color = "#e6d5f0" taste_description = "tiredness" /datum/reagent/medicine/insulin/on_mob_life(mob/living/M) @@ -1401,7 +1401,7 @@ id = "weak_omnizine" description = "Slowly heals all damage types. A far weaker substitute than actual omnizine." reagent_state = LIQUID - color = "#DCDCDC" + color = "#c173c4" overdose_threshold = 30 metabolization_rate = 0.1 harmless = FALSE @@ -1486,7 +1486,7 @@ id = "bicaridine" description = "Restores bruising. Overdose causes it instead." reagent_state = LIQUID - color = "#C8A5DC" + color = "#bb3805" overdose_threshold = 30 harmless = FALSE taste_description = "knitting wounds" @@ -1506,7 +1506,7 @@ id = "kelotane" description = "Restores fire damage. Overdose causes it instead." reagent_state = LIQUID - color = "#C8A5DC" + color = "#dae907" overdose_threshold = 30 harmless = FALSE taste_description = "soothed burns" @@ -1659,7 +1659,7 @@ name = "Lavaland Extract" id = "lavaland_extract" description = "An extract of lavaland atmospheric and mineral elements. Heals the user in small doses, but is extremely toxic otherwise." - color = "#C8A5DC" // rgb: 200, 165, 220 + color = "#5a2323" overdose_threshold = 3 //To prevent people stacking massive amounts of a very strong healing reagent harmless = FALSE diff --git a/code/modules/reagents/chemistry/reagents/misc_reagents.dm b/code/modules/reagents/chemistry/reagents/misc_reagents.dm index 0f39d90d25d..721b6224bbf 100644 --- a/code/modules/reagents/chemistry/reagents/misc_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/misc_reagents.dm @@ -125,7 +125,7 @@ id = "iron" description = "Pure iron is a metal." reagent_state = SOLID - color = "#C8A5DC" // rgb: 200, 165, 220 + color = "#525152" // rgb: 200, 165, 220 taste_description = "metal" /datum/reagent/iron/on_mob_life(mob/living/M)