From 7ef05e33ad4cd4229880d84cc6ac180bb5626108 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 19 Feb 2018 10:23:21 -0600 Subject: [PATCH] [MIRROR] Mime's Bane recipe (#5592) * Mime's Bane recipe (#35570) * Makes Mimes's Bane use the new EMOTEMUTE trait It randomly occured to me that I should do this. Mime's Bane is currently a reagent currently only used in cloning pods to stop growing clones from gasping from crit/lack of air (since they're in a pure nitrogen environment). * 2 Mime's Bane = 1 Mute Toxin + 1 Nothing * Mutetoxin + nothing + radium * Mime's Bane recipe --- code/__DEFINES/traits.dm | 1 + code/datums/emotes.dm | 5 ++++- .../reagents/chemistry/reagents/toxin_reagents.dm | 6 ++++++ code/modules/reagents/chemistry/recipes/toxins.dm | 10 ++++++++-- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index 49c2b2f8be..c9fbfd3117 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -1,6 +1,7 @@ //mob traits #define TRAIT_BLIND "blind" #define TRAIT_MUTE "mute" +#define TRAIT_EMOTEMUTE "emotemute" #define TRAIT_DEAF "deaf" #define TRAIT_NEARSIGHT "nearsighted" #define TRAIT_FAT "fat" diff --git a/code/datums/emotes.dm b/code/datums/emotes.dm index 1f68a9ec42..8ce632e32d 100644 --- a/code/datums/emotes.dm +++ b/code/datums/emotes.dm @@ -107,7 +107,10 @@ if(restraint_check && (user.restrained() || user.buckled)) to_chat(user, "You cannot [key] while restrained.") return FALSE - if(user.reagents && user.reagents.has_reagent("mimesbane")) + + if(isliving(user)) + var/mob/living/L = user + if(L.has_trait(TRAIT_EMOTEMUTE)) return FALSE /datum/emote/sound diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index e8f9387e19..a451be476c 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -908,3 +908,9 @@ color = "#F0F8FF" // rgb: 240, 248, 255 toxpwr = 0 taste_description = "stillness" + +/datum/reagent/toxin/mimesbane/on_mob_add(mob/living/L) + L.add_trait(TRAIT_EMOTEMUTE, id) + +/datum/reagent/toxin/mimesbane/on_mob_delete(mob/living/L) + L.remove_trait(TRAIT_EMOTEMUTE, id) diff --git a/code/modules/reagents/chemistry/recipes/toxins.dm b/code/modules/reagents/chemistry/recipes/toxins.dm index 375ee29ed5..7809262ee0 100644 --- a/code/modules/reagents/chemistry/recipes/toxins.dm +++ b/code/modules/reagents/chemistry/recipes/toxins.dm @@ -64,7 +64,7 @@ required_reagents = list("ethanol" = 1, "chlorine" = 3, "water" = 1) /datum/chemical_reaction/mutetoxin //i'll just fit this in here snugly between other unfun chemicals :v - name = "Mute toxin" + name = "Mute Toxin" id = "mutetoxin" results = list("mutetoxin" = 2) required_reagents = list("uranium" = 2, "water" = 1, "carbon" = 1) @@ -106,4 +106,10 @@ name = "Anacea" id = "anacea" results = list("anacea" = 3) - required_reagents = list("haloperidol" = 1, "impedrezene" = 1, "radium" = 1) \ No newline at end of file + required_reagents = list("haloperidol" = 1, "impedrezene" = 1, "radium" = 1) + +/datum/chemical_reaction/mimesbane + name = "Mime's Bane" + id = "mimesbane" + results = list("mimesbane" = 3) + required_reagents = list("radium" = 1, "mutetoxin" = 1, "nothing" = 1)