cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-14 17:37:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revamps Apathy

Browse Source
This commit is contained in:
Archie
2021-06-06 19:24:29 -03:00
parent 1d9a8dfca8
commit 6527848b90
5 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/death.dm
-6
View File
@@ -19,12 +19,6 @@
if(SSticker.mode)
SSticker.mode.check_win() //Calls the rounds wincheck, mainly for wizard, malf, and changeling now
//watching someone die is traumatic
for(var/mob/living/carbon/human/H in oview(5, src))
SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "death", /datum/mood_event/deathsaw)
if(prob(10)) //10% chance to pump adrenaline into their body
H.jitteriness += 5
/mob/living/carbon/gib(no_brain, no_organs, no_bodyparts)
var/atom/Tsec = drop_location()
for(var/mob/M in src)
code/modules/mob/living/carbon/human/death.dm
+7
View File
@@ -52,6 +52,13 @@
if(is_devil(src))
INVOKE_ASYNC(is_devil(src), /datum/antagonist/devil.proc/beginResurrectionCheck, src)
//watching someone die is traumatic
for(var/mob/living/carbon/human/H in oview(5, src))
if(!HAS_TRAIT(H, TRAIT_APATHETIC))
SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "death", /datum/mood_event/deathsaw)
if(prob(10)) //10% chance to pump adrenaline into their body
H.jitteriness += 5
/mob/living/carbon/human/proc/makeSkeleton()
ADD_TRAIT(src, TRAIT_DISFIGURED, TRAIT_GENERIC)
set_species(/datum/species/skeleton)