Merge remote-tracking branch 'upstream/master' into hopefullythefinalhardsync

2018-07-05 00:17:44 -04:00
parent cc628a905e e92379e360
commit ac6fddcfb3
18 changed files with 99 additions and 25 deletions
@@ -292,6 +292,7 @@
 				var/obj/item/I = i
 				I.forceMove(drop_location())
 				transfer_fingerprints_to(I)
+				debris -= I
 	qdel(src)
 	update_nearby_icons()