mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +00:00
Fixed various medical events.
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
/datum/event/spontaneous_appendicitis/start()
|
/datum/event/spontaneous_appendicitis/start()
|
||||||
for(var/mob/living/carbon/human/H in shuffle(living_mob_list))
|
for(var/mob/living/carbon/human/H in shuffle(living_mob_list)) if(H.client && H.stat != DEAD)
|
||||||
var/foundAlready = 0 //don't infect someone that already has the virus
|
var/foundAlready = 0 //don't infect someone that already has the virus
|
||||||
for(var/datum/disease/D in H.viruses)
|
for(var/datum/disease/D in H.viruses)
|
||||||
foundAlready = 1
|
foundAlready = 1
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ datum/event/viral_infection/announce()
|
|||||||
datum/event/viral_infection/start()
|
datum/event/viral_infection/start()
|
||||||
var/list/candidates = list() //list of candidate keys
|
var/list/candidates = list() //list of candidate keys
|
||||||
for(var/mob/living/carbon/human/G in player_list)
|
for(var/mob/living/carbon/human/G in player_list)
|
||||||
if(!(G.mind && G.mind.current && G.mind.current.stat != DEAD))
|
if(G.client && G.stat != DEAD)
|
||||||
candidates += G
|
candidates += G
|
||||||
if(!candidates.len) return
|
if(!candidates.len) return
|
||||||
candidates = shuffle(candidates)//Incorporating Donkie's list shuffle
|
candidates = shuffle(candidates)//Incorporating Donkie's list shuffle
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ datum/event/viral_outbreak/announce()
|
|||||||
datum/event/viral_outbreak/start()
|
datum/event/viral_outbreak/start()
|
||||||
var/list/candidates = list() //list of candidate keys
|
var/list/candidates = list() //list of candidate keys
|
||||||
for(var/mob/living/carbon/human/G in player_list)
|
for(var/mob/living/carbon/human/G in player_list)
|
||||||
if(!(G.mind && G.mind.current && G.mind.current.stat != DEAD))
|
if(G.client && G.stat != DEAD)
|
||||||
candidates += G
|
candidates += G
|
||||||
if(!candidates.len) return
|
if(!candidates.len) return
|
||||||
candidates = shuffle(candidates)//Incorporating Donkie's list shuffle
|
candidates = shuffle(candidates)//Incorporating Donkie's list shuffle
|
||||||
|
|||||||
Reference in New Issue
Block a user