From 7626750c49bd8a2099d91fafa3907bb845dbb5f5 Mon Sep 17 00:00:00 2001 From: Putnam Date: Tue, 28 Jan 2020 23:03:29 -0800 Subject: [PATCH] hypno tweaks --- modular_citadel/code/datums/status_effects/chems.dm | 6 +++--- .../code/modules/reagents/chemistry/reagents/MKUltra.dm | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modular_citadel/code/datums/status_effects/chems.dm b/modular_citadel/code/datums/status_effects/chems.dm index 89086ab1e5..82f4fbf1d9 100644 --- a/modular_citadel/code/datums/status_effects/chems.dm +++ b/modular_citadel/code/datums/status_effects/chems.dm @@ -211,10 +211,10 @@ /mob/living/verb/toggle_hypno() set category = "IC" - set name = "Toggle Lewd MKUltra" - set desc = "Allows you to toggle if you'd like lewd flavour messages for MKUltra." + set name = "Toggle Lewd Hypno" + set desc = "Allows you to toggle if you'd like lewd flavour messages for hypno features, such as MKUltra." client.prefs.cit_toggles ^= HYPNO - to_chat(usr, "You [((client.prefs.cit_toggles & HYPNO) ?"will":"no longer")] receive lewd flavour messages for MKUltra.") + to_chat(usr, "You [((client.prefs.cit_toggles & HYPNO) ?"will":"no longer")] receive lewd flavour messages for hypno.") /datum/status_effect/chem/enthrall id = "enthrall" diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm index 86325faa91..f935fc5092 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm @@ -333,6 +333,8 @@ Creating a chem with a low purity will make you permanently fall in love with so ..() /datum/reagent/fermi/proc/FallInLove(mob/living/carbon/Lover, mob/living/carbon/Love) + if(Lover.client?.prefs.cit_toggles & NEVER_HYPNO) + return // doesn't even give a message, it's just ignored if(Lover.has_status_effect(STATUS_EFFECT_INLOVE)) to_chat(Lover, "You are already fully devoted to someone else!") return