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

2019-10-28 16:41:50 +01:00
parent 4aa1d55abb 935af3c21f
commit f54449bc7c
86 changed files with 1495 additions and 2318 deletions
@@ -43,6 +43,7 @@ SUBSYSTEM_DEF(throwing)
 	var/atom/movable/thrownthing
 	var/atom/target
 	var/turf/target_turf
+	var/target_zone
 	var/init_dir
 	var/maxrange
 	var/speed