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
@@ -325,7 +325,7 @@
 	else if(cover_open && magazine)
 		//drop the mag
 		magazine.update_icon()
-		magazine.loc = get_turf(src.loc)
+		magazine.forceMove(drop_location())
 		user.put_in_hands(magazine)
 		magazine = null
 		update_icon()