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

Merge pull request #6820 from Citadel-Station-13/upstream-merge-37938

Browse Source 
[MIRROR] Fixes some issues with pacifism by disabling intent auto-switch
This commit is contained in:
LetterJay
2018-05-21 08:28:47 -05:00
committed by GitHub
parent 1afdd03d78 09c0def840
commit 388c17664f
2 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/life.dm
-4
View File
@@ -63,10 +63,6 @@
else if(eye_blurry) //blurry eyes heal slowly
adjust_blurriness(-1)
if(has_trait(TRAIT_PACIFISM) && a_intent == INTENT_HARM)
to_chat(src, "<span class='notice'>You don't feel like harming anybody.</span>")
a_intent_change(INTENT_HELP)
if (getBrainLoss() >= 60 && !incapacitated(TRUE))
SendSignal(COMSIG_ADD_MOOD_EVENT, "brain_damage", /datum/mood_event/brain_damage)
if(prob(3))