From aa289b67dc2e5fc7d6a30490bd2d82a7d2c0fd40 Mon Sep 17 00:00:00 2001 From: Fermi Date: Wed, 15 May 2019 05:28:41 +0100 Subject: [PATCH] Quick fix --- .../code/datums/status_effects/chems.dm | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/modular_citadel/code/datums/status_effects/chems.dm b/modular_citadel/code/datums/status_effects/chems.dm index 2070e0dda0..f204494eac 100644 --- a/modular_citadel/code/datums/status_effects/chems.dm +++ b/modular_citadel/code/datums/status_effects/chems.dm @@ -237,19 +237,19 @@ to_chat(owner, "You break free of the influence in your mind, your thoughts suddenly turning lucid!") owner.remove_status_effect(src) //If resisted in phase 1, effect is removed. if(prob(10)) - to_chat(owner, "[pick("It feels so good to listen to [master.name].", "You can't keep your eyes off [master.name].", "[master.name]'s voice is making you feel so sleepy.", "You feel so comfortable with [master.name]", "[master.name] is so sexy and dominant, it feels right to obey them.")].") + to_chat(owner, "[pick("It feels so good to listen to [master].", "You can't keep your eyes off [master].", "[master]'s voice is making you feel so sleepy.", "You feel so comfortable with [master]", "[master] is so sexy and dominant, it feels right to obey them.")].") else if (2) //partially enthralled if (enthrallTally > 150) phase += 1 mental_capacity -= resistanceTally//leftover resistance per step is taken away from mental_capacity. enthrallTally = 0 - to_chat(owner, "Your mind gives, eagerly obeying and serving [master.name].") - to_chat(owner, "You are now fully enthralled to [master.name], and eager to follow their commands. However you find that in your intoxicated state you are much less likely to resort to violence, unless it is to defend your [enthrallGender]. Equally you are unable to commit suicide, even if ordered to, as you cannot server your [enthrallGender] in death. ")//If people start using this as an excuse to be violent I'll just make them all pacifists so it's not OP. + to_chat(owner, "Your mind gives, eagerly obeying and serving [master].") + to_chat(owner, "You are now fully enthralled to [master], and eager to follow their commands. However you find that in your intoxicated state you are much less likely to resort to violence, unless it is to defend your [enthrallGender]. Equally you are unable to commit suicide, even if ordered to, as you cannot server your [enthrallGender] in death. ")//If people start using this as an excuse to be violent I'll just make them all pacifists so it's not OP. else if (resistanceTally > 150) enthrallTally *= 0.5 phase -= 1 resistanceTally = 0 - to_chat(owner, "You manage to shake some of the entrancement from your addled mind, however you can still feel yourself drawn towards [master.name].") + to_chat(owner, "You manage to shake some of the entrancement from your addled mind, however you can still feel yourself drawn towards [master].") //owner.remove_status_effect(src) //If resisted in phase 1, effect is removed. Not at the moment, else if (3)//fully entranced if (resistanceTally >= 250 && withdrawalTick >= 150) @@ -409,12 +409,13 @@ //qdel(redirect_component2.resolve()) //redirect_component2 = null - +/* /datum/status_effect/chem/enthrall/mob/say(message, bubble_type, var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) if(master in message || master in message) return else . = ..() +*/ /datum/status_effect/chem/enthrall/proc/on_hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode) var/mob/living/carbon/C = owner @@ -555,16 +556,15 @@ if (deltaResist>0)//just in case deltaResist /= phase//later phases require more resistance -/* + /datum/status_effect/chem/enthrall/proc/owner_say(message) //I can only hope this works var/datum/status_effect/chem/enthrall/E = owner.has_status_effect(/datum/status_effect/chem/enthrall) var/mob/living/master = E.master - var/static/regex/owner_words = regex("[master.name]|[master.first_name()]") + var/static/regex/owner_words = regex("[master]") if(findtext(message, owner_words)) - message = replacetext(lowertext(message), lowertext(master.real_name), "[enthrallGender]") - message = replacetext(lowertext(message), lowertext(master.name), "[enthrallGender]") + message = replacetext(lowertext(message), lowertext(master), "[enthrallGender]") return message -*/ + /* /datum/status_effect/chem/OwO id = "OwO"