Merge branch 'master' into synctesting

This commit is contained in:
deathride58
2018-04-09 21:43:26 +00:00
committed by GitHub
43 changed files with 411 additions and 90 deletions
+1 -1
View File
@@ -22,7 +22,7 @@
/datum/component/swarming/proc/leave_swarm(atom/movable/AM)
GET_COMPONENT_FROM(other_swarm, /datum/component/swarming, AM)
if(!other_swarm || !other_swarm in swarm_members)
if(!other_swarm || !(other_swarm in swarm_members))
return
swarm_members -= other_swarm
if(!swarm_members.len)