Merge branch 'master' into upstream-merge-33498

2017-12-19 17:50:11 -06:00
parent e6aaad1921 a98178251d
commit 408182758f
284 changed files with 5080 additions and 1897 deletions
@@ -51,10 +51,10 @@
 		var/obj/item/ammo_casing/bullet = stored_ammo[i]
 		if(!bullet || !bullet.BB) // found a spent ammo
 			stored_ammo[i] = R
-			R.loc = src
+			R.forceMove(src)

 			if(bullet)
-				bullet.loc = get_turf(src.loc)
+				bullet.forceMove(drop_location())
 			return 1

 	return 0