diff --git a/code/modules/reagents/reagent_containers/food/condiment.dm b/code/modules/reagents/reagent_containers/food/condiment.dm index 8e14945cd834..04e0da9e6599 100644 --- a/code/modules/reagents/reagent_containers/food/condiment.dm +++ b/code/modules/reagents/reagent_containers/food/condiment.dm @@ -320,6 +320,62 @@ desc = "Discount Sauce now in a family sized package." icon_state = "discount_sauce" condiment_overlay = DISCOUNT + if(MUTAGEN) + name = "unstable mutagen bottle" + desc = "Drinking is not recommended." + icon_state = "mutagen" + if(UNTABLE_MUTAGEN) + name = "untable mutagen bottle" + desc = "Cleaning tables is not recommended." + icon_state = "mutagen" + if(RADIUM) + name = "radium bottle" + desc = "Despite it's inviting shape, 10 out of every 10 watch manufacturers don't recommend drinking it." + icon_state = "radium_glow" + if(URANIUM) + name = "uranium bottle" + desc = "Cherenkov radiation in a bottle. Don't worry about it." + icon_state = "uranium_blueglow" + if(KELOTANE) + name = "kelotane bottle" + desc = "Just what grandma used to give you." + icon_state = "kelotane" + if(TANNIC_ACID) + name = "tannic acid bottle" + desc = "Despite the name, it actually helps with burns." + icon_state = "tannicacid" + if(BICARIDINE) + name = "bicaridine bottle" + desc = "Can replace the booboo kisses grandma would give." + icon_state = "bicaridine" + if(OPIUM) + name = "opium bottle" + desc = "Space China still recoils at the sight of poppies." + icon_state = "opium" + if(COCAINE) + name = "cocaine baggie" + desc = "You feel stimulated just by looking at it." + icon_state = "cocaine_[pick(1,2,3)]" + if(HYPERZINE) + name = "hyperzine bottle" + desc = "Abuse with caution." + icon_state = "hyperzine" + if(CREATINE) + name = "creatine bottle" + desc = "Pure muscle in a bottle. But can you handle being SWOLE?" + icon_state = "creatine" + if(DEXALIN) + name = "dexalin bottle" + desc = "That special helper when you are close to drowning." + icon_state = "dexalins" + if(THYMOL) + name = "thymol bottle" + desc = "Weirdly scarce compared to its counterparts." + icon_state = "thymol" + if(DEXALINP) + name = "dexalin plus bottle" + desc = "You won't even notice when your lungs pop!" + icon_state = "dexalins" else name = "misc condiment bottle" desc = "Just your average condiment container." diff --git a/code/modules/reagents/reagents/reagents_drug.dm b/code/modules/reagents/reagents/reagents_drug.dm index ee7451aee11d..d1b9ba91e939 100644 --- a/code/modules/reagents/reagents/reagents_drug.dm +++ b/code/modules/reagents/reagents/reagents_drug.dm @@ -193,7 +193,7 @@ id = HYPERZINE description = "Hyperzine is a highly effective, long lasting, muscle stimulant." reagent_state = REAGENT_STATE_LIQUID - color = "#C8A5DC" //rgb: 200, 165, 220 + color = "#DCDCDC" //rgb: 220, 220, 220 custom_metabolism = 0.03 overdose_am = REAGENTS_OVERDOSE/2 density = 1.79 diff --git a/code/modules/reagents/reagents/reagents_medical.dm b/code/modules/reagents/reagents/reagents_medical.dm index 3f6e2a022ef5..9dfe57b49f50 100644 --- a/code/modules/reagents/reagents/reagents_medical.dm +++ b/code/modules/reagents/reagents/reagents_medical.dm @@ -356,7 +356,7 @@ id = BICARIDINE description = "Bicaridine is an analgesic medication and can be used to treat blunt trauma." reagent_state = REAGENT_STATE_LIQUID - color = "#C8A5DC" //rgb: 200, 165, 220 + color = "#5962F8" //rgb: 89, 98, 248 overdose_am = REAGENTS_OVERDOSE density = 1.96 specheatcap = 0.57 @@ -668,7 +668,7 @@ var/global/list/charcoal_doesnt_remove=list( id = DEXALIN description = "Dexalin is used in the treatment of oxygen deprivation." reagent_state = REAGENT_STATE_LIQUID - color = "#C8A5DC" //rgb: 200, 165, 220 + color = "#C2733F" //rgb: 74, 230, 252 density = 2.28 specheatcap = 0.91 @@ -701,7 +701,7 @@ var/global/list/charcoal_doesnt_remove=list( id = DEXALINP description = "Dexalin Plus is used in the treatment of oxygen deprivation. Its highly effective." reagent_state = REAGENT_STATE_LIQUID - color = "#C8A5DC" //rgb: 200, 165, 220 + color = "#C2733F" //rgb: 74, 230, 252 density = 4.14 specheatcap = 0.29 @@ -913,7 +913,7 @@ var/global/list/charcoal_doesnt_remove=list( id = KELOTANE description = "Kelotane is a drug used to treat burns." reagent_state = REAGENT_STATE_LIQUID - color = "#C8A5DC" //rgb: 200, 165, 220 + color = "#C2733F" //rgb: 94, 15, 63 density = 2.3 specheatcap = 0.51 diff --git a/code/modules/reagents/reagents/reagents_toxin.dm b/code/modules/reagents/reagents/reagents_toxin.dm index 2dd5aa4ad7b4..9dcdbe65c534 100644 --- a/code/modules/reagents/reagents/reagents_toxin.dm +++ b/code/modules/reagents/reagents/reagents_toxin.dm @@ -139,7 +139,7 @@ id = CHEFSPECIAL description = "An extremely toxic chemical that will surely end in death." reagent_state = REAGENT_STATE_LIQUID - color = "#CF3600" //rgb: 207, 54, 0 + color = "#D957F9" //rgb: 217, 82, 249 custom_metabolism = 0.01 overdose_tick = 165 density = 0.687 //Let's assume it's a compound of cyanide diff --git a/icons/obj/food_condiment.dmi b/icons/obj/food_condiment.dmi index e69e61988c6d..c07d76c24c5a 100644 Binary files a/icons/obj/food_condiment.dmi and b/icons/obj/food_condiment.dmi differ