Merge branch 'master' into void-but-for-real

2021-03-12 23:10:19 -08:00
parent 307bff2833 90badba5c2
commit 69d927e756
67 changed files with 424 additions and 210 deletions
@@ -334,7 +334,9 @@
 				I.moveToNullspace()
 			else
 				I.forceMove(newloc)
-		I.dropped(src, silent)
+		on_item_dropped(I)
+		if(I.dropped(src) == ITEM_RELOCATED_BY_DROPPED)
+			return FALSE
 	return TRUE

 //This is a SAFE proc. Use this instead of equip_to_slot()!