Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Tastyfish
2012-01-06 16:41:52 -05:00
21 changed files with 8681 additions and 8475 deletions
+1 -2
View File
@@ -550,8 +550,7 @@ var/list/sacrificed = list()
var/list/mob/living/carbon/human/cultsinrange = list()
var/list/mob/living/carbon/human/victims = list()
for(var/mob/living/carbon/human/V in src.loc)
if(!(iscultist(V)))
victims += V
victims += V
for(var/mob/living/carbon/C in orange(1,src))
if(iscultist(C))
cultsinrange += C