From 177bfaefafaedb4ebe08175ef03cdde14452a355 Mon Sep 17 00:00:00 2001 From: Putnam Date: Sat, 29 Aug 2020 04:46:18 -0700 Subject: [PATCH 1/2] Added health exemption to a couple events that need it. --- code/modules/events/brain_trauma.dm | 3 ++- code/modules/events/fake_virus.dm | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/events/brain_trauma.dm b/code/modules/events/brain_trauma.dm index 3e8182a827..0a07e2a693 100644 --- a/code/modules/events/brain_trauma.dm +++ b/code/modules/events/brain_trauma.dm @@ -14,7 +14,8 @@ continue if(!H.getorgan(/obj/item/organ/brain)) // If only I had a brain continue - + if(HAS_TRAIT(H,TRAIT_EXEMPT_HEALTH_EVENTS)) + continue traumatize(H) break diff --git a/code/modules/events/fake_virus.dm b/code/modules/events/fake_virus.dm index 77520198e8..cebf1ed14b 100644 --- a/code/modules/events/fake_virus.dm +++ b/code/modules/events/fake_virus.dm @@ -6,7 +6,7 @@ /datum/round_event/fake_virus/start() var/list/fake_virus_victims = list() for(var/mob/living/carbon/human/H in shuffle(GLOB.player_list)) - if(!H.client || H.stat == DEAD || H.InCritical()) + if(!H.client || H.stat == DEAD || H.InCritical() || HAS_TRAIT(H,TRAIT_EXEMPT_HEALTH_EVENTS)) continue fake_virus_victims += H From 55fcd95ebab68a0ad2acbc59e028730fb8094d28 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 30 Aug 2020 15:15:13 -0500 Subject: [PATCH 2/2] Automatic changelog generation for PR #13294 [ci skip] --- html/changelogs/AutoChangeLog-pr-13294.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-13294.yml diff --git a/html/changelogs/AutoChangeLog-pr-13294.yml b/html/changelogs/AutoChangeLog-pr-13294.yml new file mode 100644 index 0000000000..e594a7350a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13294.yml @@ -0,0 +1,4 @@ +author: "Putnam3145" +delete-after: True +changes: + - bugfix: "Fixed a couple events having ghost roles eligible."