Merge branch 'master' into upstream-merge-37476

# Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
2018-05-20 23:11:16 -05:00
parent 1e207a7430 d421ad846a
commit ea9b3622fd
242 changed files with 3178 additions and 2201 deletions
@@ -9,7 +9,6 @@
 	viable_mobtypes = list(/mob/living/carbon/human)
 	permeability_mod = 1
 	severity = DISEASE_SEVERITY_BIOHAZARD
-	process_dead = TRUE

 /datum/disease/rhumba_beat/stage_act()
 	..()