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

2019-12-06 19:05:50 +01:00
parent 91e628c73d 6484eea339
commit 72c093d14e
122 changed files with 553 additions and 437 deletions
@@ -131,7 +131,7 @@ All ShuttleMove procs go here
 	var/range = throw_force * 10
 	range = CEILING(rand(range-(range*0.1), range+(range*0.1)), 10)/10
 	var/speed = range/5
-	throw_at(target, range, speed)
+	safe_throw_at(target, range, speed)

 /////////////////////////////////////////////////////////////////////////////////////