Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829

2018-01-01 14:09:07 -06:00
parent 32291c247b c2fb9ed729
commit 30d4b25aee
180 changed files with 2769 additions and 4332 deletions
@@ -16,8 +16,7 @@

 	var/datum/disease/D = new /datum/disease/transformation/jungle_fever/monkeymode
 	if(!owner.current.HasDisease(D))
-		D.affected_mob = owner
-		owner.current.viruses += D
+		owner.current.AddDisease(D)
 	else
 		QDEL_NULL(D)