Testing hypnoquirk

code/datums/traits/negative.dm

@@ -326,7 +326,7 @@
 	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).
-/*
+
 /datum/quirk/hypno
 	name = "Hypnotherapy user"
 	desc = "You had hypnotherapy right before your shift, you're not sure it had any effects, though."
@@ -337,7 +337,7 @@
 
 /datum/quirk/hypno/add()
    //You caught me, it's not actually based off a trigger, stop spoiling the effect! Code diving ruins the magic!
-   addtimer(CALLBACK(src, /datum/quirk/hypno.proc/triggered, quirk_holder), rand(12000, 36000))//increase by 100, it's lower so I can test it.
+   addtimer(CALLBACK(src, /datum/quirk/hypno.proc/triggered, quirk_holder), rand(120, 360))//increase by 100, it's lower so I can test it.
 
 //DOES NOT give any indication when someone is triggered - this is intentional so people don't abuse it, you're supposed to get a random thing said to you as a mini objective.
 /datum/quirk/hypno/proc/triggered(quirk_holder)//I figured I might as well make a trait of code I added.
@@ -350,4 +350,3 @@
       to_chat(H, "<span class='notice'><i>[pick(seen)] accidentally sets off your implanted trigger, sending you into a hypnotic daze!</i></span>")
    H.apply_status_effect(/datum/status_effect/trance, 200, TRUE, FALSE)
    qdel(src)
- */

code/modules/mob/living/simple_animal/friendly/cat.dm

@@ -313,3 +313,11 @@
 	emote_hear = list("meows.", "mews.")
 	emote_see = list("looks at you eagerly for pets!", "wiggles enthusiastically.")
 	gold_core_spawnable = NO_SPAWN
+
+/mob/living/simple_animal/pet/cat/custom_cat/death(gibbed)
+	if (src.mind && !name == "White cat") //secret cat chem
+		icon_state = "custom_cat_dead"
+		Stun(1000)
+		canmove = 0
+	else
+		..()

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

@@ -399,15 +399,17 @@
 	H.forceMove(catto)
 	log_game("FERMICHEM: [H] ckey: [H.key] has been made into a cute catto.")
 	//Just to deal with rascally ghosts
-	ADD_TRAIT(catto, TRAIT_NODEATH, "catto")//doesn't work
-	catto.health = 1000 //To simulate fake death, while preventing ghosts escaping.
+	//ADD_TRAIT(catto, TRAIT_NODEATH, "catto")//doesn't work
+	//catto.health = 1000 //To simulate fake death, while preventing ghosts escaping.
 
 /datum/reagent/fermi/secretcatchem/on_mob_life(mob/living/carbon/H)
+	/*
 	if(catto.health <= 950) //So the dead can't ghost
 		catto.icon_state = "custom_cat_dead"
 		catto.Stun(1000)
 		catto.canmove = 0
-	else if(prob(5))
+	*/
+	if(prob(5))
 		playsound(get_turf(catto), 'modular_citadel/sound/voice/merowr.ogg', 50, 1, -1)
 		catto.say("lets out a meowrowr!*")
 	..()

modular_citadel/code/modules/reagents/objects/items.dm

@@ -34,7 +34,7 @@
 	if(!I)
 		user.put_in_active_hand(src)
 
-/obj/item/FermiChem/pHbooklet/MouseDrop(atom/over_object, mob/user)
+/obj/item/FermiChem/pHbooklet/MouseDrop(atom/over_object, mob/living/user)
     if(numberOfPages >= 1)
         var/obj/item/FermiChem/pHpaper/P = new /obj/item/FermiChem/pHpaper
         P.add_fingerprint(user)