Merge conflict fix

2020-05-13 12:37:18 +03:00
parent ccae3aebd5 78004a7b73
commit 5b7d9a9008
985 changed files with 295527 additions and 16121 deletions
@@ -57,7 +57,7 @@
 		return ..()

 /obj/structure/bigDelivery/relay_container_resist(mob/living/user, obj/O)
-	if(ismovableatom(loc))
+	if(ismovable(loc))
 		var/atom/movable/AM = loc //can't unwrap the wrapped container if it's inside something.
 		AM.relay_container_resist(user, O)
 		return