[s] Hallucinations 4.0

code/datums/traits/negative.dm

@@ -231,6 +231,7 @@
 	if(prob(2)) //we'll all be mad soon enough
 		madness()
 
+<<<<<<< HEAD
 /datum/trait/insanity/proc/madness(mad_fools)
 	set waitfor = FALSE
 	if(!mad_fools)
@@ -240,6 +241,10 @@
 		new hallucination_type (trait_holder, FALSE)
 	else
 		trait_holder.hallucination += rand(10, 50)
+=======
+/datum/quirk/insanity/proc/madness()
+	quirk_holder.hallucination += rand(10, 25)
+>>>>>>> aa782ff... [s] Hallucinations 4.0 (#37423)
 
 /datum/trait/insanity/post_add() //I don't /think/ we'll need this but for newbies who think "roleplay as insane" = "license to kill" it's probably a good thing to have
 	if(!trait_holder.mind || trait_holder.mind.special_role)