More bugs, to be fixed.

code/modules/surgery/organs/vocal_cords.dm

@@ -1126,7 +1126,6 @@
 					return
 				else
 					user.emote(user, 1, "puts their hands upon [H.name]'s head and looks deep into their eyes, whispering something to them.'")
-					user.SetStun(1000)//Hands are handy, so you have to stay still
 					H.SetStun(1000)
 					if (E.mental_capacity >= 10)
 						var/trigger = stripped_input(user, "Enter the trigger phrase", MAX_MESSAGE_LEN)
@@ -1146,7 +1145,6 @@
 							to_chat(user, "<span class='warning'>Your pet looks at you confused, it seems they don't understand that effect!</b></span>")
 					else
 						to_chat(user, "<span class='warning'>Your pet looks at you with a vacant blase expression, you don't think you can program anything else into them</b></span>")
-					user.SetStun(0)
 					H.SetStun(0)
 
 	//CUSTOM OBJECTIVE
@@ -1160,7 +1158,6 @@
 					return
 				else
 					user.emote(user, 1, "puts their hands upon [H.name]'s head and looks deep into their eyes, whispering something to them.'")
-					user.SetStun(1000)//So you can't run away!
 					H.SetStun(1000)
 					if (E.mental_capacity >= 250 || message == "objective")
 						var/datum/objective/brainwashing/objective = stripped_input(user, "Add an objective to give your pet.", MAX_MESSAGE_LEN)
@@ -1180,7 +1177,6 @@
 					//else if (E.mental_capacity >= 150)
 					else
 						to_chat(user, "<span class='warning'>Your pet looks at you with a vacant blasé expression, you don't think you can program anything else into them</b></span>")
-					user.SetStun(0)
 					H.SetStun(0)
 
 

modular_citadel/code/datums/status_effects/chems.dm

@@ -274,6 +274,8 @@
 			SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "enthrall")
 			owner.remove_status_effect(src)
 		if(0)// sleeper agent
+			if (cooldown > 0)
+				cooldown -= 1
 			return
 		if(1)//Initial enthrallment
 			if (enthrallTally > 150)
@@ -317,7 +319,7 @@
 				if(owner.lewd)
 					to_chat(owner, "<span class='hypnophrase'><i>[pick("It feels so good to listen to [enthrallGender].", "You can't keep your eyes off [enthrallGender].", "[enthrallGender]'s voice is making you feel so sleepy.",  "You feel so comfortable with [enthrallGender]", "[enthrallGender] is so dominant, it feels right to obey them.")].</i></span>")
 		if (3)//fully entranced
-			if ((resistanceTally >= 200 && withdrawalTick >= 150) || (M.has_trait(TRAIT_MINDSHIELD) && resistanceTally >= 100))
+			if ((resistanceTally >= 200 && withdrawalTick >= 150) || (M.has_trait(TRAIT_MINDSHIELD) && (resistanceTally >= 100)))
 				enthrallTally = 0
 				phase -= 1
 				resistanceTally = 0

modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm

@@ -1095,7 +1095,8 @@ And as stated earlier, this chem is hard to make, and is punishing on failure. Y
 	var/creatorName
 	var/mob/living/creator
 	pH = 10
-	OnMobMergeCheck = TRUE //Procs on_mob_add when merging into a human
+	DoNotSplit = TRUE
+	//OnMobMergeCheck = TRUE //Procs on_mob_add when merging into a human
 
 /datum/reagent/fermi/enthrall/test
 	name = "MKUltraTest"
@@ -1448,7 +1449,7 @@ And as stated earlier, this chem is hard to make, and is punishing on failure. Y
 	N.regen_rate = -0.25//This seems really high
 	..()
 
-/datum/reagent/fermi/naninte_b_gone/overdose_start(mob/living/carbon/C)
+/datum/reagent/fermi/naninte_b_gone/overdose_process(mob/living/carbon/C)
 	//var/component/nanites/N = M.GetComponent(/datum/component/nanites)
 	GET_COMPONENT_FROM(N, /datum/component/nanites, C)
 	if(isnull(N))

modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm

@@ -14,7 +14,7 @@
 //Called when temperature is above a certain threshold
 //....Is this too much?
 /datum/chemical_reaction/fermi/proc/FermiExplode(datum/reagents, var/atom/my_atom, volume, temp, pH, Exploding = FALSE) //You can get holder by reagents.holder WHY DID I LEARN THIS NOW???
-	//var/Svol = volume
+	message_admins("Fermi explosion at [T], with a temperature of [temp], pH of [pH], Impurity tot of [ImpureTot], containing [my_atom.reagents.reagent_list]")
 	if (Exploding == TRUE)
 		return
 	if(!pH)//Dunno how things got here without a pH.
@@ -55,17 +55,16 @@
 					new /obj/effect/hotspot(turf)
 					//volume /= 5
 
-	if(!ImpureTot == 0) //If impure, v.small emp
-		ImpureTot *= volume
-		empulse(T, volume/10, ImpureTot/10, 1)
-
 	if (pH > 10) //if alkaline, small explosion.
 		var/datum/effect_system/reagents_explosion/e = new()
 		e.set_up(round((volume/30)*(pH-9)), T, 0, 0)
 		e.start()
 		pHmod = 1.5
 
-	message_admins("Fermi explosion at [T], with a temperature of [temp], pH of [pH], Impurity tot of [ImpureTot], containing [my_atom.reagents.reagent_list]")
+	if(!ImpureTot == 0) //If impure, v.small emp
+		ImpureTot *= volume
+		empulse(T, volume/10, ImpureTot/10, 1)
+
 	my_atom.reagents.clear_reagents()
 	return