why do I even bother

code/modules/goonchat/browserassets/css/browserOutput.css

@@ -393,6 +393,22 @@ h1.alert, h2.alert		{color: #000000;}
 .redtext				{color: #FF0000;	font-size: 24px;}
 .clown					{color: #FF69Bf;	font-size: 24px; font-family: "Comic Sans MS", cursive, sans-serif; font-weight: bold;}
 .his_grace				{color: #15D512;	font-family: "Courier New", cursive, sans-serif; font-style: italic;}
+.hypnophrase			{color: #202020;	font-weight: bold; animation: hypnocolor 1500ms infinite;}
+@keyframes hypnocolor {
+	0% { color: #202020; }
+	25% { color: #4b02ac; }
+	50% { color: #9f41f1; }
+	75% { color: #541c9c; }
+	100% { color: #7adbf3; }
+}
+
+.phobia			{color: #dd0000;	font-weight: bold; animation: phobia 750ms infinite;}
+@keyframes phobia {
+	0% { color: #f75a5a; }
+	50% { color: #dd0000; }
+	100% { color: #f75a5a; }
+}
+
 
 .icon 					{height: 1em;	width: auto;}
 

code/modules/mob/living/carbon/carbon.dm

@@ -910,3 +910,17 @@
 
 /mob/living/carbon/can_resist()
 	return bodyparts.len > 2 && ..()
+
+/mob/living/carbon/proc/hypnosis_vulnerable()//unused atm, but added in case
+	if(src.has_trait(TRAIT_MINDSHIELD))
+		return FALSE
+	if(hallucinating())
+		return TRUE
+	if(IsSleeping())
+		return TRUE
+	if(src.has_trait(TRAIT_DUMB))
+		return TRUE
+	GET_COMPONENT_FROM(mood, /datum/component/mood, src)
+	if(mood)
+		if(mood.sanity < SANITY_UNSTABLE)
+			return TRUE

code/modules/mob/living/carbon/say.dm

@@ -6,6 +6,7 @@
 	var/obj/item/organ/vocal_cords/Vc = getorganslot(ORGAN_SLOT_VOICE)
 	if(Vc)
 		if(Vc.name == "velvet chords" )
+			..()
 			velvetspeech(message, src)
 
 	var/obj/item/organ/tongue/T = getorganslot(ORGAN_SLOT_TONGUE)

code/modules/mob/living/say.dm

@@ -205,6 +205,11 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 	if(pressure < ONE_ATMOSPHERE*0.4) //Thin air, let's italicise the message
 		spans |= SPAN_ITALICS
 
+	//global say component
+	//SEND_GLOBAL_SIGNAL(COMSIG_LIVING_SAY, src, message)
+	//if(SEND_SIGNAL(COMSIG_LIVING_SAY,src,message) == COMPONENT_NO_SAY)
+	//	return
+
 	send_speech(message, message_range, src, bubble_type, spans, language, message_mode)
 
 	if(succumbed)
@@ -273,6 +278,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 			AM.Hear(eavesrendered, src, message_language, eavesdropping, , spans, message_mode)
 		else
 			AM.Hear(rendered, src, message_language, message, , spans, message_mode)
+	SEND_GLOBAL_SIGNAL(COMSIG_GLOB_LIVING_SAY_SPECIAL, src, message)
 
 	//speech bubble
 	var/list/speech_bubble_recipients = list()

code/modules/reagents/chemistry/holder.dm

@@ -49,6 +49,7 @@ im
 	var/atom/my_atom = null
 	var/chem_temp = 150
 	var/pH = REAGENT_NORMAL_PH//This is definately 7, right?
+	var/overallPurity = 1
 	var/last_tick = 1
 	var/addiction_tick = 1
 	var/list/datum/reagent/addiction_list = new/list()
@@ -355,17 +356,6 @@ im
 	var/reaction_occurred = 0 // checks if reaction, binary variable
 	var/continue_reacting = FALSE //Helps keep track what kind of reaction is occuring; standard or fermi.
 
-	//if(fermiIsReacting == TRUE)
-	/*	if (reactedVol >= targetVol && targetVol != 0)
-			STOP_PROCESSING(SSprocessing, src)
-			fermiIsReacting = FALSE
-			message_admins("FermiChem processing stopped in reaction handler")
-			reaction_occurred = 1
-			return
-		else
-			message_admins("FermiChem processing passed in reaction handler")
-			return
-	*/
 
 
 	do //What does do do in byond? It sounds very redundant? is it a while loop?
@@ -429,9 +419,6 @@ im
 				if (chem_temp > C.ExplodeTemp)//Check to see if reaction is too hot!
 					if (C.FermiExplode == TRUE)
 						//To be added!
-					else
-						FermiExplode()
-					//explode function!!
 
 				TODO: make plastic beakers melt at 447 kalvin, all others at ~850 and meta-material never break.
 				*/
@@ -472,11 +459,11 @@ im
 			var/datum/chemical_reaction/C = selected_reaction
 
 			if (C.FermiChem == TRUE && !continue_reacting)
-				message_admins("FermiChem Proc'd")
+				//message_admins("FermiChem Proc'd")
 
 				for(var/P in selected_reaction.results)
 					targetVol = cached_results[P]*multiplier
-					message_admins("FermiChem target volume: [targetVol]")
+					//message_admins("FermiChem target volume: [targetVol]")
 
 				if ((chem_temp > C.OptimalTempMin) && (pH > (C.OptimalpHMin - C.ReactpHLim)) && (pH < (C.OptimalpHMax + C.ReactpHLim)))//To prevent pointless reactions
 					//if (reactedVol < targetVol)
@@ -486,7 +473,7 @@ im
 						//reactedVol = FermiReact(selected_reaction, chem_temp, pH, multiplier, reactedVol, targetVol, cached_required_reagents, cached_results)
 						//selected_reaction.on_reaction(src, my_atom, multiplier)
 						START_PROCESSING(SSprocessing, src)
-						message_admins("FermiChem processing started")
+						//message_admins("FermiChem processing started")
 						selected_reaction.on_reaction(src, my_atom, multiplier)
 						fermiIsReacting = TRUE
 						fermiReactID = selected_reaction
@@ -496,7 +483,7 @@ im
 					//	STOP_PROCESSING(SSfastprocess, src)
 				else if	(chem_temp > C.ExplodeTemp)
 					var/datum/chemical_reaction/fermi/Ferm = selected_reaction
-					Ferm.FermiExplode(src, my_atom, total_volume, chem_temp, pH)
+					Ferm.FermiExplode(src, my_atom, volume = total_volume, temp = chem_temp, pH = pH)
 					return 0
 				else
 					return 0
@@ -554,13 +541,13 @@ im
 	var/multiplier = INFINITY
 	//var/special_react_result = C.check_special_react(src) Only add if I add in the fermi-izer chem
 
-	message_admins("updating targetVol from [targetVol]")
+	//message_admins("updating targetVol from [targetVol]")
 	for(var/B in cached_required_reagents) //
 		multiplier = min(multiplier, round(get_reagent_amount(B) / cached_required_reagents[B]))
 	if (multiplier == 0)
 		STOP_PROCESSING(SSprocessing, src)
 		fermiIsReacting = FALSE
-		message_admins("FermiChem STOPPED due to reactant removal! Reacted vol: [reactedVol] of [targetVol]")
+		//message_admins("FermiChem STOPPED due to reactant removal! Reacted vol: [reactedVol] of [targetVol]")
 		reactedVol = 0
 		targetVol = 0
 		handle_reactions()
@@ -572,20 +559,20 @@ im
 	for(var/P in cached_results)
 		targetVol = cached_results[P]*multiplier
 
-	message_admins("to [targetVol]")
+	//message_admins("to [targetVol]")
 
 	if (fermiIsReacting == FALSE)
-		message_admins("THIS SHOULD NEVER APPEAR!")
+		//message_admins("THIS SHOULD NEVER APPEAR!")
 		CRASH("Fermi has refused to stop reacting even though we asked her nicely.")
 
 	if (chem_temp > C.OptimalTempMin && fermiIsReacting == TRUE)//To prevent pointless reactions
 		if (reactedVol < targetVol)
 			reactedVol = FermiReact(fermiReactID, chem_temp, pH, reactedVol, targetVol, cached_required_reagents, cached_results, multiplier)
-			message_admins("FermiChem tick activated started, Reacted vol: [reactedVol] of [targetVol]")
+			//message_admins("FermiChem tick activated started, Reacted vol: [reactedVol] of [targetVol]")
 		else
 			STOP_PROCESSING(SSprocessing, src)
 			fermiIsReacting = FALSE
-			message_admins("FermiChem STOPPED due to volume reached! Reacted vol: [reactedVol] of [targetVol]")
+			//message_admins("FermiChem STOPPED due to volume reached! Reacted vol: [reactedVol] of [targetVol]")
 			reactedVol = 0
 			targetVol = 0
 			handle_reactions()
@@ -596,7 +583,7 @@ im
 			return
 	else
 		STOP_PROCESSING(SSprocessing, src)
-		message_admins("FermiChem STOPPED due to temperature! Reacted vol: [reactedVol] of [targetVol]")
+		//message_admins("FermiChem STOPPED due to temperature! Reacted vol: [reactedVol] of [targetVol]")
 		fermiIsReacting = FALSE
 		reactedVol = 0
 		targetVol = 0
@@ -619,28 +606,28 @@ im
 	var/purity = 1
 	//var/tempVol = totalVol
 
-	message_admins("Loop beginning")
+	//message_admins("Loop beginning")
 	//Begin Parse
 
-
+	//update_holder_purity(C)//updates holder's purity
 
 	//Check extremes first
 	if (cached_temp > C.ExplodeTemp)
 		//go to explode proc
-		message_admins("temperature is over limit: [C.ExplodeTemp] Current temperature: [cached_temp]")
+		//message_admins("temperature is over limit: [C.ExplodeTemp] Current temperature: [cached_temp]")
 		C.FermiExplode(src, my_atom, (reactedVol+targetVol), cached_temp, pH)
 
 	if (pH > 14)
 		pH = 14
-		message_admins("pH is lover limit, cur pH: [pH]")
+		//message_admins("pH is lover limit, cur pH: [pH]")
 	else if (pH < 0)
 		pH = 0
 		//Create chemical sludge eventually(for now just destroy the beaker I guess?)
 		//TODO Strong acids eat glass, make it so you NEED plastic beakers for superacids(for some reactions)
-		message_admins("pH is lover limit, cur pH: [pH]")
+		//message_admins("pH is lover limit, cur pH: [pH]")
 
 	if ((purity < C.PurityMin) && (!C.PurityMin == 0))//If purity is below the min, blow it up.
-		C.FermiExplode(src, (reactedVol+targetVol), cached_temp, pH, C)
+		C.FermiExplode(src, my_atom, (reactedVol+targetVol), cached_temp, pH)
 
 	//For now, purity is handled elsewhere
 
@@ -664,10 +651,10 @@ im
 		deltapH = 1
 	//This should never proc:
 	else
-		message_admins("Fermichem's pH broke!! Please let Fermis know!!")
+		//message_admins("Fermichem's pH broke!! Please let Fermis know!!")
 		WARNING("[my_atom] attempted to determine FermiChem pH for '[C.id]' which broke for some reason! ([usr])")
 	//TODO Add CatalystFact
-	message_admins("calculating pH factor(purity), pH: [pH], min: [C.OptimalpHMin]-[C.ReactpHLim], max: [C.OptimalpHMax]+[C.ReactpHLim], deltapH: [deltapH]")
+	//message_admins("calculating pH factor(purity), pH: [pH], min: [C.OptimalpHMin]-[C.ReactpHLim], max: [C.OptimalpHMax]+[C.ReactpHLim], deltapH: [deltapH]")
 
 	//Calculate DeltaT (Deviation of T from optimal)
 	if (cached_temp < C.OptimalTempMax && cached_temp >= C.OptimalTempMin)
@@ -676,61 +663,71 @@ im
 		deltaT = 1
 	else
 		deltaT = 0
-	message_admins("calculating temperature factor, min: [C.OptimalTempMin], max: [C.OptimalTempMax], Exponential: [C.CurveSharpT], deltaT: [deltaT]")
+	//message_admins("calculating temperature factor, min: [C.OptimalTempMin], max: [C.OptimalTempMax], Exponential: [C.CurveSharpT], deltaT: [deltaT]")
 
 
 	stepChemAmmount = deltaT //used to have multipler, now it doesn't
 	if (stepChemAmmount > C.RateUpLim)
 		stepChemAmmount = C.RateUpLim
 	else if (stepChemAmmount <= 0.01)
-		message_admins("stepChem underflow [stepChemAmmount]")
+		//message_admins("stepChem underflow [stepChemAmmount]")
 		stepChemAmmount = 0.01
 
 	if ((reactedVol + stepChemAmmount) > targetVol)
 		stepChemAmmount = targetVol - reactedVol
-		message_admins("target volume reached. Reaction should stop after this loop. stepChemAmmount: [stepChemAmmount] + reactedVol: [reactedVol] = targetVol [targetVol]")
+		//message_admins("target volume reached. Reaction should stop after this loop. stepChemAmmount: [stepChemAmmount] + reactedVol: [reactedVol] = targetVol [targetVol]")
 
 	//if (reactedVol > 0)
 	//	purity = ((purity * reactedVol) + (deltapH * stepChemAmmount)) /((reactedVol+ stepChemAmmount)) //This should add the purity to the product
 	//else
-	purity = deltapH//set purity equal to pH offset
+	purity = (deltapH)//set purity equal to pH offset
+
+	//TODO: Check overall beaker purity with proc
+	//Then adjust purity of result AND yeild ammount with said purity.
 
 	// End.
 	/*
 	for(var/B in cached_required_reagents) //
 		tempVol = min(reactedVol, round(get_reagent_amount(B) / cached_required_reagents[B]))//a simple one over the other? (Is this for multiplying end product? Useful for toxinsludge buildup)
 	*/
-	message_admins("cached_results: [cached_results], reactedVol: [reactedVol], stepChemAmmount [stepChemAmmount]")
+	//message_admins("cached_results: [cached_results], reactedVol: [reactedVol], stepChemAmmount [stepChemAmmount]")
 
 
 
 	for(var/B in cached_required_reagents)
-		message_admins("cached_required_reagents(B): [cached_required_reagents[B]], reactedVol: [reactedVol], base stepChemAmmount [stepChemAmmount]")
+		//message_admins("cached_required_reagents(B): [cached_required_reagents[B]], reactedVol: [reactedVol], base stepChemAmmount [stepChemAmmount]")
 		remove_reagent(B, (stepChemAmmount * cached_required_reagents[B]), safety = 1)//safety? removes reagents from beaker using remove function.
 
 	for(var/P in cached_results)//Not sure how this works, what is selected_reaction.results?
 		//reactedVol = max(reactedVol, 1) //this shouldnt happen ...
 		SSblackbox.record_feedback("tally", "chemical_reaction", cached_results[P]*stepChemAmmount, P)//log
-		add_reagent(P, cached_results[P]*stepChemAmmount, null, cached_temp, purity)//add reagent function!! I THINK I can do this:
+		add_reagent(P, cached_results[P]*(stepChemAmmount), null, cached_temp, purity)//add reagent function!! I THINK I can do this:
+	//Above should reduce yeild based on holder purity.
 
 	C.FermiCreate(src)
-	message_admins("purity: [purity], purity of beaker")
-	message_admins("Temp before change: [chem_temp], pH after change: [pH]")
+	//message_admins("purity: [purity], purity of beaker")
+	//message_admins("Temp before change: [chem_temp], pH after change: [pH]")
 	//Apply pH changes and thermal output of reaction to beaker
 	chem_temp = round(cached_temp + (C.ThermicConstant * stepChemAmmount)) //Why won't you update!!!
 	//adjust_thermal_energy((cached_temp*(C.ThermicConstant * stepChemAmmount *100)), 0, 1500) //(J, min_temp = 2.7, max_temp = 1000)
 	pH += (C.HIonRelease * stepChemAmmount)
-	message_admins("Temp after change: [chem_temp], pH after change: [pH]")
+	//message_admins("Temp after change: [chem_temp], pH after change: [pH]")
 
 
 	reactedVol = reactedVol + stepChemAmmount
 
 
 	return (reactedVol)
-/* MOVED TO REAGENTS.DM
-/datum/reagents/proc/FermiExplode()
-	return
-*/
+
+/datum/reagents/proc/update_holder_purity(var/datum/chemical_reaction/fermi/C)
+	var/list/cached_reagents = reagent_list
+	var/i
+	var/cachedPurity
+	//var/fermiChem
+	for(var/reagent in C.required_reagents)
+		cachedPurity += cached_reagents[reagent].purity
+		i++
+	overallPurity = cachedPurity/i
 
 /datum/reagents/proc/isolate_reagent(reagent)
 	var/list/cached_reagents = reagent_list
@@ -877,11 +874,8 @@ im
 			//WIP_TAG			//check my maths for purity calculations
 			//Add amount and equalize purity
 			R.volume += amount
-			//Maybe make a pH for reagents, not sure. it's hard to imagine where the H+ ions would go. I'm okay with this solution for now.
-			//R.purity = (our_pure_moles + their_pure_moles) / (R.volume)
-			message_admins("Purity before addition: [R.purity], vol:[R.volume]. Adding [other_purity], vol: [amount]")
 			R.purity = ((R.purity * R.volume) + (other_purity * amount)) /((R.volume + amount)) //This should add the purity to the product
-			message_admins("Purity after [R.purity]")
+
 
 			update_total()
 			if(my_atom)
@@ -918,7 +912,7 @@ im
 	if(!no_react)
 		handle_reactions()
 	if(isliving(my_atom))
-		R.on_mob_add(my_atom)
+		R.on_mob_add(my_atom, amount)
 	return TRUE
 
 

code/modules/spells/spell_types/shapeshift.dm

@@ -16,8 +16,9 @@
 	var/convert_damage = FALSE //If you want to convert the caster's health to the shift, and vice versa.
 	var/convert_damage_type = BRUTE //Since simplemobs don't have advanced damagetypes, what to convert damage back into.
 
-	var/shapeshift_type
+	var/shapeshift_type //Incase I ever get lucky enough to be a wizard. Also why can you be a dog but not a cat!! Racist
 	var/list/possible_shapes = list(/mob/living/simple_animal/mouse,\
+		/mob/living/simple_animal/pet/cat,\
 		/mob/living/simple_animal/pet/dog/corgi,\
 		/mob/living/simple_animal/hostile/carp/ranged/chaos,\
 		/mob/living/simple_animal/bot/ed209,\
@@ -167,4 +168,4 @@
 
 /datum/soullink/shapeshift/sharerDies(gibbed, mob/living/sharer)
 	if(source)
-		source.shapeDeath(gibbed)
+		source.shapeDeath(gibbed)

code/modules/surgery/organs/lungs.dm

@@ -87,6 +87,7 @@
 		M.Dizzy(1)
 
 /obj/item/organ/lungs/proc/check_breath(datum/gas_mixture/breath, mob/living/carbon/human/H)
+//TODO: add lung damage = less oxygen gains
 	if((H.status_flags & GODMODE))
 		return
 	if(H.has_trait(TRAIT_NOBREATH))
@@ -157,7 +158,7 @@
 		else
 			H.failed_last_breath = FALSE
 			if(H.health >= H.crit_threshold)
-				H.adjustOxyLoss(-5*((damage/maxHealth)/2)) //More damaged lungs = slower oxy rate up to a factor of half
+				H.adjustOxyLoss(-5) //More damaged lungs = slower oxy rate up to a factor of half
 			gas_breathed = breath_gases[/datum/gas/oxygen][MOLES]
 			H.clear_alert("not_enough_oxy")
 
@@ -186,7 +187,7 @@
 		else
 			H.failed_last_breath = FALSE
 			if(H.health >= H.crit_threshold)
-				H.adjustOxyLoss(-5*((damage/maxHealth)/2))
+				H.adjustOxyLoss(-5)
 			gas_breathed = breath_gases[/datum/gas/nitrogen][MOLES]
 			H.clear_alert("nitro")
 
@@ -223,7 +224,7 @@
 		else
 			H.failed_last_breath = FALSE
 			if(H.health >= H.crit_threshold)
-				H.adjustOxyLoss(-5*((damage/maxHealth)/2))
+				H.adjustOxyLoss(-5)
 			gas_breathed = breath_gases[/datum/gas/carbon_dioxide][MOLES]
 			H.clear_alert("not_enough_co2")
 
@@ -253,7 +254,7 @@
 		else
 			H.failed_last_breath = FALSE
 			if(H.health >= H.crit_threshold)
-				H.adjustOxyLoss(-5*((damage/maxHealth)/2))
+				H.adjustOxyLoss(-5)
 			gas_breathed = breath_gases[/datum/gas/plasma][MOLES]
 			H.clear_alert("not_enough_tox")
 

code/modules/surgery/organs/vocal_cords.dm

@@ -670,7 +670,7 @@
 ///////////FermiChem//////////////////
 //////////////////////////////////////
 //Removed span_list from input arguments. //mob/living/user
-/proc/velvetspeech(message, mob/living/user, base_multiplier = 1, include_speaker = FALSE, message_admins = TRUE, debug = TRUE)
+/proc/velvetspeech(message, mob/living/user, base_multiplier = 1, include_speaker = FALSE, message_admins = TRUE, debug = FALSE)
 	message_admins("Velvet speech proc'd on [user]")
 	var/cooldown = 0
 
@@ -703,7 +703,7 @@
 					if(istype(H.ears, /obj/item/clothing/ears/earmuffs))
 						continue
 				var/datum/status_effect/chem/enthrall/E = L.has_status_effect(/datum/status_effect/chem/enthrall)//Check to see if pet is on cooldown from last command
-				if (E.cooldown >= 0)//If they're on cooldown you can't give them more commands.
+				if (E.cooldown > 0)//If they're on cooldown you can't give them more commands.
 					continue
 				listeners += L
 	if(debug == TRUE)
@@ -812,7 +812,7 @@
 	//phase 3
 	var/static/regex/statecustom_words = regex("state triggers|state your triggers")
 	var/static/regex/custom_words = regex("new trigger|listen to me")
-	var/static/regex/custom_words_words = regex("speak|echo|shock|cum|kneel|strip|objective")//What a descriptive name!
+	var/static/regex/custom_words_words = regex("speak|echo|shock|cum|kneel|strip|trance")//What a descriptive name!
 	var/static/regex/objective_words = regex("new objective|obey this command|unable to resist|compulsed")
 	var/static/regex/heal_words = regex("live|heal|survive|mend|life|pets never die")
 	var/static/regex/stun_words = regex("stop|wait|stand still|hold on|halt")
@@ -827,6 +827,8 @@
 
 	//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
 	//ENTHRAL mixable
 	if(findtext(message, enthral_words))
@@ -876,7 +878,7 @@
 	if((findtext(message, saymyname_words)))
 		for(var/V in listeners)
 			var/mob/living/carbon/C = V
-			C.remove_trait(TRAIT_MUTE, TRAUMA_TRAIT)
+			C.remove_trait(TRAIT_MUTE, "enthrall")
 			addtimer(CALLBACK(C, /atom/movable/proc/say, "Master"), 5)//When I figure out how to do genedered names put them here
 
 	//WAKE UP
@@ -889,7 +891,7 @@
 				if(0)
 					E.phase = 3
 					E.status = null
-					addtimer(CALLBACK(L, /atom/movable/proc/to_chat, "<span class='warning'>The snapping of your Master's fingers brings you back to your enthralled state, obedient and ready to serve.</b></span>"), 5)
+					addtimer(CALLBACK(L, /proc/to_chat, "<span class='warning'>The snapping of your Master's fingers brings you back to your enthralled state, obedient and ready to serve.</b></span>"), 5)
 					//to_chat(L, )
 
 
@@ -900,7 +902,7 @@
 			var/datum/status_effect/chem/enthrall/E = C.has_status_effect(/datum/status_effect/chem/enthrall)
 			power_multiplier *= distancelist[get_dist(user, C)+1]
 			if (E.phase == 3) //If target is fully enthralled,
-				C.add_trait(TRAIT_MUTE, TRAUMA_TRAIT)
+				C.add_trait(TRAIT_MUTE, "enthrall")
 			else
 				C.silent += ((10 * power_multiplier) * E.phase)
 			E.cooldown += 3
@@ -933,11 +935,12 @@
 	else if((findtext(message, forget_words)))
 		for(var/mob/living/carbon/C in listeners)
 			var/datum/status_effect/chem/enthrall/E = C.has_status_effect(/datum/status_effect/chem/enthrall)
-			C.Sleeping(50)
 			to_chat(C, "<span class='warning'>You wake up, forgetting everything that just happened. You must've dozed off..? How embarassing!</b></span>")
+			C.Sleeping(50)
 			switch(E.phase)
 				if(1 to 2)
 					E.phase = -1
+					to_chat(C, "<span class='big warning'>You have no recollection of being enthralled by [E.master]</b></span>")
 				if(3)
 					E.phase = 0
 					E.cooldown = 0
@@ -951,22 +954,6 @@
 			E.cooldown += 3
 
 
-	//ORGASM
-	else if((findtext(message, orgasm_words)))
-		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(H.canbearoused && H.has_dna()) // probably a redundant check but for good measure
-				H.mob_climax(forced_climax=TRUE)
-				H.setArousalLoss(H.min_arousal)
-				E.resistanceTally = 0 //makes resistance 0, but resets arousal, resistance buildup is faster unaroused (massively so).
-				E.enthrallTally += power_multiplier
-			else
-				E.resistanceTally = 0 //makes resistance 0, but resets arousal, resistance buildup is faster unaroused (massively so).
-				E.enthrallTally += power_multiplier*1.1
-				to_chat(H, "<span class='warning'>Your Masters command whites out your mind in bliss!</b></span>")
-			E.cooldown += 6
-
 	//teir 2
 
 
@@ -976,7 +963,7 @@
 			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 > 1)
-				if(H.canbearoused && H.has_dna()) // probably a redundant check but for good measure
+				if(H.canbearoused) // probably a redundant check but for good measure
 					H.mob_climax(forced_climax=TRUE)
 					H.setArousalLoss(H.min_arousal)
 					E.resistanceTally = 0 //makes resistance 0, but resets arousal, resistance buildup is faster unaroused (massively so).
@@ -1007,7 +994,7 @@
 				if(2 to INFINITY)
 					var/mob/living/M = V
 					playsound(get_turf(M), pick('sound/effects/meow1.ogg', 'modular_citadel/sound/voice/nya.ogg'), 50, 1, -1)
-					H.emote(H,"lets out a nya!")
+					M.emote(M,"lets out a nya!")
 					E.cooldown += 1
 
 	//SLEEP
@@ -1072,10 +1059,10 @@
 		for(var/V in listeners)
 			var/speaktrigger = ""
 			var/mob/living/L = V
-			var/datum/status_effect/chem/enthrall/E = L.has_status_effect(/datum/status_effect/chem/enthrall)
-			if (!E.customTriggers == list())//i.e. if it's not empty
-				for (var/trigger in E.customTriggers)
-					speaktrigger = "[trigger]\n"
+			var/datum/status_effect/chem/enthrall/E = L.has_status_effect(/datum/status_effect/chem/enthrall)//i.e. if it's not empty
+			for (var/trigger in E.customTriggers)
+				speaktrigger = "[trigger]\n"
+			if(!speaktrigger == "")
 				L.say(speaktrigger)
 
 	//CUSTOM TRIGGERS
@@ -1085,7 +1072,7 @@
 			var/datum/status_effect/chem/enthrall/E = H.has_status_effect(/datum/status_effect/chem/enthrall)
 			if(E.phase == 3)
 				if (get_dist(user, H) > 1)//Requires user to be next to their pet.
-					to_chat(H, "<span class='warning'>You need to be next to your pet to give them a new trigger!</b></span>")
+					to_chat(user, "<span class='warning'>You need to be next to your pet to give them a new trigger!</b></span>")
 					return
 				else
 					if (E.mental_capacity >= 10)
@@ -1110,7 +1097,7 @@
 			var/datum/status_effect/chem/enthrall/E = H.has_status_effect(/datum/status_effect/chem/enthrall)
 			if(E.phase == 3)
 				if (get_dist(user, H) > 1)//Requires user to be next to their pet.
-					to_chat(H, "<span class='warning'>You need to be next to your pet to give them a new objective!</b></span>")
+					to_chat(user, "<span class='warning'>You need to be next to your pet to give them a new objective!</b></span>")
 					return
 				else
 					user.emote(user, "puts their hands upon [H.name]'s head and looks deep into their eyes, whispering something to them.'")
@@ -1310,7 +1297,8 @@
 			addtimer(CALLBACK(L, /mob/living/.proc/emote, "deathgasp"), 5 * i)
 			i++
 	*/
-
+	else
+		return
 	if(message_admins)
 		message_admins("[ADMIN_LOOKUPFLW(user)] has said '[log_message]' with a Velvet Voice, affecting [english_list(listeners)], with a power multiplier of [power_multiplier].")
 	log_game("[key_name(user)] has said '[log_message]' with a Velvet Voice, affecting [english_list(listeners)], with a power multiplier of [power_multiplier].")