Merge pull request #3208 from Citadel-Station-13/upstream-merge-31386

[MIRROR] Remove drop_item, drop_item_v, put_in_hands_or_del
2017-10-08 16:18:18 -04:00
parent 0f5443140d 6cb68e06e3
commit a35b84cc2e
154 changed files with 2047 additions and 2234 deletions
@@ -592,7 +592,7 @@ BLIND     // can't see anything
 				to_chat(user, "<span class='warning'>[src] already has an accessory.</span>")
 			return
 		else
-			if(user && !user.drop_item())
+			if(user && !user.temporarilyRemoveItemFromInventory(I))
 				return
 			if(!A.attach(src, user))
 				return