Merge pull request #1342 from Citadel-Station-13/upstream-merge-27932

[MIRROR] Attempts to add items to a storage container beyond its slots limit will obtain a failure message again.
2017-06-02 22:47:01 -05:00
parent c36ca8a434 6e563e7a53
commit 7b346b6241
1 changed files with 2 additions and 3 deletions
@@ -405,10 +405,9 @@
 	if(iscyborg(user))
 		return	//Robots can't interact with storage items.

-	if(contents.len >= storage_slots) //don't use items on the backpack if they don't fit
-		return 1
-
 	if(!can_be_inserted(W, 0 , user))
+		if(contents.len >= storage_slots) //don't use items on the backpack if they don't fit
+			return 1
 		return 0

 	handle_item_insertion(W, 0 , user)