From 779830e6c76e64082d80f40066cd5ffc9c751ba2 Mon Sep 17 00:00:00 2001 From: Fermi Date: Mon, 1 Jul 2019 14:13:22 +0100 Subject: [PATCH] Compile check. Ready for update. --- modular_citadel/code/datums/status_effects/chems.dm | 3 ++- .../code/modules/reagents/chemistry/reagents/MKUltra.dm | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modular_citadel/code/datums/status_effects/chems.dm b/modular_citadel/code/datums/status_effects/chems.dm index 86a67756ee..f8d7cfff63 100644 --- a/modular_citadel/code/datums/status_effects/chems.dm +++ b/modular_citadel/code/datums/status_effects/chems.dm @@ -597,12 +597,13 @@ //wah intensifies wah-rks else if (lowertext(customTriggers[trigger]) == "cum")//aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - if (HAS_TRAIT(C, TRAIT_NYMPHO)) + if (HAS_TRAIT(C, TRAIT_NYMPHO) && C.lewd) if (C.getArousalLoss() > 80) C.mob_climax(forced_climax=TRUE) C.SetStun(10)//We got your stun effects in somewhere, Kev. else C.adjustArousalLoss(10) + to_chat(C, "You feel a surge of arousal!") else C.throw_at(get_step_towards(speaker,C), 3, 1) //cut this if it's too hard to get working diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm index 84f97f5a87..e569468453 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm @@ -284,9 +284,9 @@ Creating a chem with a low purity will make you permanently fall in love with so else E = M.has_status_effect(/datum/status_effect/chem/enthrall) if(M.lewd) - to_chat(M, "Your mind shatters under the volume of the mild altering chem inside of you, breaking all will and thought completely. Instead the only force driving you now is the instinctual desire to obey and follow [creatorName]. Your highest priority is now to stay by their side at all costs.") + to_chat(M, "Your mind shatters under the volume of the mild altering chem inside of you, breaking all will and thought completely. Instead the only force driving you now is the instinctual desire to obey and follow [creatorName]. Your highest priority is now to stay by their side and protect them at all costs.") else - to_chat + to_chat(M, "The might volume of chemicals in your system overwhelms your mind, and you suddenly agree with what they've been saying. Your highest priority is now to stay by their side and protect them at all costs. log_game("FERMICHEM: [M] ckey: [M.key] has been mindbroken for [creatorName] ckey: [creatorID]") M.slurring = 100 M.confused = 100 @@ -353,7 +353,7 @@ Creating a chem with a low purity will make you permanently fall in love with so if(Lover.has_status_effect(STATUS_EFFECT_INLOVE)) to_chat(Lover, "You are already fully devoted to someone else!") return - to_chat(Lover, "[(Lover.lewd?"":"")]You develop a deep and sudden bond with [love][(Lover.lewd?", your heart beginning to race as your mind filles with thoughts about them.":".")] You are determined to keep them safe and happy, and feel drawn towards them.") + to_chat(Lover, "[(Lover.lewd?"":"")]You develop a deep and sudden bond with [Love][(Lover.lewd?", your heart beginning to race as your mind filles with thoughts about them.":".")] You are determined to keep them safe and happy, and feel drawn towards them.") if(Lover.mind) Lover.mind.store_memory("You are in love with [Love].") Lover.faction |= "[REF(Love)]"