Merge branch 'master' into Ghommie-cit721

2020-05-07 18:18:54 +02:00
parent c97f86ae5a 7c54da65a2
commit a273fc0fed
302 changed files with 279746 additions and 1386 deletions
@@ -20,6 +20,9 @@
 	if(!newloc.Enter(src, src.loc))
 		return

+	if (SEND_SIGNAL(src, COMSIG_MOVABLE_PRE_MOVE, newloc) & COMPONENT_MOVABLE_BLOCK_PRE_MOVE)
+		return
+
 	// Past this is the point of no return
 	var/atom/oldloc = loc
 	var/area/oldarea = get_area(oldloc)