Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265

2019-10-29 13:38:16 +01:00
parent b29fc9aa58 d0bf24c7cc
commit 5fcf5b1c5e
1118 changed files with 9437 additions and 5695 deletions
@@ -525,6 +525,8 @@
 	TT.diagonals_first = diagonals_first
 	TT.force = force
 	TT.callback = callback
+	if(!QDELETED(thrower))
+		TT.target_zone = thrower.zone_selected

 	var/dist_x = abs(target.x - src.x)
 	var/dist_y = abs(target.y - src.y)