Forgot to ctrl+s

code/datums/status_effects/debuffs.dm

@@ -544,9 +544,7 @@ datum/status_effect/pacify
 
 /datum/status_effect/trance/tick()
 	if(HAS_TRAIT(owner, "hypnotherapy"))
-		message_admins("has trait")
 		if(triggered == TRUE)
-			message_admins("triggered")
 			UnregisterSignal(owner, COMSIG_MOVABLE_HEAR)
 			RegisterSignal(owner, COMSIG_MOVABLE_HEAR, .proc/hypnotize)
 			ADD_TRAIT(owner, TRAIT_MUTE, "trance")
@@ -554,11 +552,8 @@ datum/status_effect/pacify
 				owner.add_client_colour(/datum/client_colour/monochrome)
 			to_chat(owner, "<span class='warning'>[pick("You feel your thoughts slow down...", "You suddenly feel extremely dizzy...", "You feel like you're in the middle of a dream...","You feel incredibly relaxed...")]</span>")
 			triggered = FALSE
-			duration = 300
 		else
-			message_admins("not triggered")
 			return
-	message_admins("stunning")
 	if(stun)
 		owner.Stun(60, TRUE, TRUE)
 	owner.dizziness = 20
@@ -567,7 +562,6 @@ datum/status_effect/pacify
 	if(!iscarbon(owner))
 		return FALSE
 	if(HAS_TRAIT(owner, "hypnotherapy"))
-		message_admins("stunning")
 		RegisterSignal(owner, COMSIG_MOVABLE_HEAR, .proc/listen)
 		return TRUE
 	alert_type = /obj/screen/alert/status_effect/trance
@@ -582,9 +576,7 @@ datum/status_effect/pacify
 /datum/status_effect/trance/on_creation(mob/living/new_owner, _duration, _stun = TRUE, source_quirk = FALSE)//hypnoquirk makes no visible message, prevents self antag messages, and places phrase below objectives.
 	duration = _duration
 	stun = _stun
-	var/mob/living/carbon/C = new_owner
-	if(source_quirk == FALSE && HAS_TRAIT(C, "hypnotherapy"))
-		message_admins("removing quirk")
+	if(source_quirk == FALSE && HAS_TRAIT(owner, "hypnotherapy"))
 		REMOVE_TRAIT(owner, "hypnotherapy", ROUNDSTART_TRAIT)
 	return ..()
 
@@ -597,19 +589,17 @@ datum/status_effect/pacify
 	to_chat(owner, "<span class='warning'>You snap out of your trance!</span>")
 
 /datum/status_effect/trance/proc/listen(datum/source, message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode)
-	message_admins("Trigger start")
 	to_chat(owner, "<span class='notice'><i>[speaker] accidentally sets off your implanted trigger, sending you into a hypnotic daze!</i></span>")
 	triggered = TRUE
 
 /datum/status_effect/trance/proc/hypnotize(datum/source, message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode)
-	message_admins("Hypnotize")
 	if(!owner.can_hear())
 		return
 	if(speaker == owner)
 		return
 	var/mob/living/carbon/C = owner
 	C.cure_trauma_type(/datum/brain_trauma/hypnosis, TRAUMA_RESILIENCE_SURGERY) //clear previous hypnosis
-	if(HAS_TRAIT(C, "hypnotherapy"))
+	if(source_quirk == TRUE)
 		addtimer(CALLBACK(C, /mob/living/carbon.proc/gain_trauma, /datum/brain_trauma/hypnosis, TRAUMA_RESILIENCE_SURGERY, raw_message, TRUE), 10)
 	else
 		addtimer(CALLBACK(C, /mob/living/carbon.proc/gain_trauma, /datum/brain_trauma/hypnosis, TRAUMA_RESILIENCE_SURGERY, raw_message), 10)

code/datums/traits/negative.dm

@@ -364,8 +364,8 @@
 	lose_text = "<span class='notice'>Your mind finally feels calm.</span>"
 	medical_record_text = "Patient's mind is in a vulnerable state, and cannot recover from traumatic events."
 
-//For reviewers: If you think it's a bad idea, feel free to remove it. Removal requested, commented out until the end of review (will remove when fixing merge conflicts).
-
+//For reviewers: Removal requested, commented out until the end of review (will remove when fixing merge conflicts). I'll probably rewrited
+/*Fixed quirk so that it's less impactful at the moment and doesn't override player autonomy (For the people in the discord who really want it.) See if that helps
 /datum/quirk/hypno
 	name = "Hypnotherapy user"
 	desc = "You had hypnotherapy right before your shift, you're not sure it had any effects, though."
@@ -382,3 +382,4 @@
 /datum/quirk/hypno/proc/triggered(quirk_holder)//I figured I might as well make a trait of code I added.
 	var/mob/living/carbon/human/H = quirk_holder
 	H.apply_status_effect(/datum/status_effect/trance, 1000, TRUE, TRUE)
+*/

modular_citadel/code/datums/status_effects/chems.dm

@@ -534,7 +534,6 @@
 		M.cure_trauma_type(/datum/brain_trauma/hypnosis, TRAUMA_RESILIENCE_SURGERY)
 		M.remove_status_effect(/datum/status_effect/trance)
 		tranceTime = 51
-		message_admins("test")
 	//..()
 
 //Remove all stuff