From bfee1c13ff1d56ebbabfdd80b11801efe5b28e0a Mon Sep 17 00:00:00 2001
From: Thalpy <48600475+ThalpySci@users.noreply.github.com>
Date: Tue, 1 Oct 2019 20:58:31 +0100
Subject: [PATCH] Bhijin's requests.

---
 code/modules/mob/living/simple_animal/astral.dm        |  2 +-
 code/modules/surgery/organs/vocal_cords.dm             |  2 +-
 modular_citadel/code/datums/status_effects/chems.dm    | 10 +++++++++-
 .../reagents/chemistry/reagents/fermi_reagents.dm      |  2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/code/modules/mob/living/simple_animal/astral.dm b/code/modules/mob/living/simple_animal/astral.dm
index 1ff8df5d73..2aafedb149 100644
--- a/code/modules/mob/living/simple_animal/astral.dm
+++ b/code/modules/mob/living/simple_animal/astral.dm
@@ -62,4 +62,4 @@
 /mob/living/simple_animal/astral/Life()
 	if(!mind)
 		qdel(src)
-	..()
+	. = ..()
diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm
index 8548fad47e..0a4631b70a 100644
--- a/code/modules/surgery/organs/vocal_cords.dm
+++ b/code/modules/surgery/organs/vocal_cords.dm
@@ -1082,7 +1082,7 @@
 			switch(E.phase)
 				if(1 to 2)
 					E.phase = -1
-					to_chat(C, "<span class='big warning'>You suddenly forget [E.master]'s modulus operandi and their political affiliations!</b></span>")
+					to_chat(C, "<span class='big warning'>You have no recollection of being enthralled by [E.master]!</b></span>")
 					to_chat(user, "<span class='notice'><i>You revert [C] back to their state before enthrallment.</i></span>")
 				if(3)
 					E.phase = 0
diff --git a/modular_citadel/code/datums/status_effects/chems.dm b/modular_citadel/code/datums/status_effects/chems.dm
index e28f6fc5c0..42f9752019 100644
--- a/modular_citadel/code/datums/status_effects/chems.dm
+++ b/modular_citadel/code/datums/status_effects/chems.dm
@@ -741,7 +741,15 @@
 		deltaResist *= 1.25
 	if (owner.reagents.has_reagent("neurine"))
 		deltaResist *= 1.5
-
+	if (!HAS_TRAIT(owner, TRAIT_CROCRIN_IMMUNE) && M.canbearoused && owner.client?.prefs.lewdchem)
+		if (owner.reagents.has_reagent("anaphro"))
+			deltaResist *= 1.5
+		if (owner.reagents.has_reagent("anaphro+"))
+			deltaResist *= 2
+		if (owner.reagents.has_reagent("aphro"))
+			deltaResist *= 0.75
+		if (owner.reagents.has_reagent("aphro+"))
+			deltaResist *= 0.5
 	//Antag resistance
 	//cultists are already brainwashed by their god
 	if(iscultist(owner))
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
index 2b0f86b156..784cef17b8 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
@@ -57,7 +57,7 @@
 		hatArmor = (cached_purity/10)
 	else
 		hatArmor = (cached_purity/10)
-	if(hatArmor > 100)
+	if(hatArmor > 90)
 		return ..()
 	var/obj/item/W = M.head
 	W.armor = W.armor.modifyAllRatings(hatArmor)