shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(var/mob/living/master = parent) fix

Browse Source
This commit is contained in:
Fermi
2019-06-13 01:01:19 +01:00
parent 05067463c5
commit 463b4e19ec
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/datums/components/mood.dm
View File

@@ -167,7 +167,7 @@
HandleNutrition(owner)
/datum/component/mood/proc/setSanity(amount, minimum=SANITY_INSANE, maximum=SANITY_NEUTRAL)//I'm sure bunging this in here will have no negative repercussions.
var/mob/living/owner = parent
var/mob/living/master = parent
if(amount == sanity)
return
@@ -179,12 +179,11 @@
amount = sanity - 0.5
// Disturbed stops you from getting any more sane
if(owner.has_trait(TRAIT_UNSTABLE))
if(parent.has_trait(TRAIT_UNSTABLE))
sanity = min(amount,sanity)
else
sanity = amount
var/mob/living/master = parent
switch(sanity)
if(SANITY_INSANE to SANITY_CRAZY)
setInsanityEffect(MAJOR_INSANITY_PEN)