From c3ac34158afa113b28f1af9a4c2c8c9e6f2646be Mon Sep 17 00:00:00 2001
From: Fermi <phasondragon@googlemail.com>
Date: Mon, 8 Jul 2019 19:51:10 +0100
Subject: [PATCH] Fixed shock command.

---
 code/modules/surgery/organs/vocal_cords.dm      | 10 ++++------
 .../code/datums/status_effects/chems.dm         | 17 +++++++++--------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm
index ef1658265a..a05a77d64a 100644
--- a/code/modules/surgery/organs/vocal_cords.dm
+++ b/code/modules/surgery/organs/vocal_cords.dm
@@ -654,7 +654,7 @@
 //////////////////////////////////////
 ///////////FermiChem//////////////////
 //////////////////////////////////////
-//Removed span_list from input arguments. //mob/living/user
+//Removed span_list from input arguments.
 /proc/velvetspeech(message, mob/living/user, base_multiplier = 1, include_speaker = TRUE, message_admins = FALSE, debug = FALSE)
 
 	if(!user || !user.can_speak() || user.stat)
@@ -706,8 +706,8 @@
 	else if (is_devil(user))//The devil is supposed to be seductive, right?
 		power_multiplier *= 1.2
 
-	//range = 0.5 - 4.2~
-	//most cases = 1-2
+	//range = 0.5 - 1.4~
+	//most cases = 1
 
 	//Try to check if the speaker specified a name or a job to focus on
 	var/list/specific_listeners = list()
@@ -791,8 +791,6 @@
 
 	var/distancelist = list(2,2,1.5,1.3,1.15,1,0.8,0.6,0.5,0.25)
 
-	//enthral_words, reward_words, silence_words attract_words punish_words desire_words resist_words forget_words
-
 	//CALLBACKS ARE USED FOR MESSAGES BECAUSE SAY IS HANDLED AFTER THE PROCESSING.
 
 	//Tier 1
@@ -1326,7 +1324,7 @@
 		for(var/V in listeners)
 			var/mob/living/carbon/human/H = V
 			var/datum/status_effect/chem/enthrall/E = H.has_status_effect(/datum/status_effect/chem/enthrall)
-			if(E.phase == 3)
+			if(E.phase == 3 && H.client?.prefs.lewdchem)
 				var/instill = stripped_input(user, "Instill an emotion in your [(user.client?.prefs.lewdchem?"Your pet":"listener")].", MAX_MESSAGE_LEN)
 				var/customSpan = list("Notice", "Warning", "Hypnophrase", "Love", "Velvet")
 				to_chat(H, "<span class='[customSpan]'><i>[instill]</i></span>")
diff --git a/modular_citadel/code/datums/status_effects/chems.dm b/modular_citadel/code/datums/status_effects/chems.dm
index 23ae8e54ea..c46f8f0197 100644
--- a/modular_citadel/code/datums/status_effects/chems.dm
+++ b/modular_citadel/code/datums/status_effects/chems.dm
@@ -246,7 +246,7 @@
 	var/mob/living/carbon/M = owner
 
 	//chem calculations
-	if(!owner.reagents.has_reagent("enthrall") || !owner.reagents.has_reagent("enthrallTest"))
+	if(!owner.reagents.has_reagent("enthrall") && !owner.reagents.has_reagent("enthrallTest"))
 		if (phase < 3 && phase != 0)
 			deltaResist += 3//If you've no chem, then you break out quickly
 			if(prob(10))
@@ -258,7 +258,7 @@
 			mental_capacity += 10
 
 	//mindshield check
-	if(HAS_TRAIT(M, TRAIT_MINDSHIELD))//If you manage to enrapture a head, wow, GJ. (resisting gives a bigger bonus with a mindshield)
+	if(HAS_TRAIT(M, TRAIT_MINDSHIELD))//If you manage to enrapture a head, wow, GJ. (resisting gives a bigger bonus with a mindshield) From what I can tell, this isn't possible.
 		resistanceTally += 2
 		if(prob(10))
 			to_chat(owner, "<span class='notice'><i>You feel lucidity returning to your mind as the mindshield buzzes, attempting to return your brain to normal function.</i></span>")
@@ -513,7 +513,7 @@
 			//adrenals?
 
 	//customEcho
-	if(customEcho && withdrawal == FALSE)
+	if(customEcho && withdrawal == FALSE && owner.client?.prefs.lewdchem)
 		if(prob(5))
 			if(!customSpan) //just in case!
 				customSpan = "notice"
@@ -590,12 +590,13 @@
 
 			//Shocking truth!
 			else if (lowertext(customTriggers[trigger]) == "shock")
-				if (C.canbearoused)
-					C.electrocute_act(10, src, 1, FALSE, FALSE, FALSE, TRUE)//I've no idea how strong this is
+				if (C.canbearoused && C.client?.prefs.lewdchem)
 					C.adjustArousalLoss(5)
-					to_chat(owner, "<span class='warning'><i>Your muscles seize up, then start spasming wildy!</i></span>")
-				else
-					C.electrocute_act(15, src, 1, FALSE, FALSE, FALSE, TRUE)//To make up for the lack of effect
+				C.jitteriness += 100
+				C.stuttering += 25
+				C.Knockdown(60)
+				C.Stun(60)
+				to_chat(owner, "<span class='warning'><i>Your muscles seize up, then start spasming wildy!</i></span>")
 
 			//wah intensifies wah-rks
 			else if (lowertext(customTriggers[trigger]) == "cum")//aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa