Defines math, take 2

This commit is contained in:
Emmett Gaines
2017-12-17 10:02:43 -06:00
committed by CitadelStationBot
parent 220e1cd8cf
commit f875d4e176
180 changed files with 1250 additions and 644 deletions
+9
View File
@@ -18,7 +18,16 @@
announceWhen = rand(15, 30)
/datum/round_event/disease_outbreak/start()
<<<<<<< HEAD
if(!virus_type)
=======
var/advanced_virus = FALSE
max_severity = 3 + max(FLOOR((world.time - control.earliest_start)/6000, 1),0) //3 symptoms at 20 minutes, plus 1 per 10 minutes
if(prob(20 + (10 * max_severity)))
advanced_virus = TRUE
if(!virus_type && !advanced_virus)
>>>>>>> 25080ff... defines math (#33498)
virus_type = pick(/datum/disease/dnaspread, /datum/disease/advance/flu, /datum/disease/advance/cold, /datum/disease/brainrot, /datum/disease/magnitis)
for(var/mob/living/carbon/human/H in shuffle(GLOB.alive_mob_list))