Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685

2020-04-25 17:09:34 +02:00
parent fecf6cef2f 24971060bd
commit 94f014589d
342 changed files with 5021 additions and 2930 deletions
@@ -57,7 +57,7 @@
 		if(!(ismecha(M) && mech_sized))
 			return

-	if(ismovableatom(M))
+	if(ismovable(M))
 		if(GLOB.portals.len)
 			var/obj/effect/portal/P = pick(GLOB.portals)
 			if(P && isturf(P.loc))