cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13294 from Putnam3145/health-event-fix

Browse Source 
Added health exemption to a couple events that need it.
This commit is contained in:
silicons
2020-08-30 13:15:10 -07:00
committed by GitHub
parent 282f292347 177bfaefaf
commit 4bfa6d0a06
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/events/brain_trauma.dm
View File

@@ -14,7 +14,8 @@
continue continue
if(!H.getorgan(/obj/item/organ/brain)) // If only I had a brain if(!H.getorgan(/obj/item/organ/brain)) // If only I had a brain
continue continue
if(HAS_TRAIT(H,TRAIT_EXEMPT_HEALTH_EVENTS))
continue
traumatize(H) traumatize(H)
break break

2
code/modules/events/fake_virus.dm
View File

@@ -6,7 +6,7 @@
/datum/round_event/fake_virus/start() /datum/round_event/fake_virus/start()
var/list/fake_virus_victims = list() var/list/fake_virus_victims = list()
for(var/mob/living/carbon/human/H in shuffle(GLOB.player_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 continue
fake_virus_victims += H fake_virus_victims += H