More fixes.

modular_citadel/code/datums/status_effects/chems.dm

@@ -714,5 +714,4 @@
 	if(M.has_trait(TRAIT_MINDSHIELD))
 		deltaResist += 5//even faster!
 
-	message_admins("Enthrall processing for [M]: enthrallTally: [enthrallTally], resistanceTally: [resistanceTally], delta: [deltaResist]")
 	return

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

@@ -21,7 +21,7 @@
 	addiction_stage2_end = 30
 	addiction_stage3_end = 41
 	addiction_stage4_end = 44 //Incase it's too long
-	var/location_created
+	var/turf/location_created
 	var/turf/open/location_return = null
 	var/addictCyc3 = 0
 	var/mob/living/fermi_Tclone = null
@@ -36,9 +36,9 @@
 		to_chat(M, "<span class='userdanger'>You feel your wavefunction split!</span>")
 		if(purity > 0.8 && location_created) //Teleports you home if it's pure enough
 			log_game("FERMICHEM: [M] ckey: [M.key] returned to [location_created] using eigenstasium")
-			var/turf/open/creation = location_created
+			//var/turf/open/creation = location_created
 			do_sparks(5,FALSE,M)
-			do_teleport(M, creation, 0, asoundin = 'sound/effects/phasein.ogg')
+			do_teleport(M, location_created, 0, asoundin = 'sound/effects/phasein.ogg')
 			do_sparks(5,FALSE,M)
 	if(prob(20))
 		do_sparks(5,FALSE,M)

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

@@ -83,7 +83,7 @@
 	. = ..()
 	if(M.head)
 		var/obj/item/W = M.head
-		if(W == /obj/item/clothing/head/hattip)
+		if(istype(W, /obj/item/clothing/head/hattip))
 			qdel(W)
 		else
 			M.dropItemToGround(W, TRUE)
@@ -92,14 +92,15 @@
 
 
 /datum/reagent/fermi/hatmium/on_mob_life(mob/living/carbon/human/M)
-	if(!M.head == /obj/item/clothing/head/hattip)
+	if(!istype(M.head, /obj/item/clothing/head/hattip))
 		return ..()
+	var/hatArmor = 0
 	if(!overdosed)
-		var/hatArmor = purity
+		hatArmor = (purity/10)
 	else
-		var/hatArmor = - purity
+		hatArmor = - (purity/10)
 	var/obj/item/W = M.head
-	W.modifyAllRatings(hatArmor)
+	W.armor = W.armor.modifyAllRatings(hatArmor)
 	..()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -399,9 +400,14 @@
 	catto.color = "#[H.dna.features["mcolor"]]"
 	H.moveToNullspace()
 	log_game("FERMICHEM: [H] ckey: [H.key] has been made into a cute catto.")
+	//Just to deal with rascally ghosts
+	catto.add_trait(TRAIT_NODEATH, "catto")
 
 /datum/reagent/fermi/secretcatchem/on_mob_life(mob/living/carbon/H)
-	if(prob(5))
+	if(catto.health <= 50)
+		catto.icon_state = "custom_cat_dead"
+		catto.stun(1000)
+	else 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/clothes.dm

@@ -19,7 +19,7 @@
 		user.emote("me",1,"admires such a spiffy hat.",TRUE)
 	return ..()
 
-/obj/item/clothing/head/foilhat/MouseDrop(atom/over_object)
+/obj/item/clothing/head/hattip/MouseDrop(atom/over_object)
 	//You sure do love tipping your hat.
 	if(usr)
 		var/mob/living/carbon/C = usr

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)
+/obj/item/FermiChem/pHbooklet/MouseDrop(atom/over_object, mob/user)
     if(user.get_held_index_of_item(src))
         user.put_in_active_hand(src)
     else