From b056d91ea526ed4e2a706fd795498b4009618f88 Mon Sep 17 00:00:00 2001
From: Fermi <>
Date: Fri, 22 Nov 2019 23:48:21 +0000
Subject: [PATCH] Removes the random love
---
code/modules/surgery/organs/vocal_cords.dm | 10 +++++-----
.../modules/reagents/chemistry/reagents/MKUltra.dm | 5 +----
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm
index 9d7695be5c..d3db97beff 100644
--- a/code/modules/surgery/organs/vocal_cords.dm
+++ b/code/modules/surgery/organs/vocal_cords.dm
@@ -749,19 +749,19 @@
to_chat(world, "[user]'s power is [power_multiplier].")
//Mixables
- var/static/regex/enthral_words = regex("relax|obey|love|serve|so easy|ara ara|old boy|pip pip|whatho|how about we discuss this|spot of tea")
- var/static/regex/reward_words = regex("good boy|good girl|good pet|good job|splendid|jolly good|jolly good show|bloody brilliant")
+ var/static/regex/enthral_words = regex("relax|obey|love|serve|so easy|ara ara")
+ var/static/regex/reward_words = regex("good boy|good girl|good pet|good job|splendid|jolly good|bloody brilliant")
var/static/regex/punish_words = regex("bad boy|bad girl|bad pet|bad job|spot of bother|gone and done it now|blast it|buggered it up")
//phase 0
var/static/regex/saymyname_words = regex("say my name|who am i|whoami")
- var/static/regex/wakeup_words = regex("revert|awaken|snap|attention") //works
+ var/static/regex/wakeup_words = regex("revert|awaken|snap|attention")
//phase1
var/static/regex/petstatus_words = regex("how are you|what is your status|are you okay")
var/static/regex/silence_words = regex("shut up|silence|be silent|ssh|quiet|hush")
var/static/regex/speak_words = regex("talk to me|speak")
var/static/regex/antiresist_words = regex("unable to resist|give in|stop being difficult")//useful if you think your target is resisting a lot
var/static/regex/resist_words = regex("resist|snap out of it|fight")//useful if two enthrallers are fighting
- var/static/regex/forget_words = regex("forget|muddled|awake and forget|sneaky bollocks|gaslight")
+ var/static/regex/forget_words = regex("forget|muddled|awake and forget")
var/static/regex/attract_words = regex("come here|come to me|get over here|attract")
//phase 2
var/static/regex/orgasm_words = regex("cum|orgasm|climax|squirt|heyo") //wah, lewd
@@ -1089,7 +1089,7 @@
if(C.client?.prefs.lewdchem)
addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, C, "You revert to yourself before being enthralled by your [E.enthrallGender], with no memory of what happened."), 5)
else
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, C, "You revert to who you were before, with no memory of what happened with [E.master], nor their political affiliations."), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, C, "You revert to who you were before, with no memory of what happened with [E.master]."), 5)
to_chat(user, "You put [C] into a sleeper state, ready to turn them back at the snap of your fingers.")
//ATTRACT
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm
index 35474f4c69..f01d0ad655 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm
@@ -203,10 +203,7 @@ Creating a chem with a low purity will make you permanently fall in love with so
/datum/reagent/fermi/enthrall/on_mob_life(mob/living/carbon/M)
. = ..()
if(purity < 0.5)//DO NOT SPLIT INTO DIFFERENT CHEM: This relies on DoNotSplit - has to be done this way.
- if(volume < 0.5)//You don't get to escape that easily
- FallInLove(pick(GLOB.player_list), M)
- M.reagents.remove_reagent(id, volume)
-
+
if (M.ckey == creatorID && creatorName == M.real_name)//If the creator drinks it, they fall in love randomly. If someone else drinks it, the creator falls in love with them.
if(M.has_status_effect(STATUS_EFFECT_INLOVE))//Can't be enthralled when enthralled, so to speak.
return