Merge remote-tracking branch 'citadel/master' into combat_rework

2020-05-05 17:38:43 -07:00
parent 3a843f6da4 56fe430a25
commit f034c7c536
1360 changed files with 51317 additions and 49624 deletions
@@ -333,8 +333,9 @@
 				I.moveToNullspace()
 			else
 				I.forceMove(newloc)
-		I.dropped(src)
 		on_item_dropped(I)
+		if(I.dropped(src) == ITEM_RELOCATED_BY_DROPPED)
+			return FALSE
 	return TRUE

 //Outdated but still in use apparently. This should at least be a human proc.