Restricts Gibbingtons, Suicide, and Monkism syndromes

Restricts Gibbingtons, Suicide, and Monkism syndromes from even greater
diseases. Admins can still generate diseases with these syndromes
through secrets.

Fixes virus events potentially having people share the same virus datum.
This commit is contained in:
mwerezak
2015-01-10 03:08:42 -05:00
parent b0440b9c28
commit 1c5ca01dae
6 changed files with 31 additions and 28 deletions
+5 -4
View File
@@ -10,10 +10,10 @@ datum/event/viral_infection/setup()
for (var/i=0, i < num_diseases, i++)
var/datum/disease2/disease/D = new /datum/disease2/disease
var/greater = 0 //whether the disease is of the greater or lesser variety
var/strength = 1 //whether the disease is of the greater or lesser variety
if (severity >= EVENT_LEVEL_MAJOR && prob(50))
greater = 1
D.makerandom(greater)
strength = 2
D.makerandom(strength)
viruses += D
datum/event/viral_infection/announce()
@@ -32,6 +32,7 @@ datum/event/viral_infection/start()
severity = max(EVENT_LEVEL_MUNDANE, severity - 1)
var/actual_severity = severity * rand(1, 3)
while(actual_severity > 0 && candidates.len)
infect_mob(candidates[1], pick(viruses))
var/datum/disease2/disease/D = pick(viruses)
infect_mob(candidates[1], D.getcopy())
candidates.Remove(candidates[1])
actual_severity--