Merge remote-tracking branch 'remotes/upstream/master' into OOPgularity2

Conflicts:
	code/modules/mob/living/carbon/human/human.dm

code/modules/power/singularity/singularity.dm

@@ -232,10 +232,7 @@
 		movement_dir = get_dir(src,target) //moves to a singulo beacon, if there is one
 
 	if(current_size >= 9)//The superlarge one does not care about things in its way
-		spawn(0)
-			step(src, movement_dir)
-		spawn(1)
-			step(src, movement_dir)
+		step(src, movement_dir)
 		return 1
 	else if(check_turfs_in(movement_dir))
 		last_failed_movement = 0//Reset this because we moved
@@ -380,4 +377,4 @@
 	var/dist = max((current_size - 2),1)
 	explosion(src.loc,(dist),(dist*2),(dist*4))
 	qdel(src)
-	return(gain)
+	return(gain)