Merge branch 'master' into upstream-merge-29839

2017-09-11 18:03:51 -05:00
parent 7b157a9a6a 914cc38a2d
commit 935ae98f4a
92 changed files with 2479 additions and 2105 deletions
@@ -169,6 +169,7 @@
 	return

 /obj/singularity_pull(S, current_size)
+	..()
 	if(!anchored || current_size >= STAGE_FIVE)
 		step_towards(src,S)