Merge pull request #6324 from Citadel-Station-13/upstream-merge-37059

[MIRROR] Makes spacemove check location.
2018-04-09 16:38:57 -05:00
parent 8433e7b154 41bca1cd3c
commit 859cf53869
1 changed files with 3 additions and 0 deletions
@@ -381,6 +381,9 @@

 	if(throwing)
 		return 1
+	
+	if(!isturf(loc))
+		return 1

 	if(locate(/obj/structure/lattice) in range(1, get_turf(src))) //Not realistic but makes pushing things in space easier
 		return 1