From 0fdcd9ca8f6d1558fa18e5ca314e9ecc54a0b2c6 Mon Sep 17 00:00:00 2001 From: SabreML <57483089+SabreML@users.noreply.github.com> Date: Sun, 7 Mar 2021 12:24:25 +0000 Subject: [PATCH] Makes Mugwort Tea remove harmful chems (#15651) * Mugwort Mugwort is a common name for several species of aromatic flowering plants in the genus Artemisia. In Europe, mugwort most often refers to the species Artemisia vulgaris, or common mugwort. * I am very smart --- code/modules/reagents/chemistry/reagents/food.dm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/food.dm b/code/modules/reagents/chemistry/reagents/food.dm index c77a3e11b49..d22adff060d 100644 --- a/code/modules/reagents/chemistry/reagents/food.dm +++ b/code/modules/reagents/chemistry/reagents/food.dm @@ -591,15 +591,18 @@ reagent_state = LIQUID color = "#21170E" taste_description = "tea" + harmless = TRUE /datum/reagent/consumable/mugwort/on_mob_life(mob/living/M) var/update_flags = STATUS_UPDATE_NONE - if(ishuman(M) && M.mind) - if(M.mind.special_role == SPECIAL_ROLE_WIZARD) - update_flags |= M.adjustToxLoss(-1*REAGENTS_EFFECT_MULTIPLIER, FALSE) - update_flags |= M.adjustOxyLoss(-1*REAGENTS_EFFECT_MULTIPLIER, FALSE) - update_flags |= M.adjustBruteLoss(-1*REAGENTS_EFFECT_MULTIPLIER, FALSE) - update_flags |= M.adjustFireLoss(-1*REAGENTS_EFFECT_MULTIPLIER, FALSE) + if(ishuman(M) && M.mind?.special_role == SPECIAL_ROLE_WIZARD) + update_flags |= M.adjustToxLoss(-1 * REAGENTS_EFFECT_MULTIPLIER, FALSE) + update_flags |= M.adjustOxyLoss(-1 * REAGENTS_EFFECT_MULTIPLIER, FALSE) + update_flags |= M.adjustBruteLoss(-1 * REAGENTS_EFFECT_MULTIPLIER, FALSE) + update_flags |= M.adjustFireLoss(-1 * REAGENTS_EFFECT_MULTIPLIER, FALSE) + for(var/datum/reagent/R in M.reagents.reagent_list) + if(!R.harmless) + M.reagents.remove_reagent(R.id, 5) // purge those meme chems return ..() | update_flags /datum/reagent/consumable/porktonium