From e164668c5e6e55e31d1eef207b46315c54984093 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sat, 12 May 2018 21:37:26 -0500 Subject: [PATCH] Update negative.dm --- code/datums/traits/negative.dm | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index ffb25ce987..510a06819f 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -230,21 +230,9 @@ return 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) - mad_fools = prob(20) - if(mad_fools) - var/hallucination_type = pick(subtypesof(/datum/hallucination/rds)) - 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)