Merge branch 'master' into upstream-merge-34667

2018-01-21 11:48:51 -06:00
parent 097f2b2ddf 5e7710ee64
commit e3df465eba
42 changed files with 584 additions and 1186 deletions
@@ -341,7 +341,6 @@
 					var/ally = FALSE
 					for(var/F in faction)
 						if(F == "neutral") //slimes are neutral so other mobs not target them, but they can target neutral mobs
-							continue
 						if(F in L.faction)
 							ally = TRUE
 							break