cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11359 from VOREStation/Arokha/fixthrow

Browse Source 
Fix SSthrowing bug
This commit is contained in:
Aronai Sieyes
2021-08-07 17:33:17 -04:00
committed by Chompstation Bot
parent 51de772050
commit edba839e1c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/controllers/subsystems/throwing.dm
View File

@@ -168,17 +168,17 @@ SUBSYSTEM_DEF(throwing)
var/atom/A = thing var/atom/A = thing
if (A == target) if (A == target)
hit = TRUE hit = TRUE
thrownthing.throw_impact(A, src) thrownthing.throw_impact(A, speed)
break break
if (!hit) if (!hit)
thrownthing.throw_impact(get_turf(thrownthing), src) // we haven't hit something yet and we still must, let's hit the ground. thrownthing.throw_impact(get_turf(thrownthing), speed) // we haven't hit something yet and we still must, let's hit the ground.
if(ismob(thrownthing)) if(ismob(thrownthing))
var/mob/M = thrownthing var/mob/M = thrownthing
M.inertia_dir = init_dir M.inertia_dir = init_dir
if(t_target && !QDELETED(thrownthing)) if(t_target && !QDELETED(thrownthing))
thrownthing.throw_impact(t_target, src) thrownthing.throw_impact(t_target, speed)
if (callback) if (callback)
callback.Invoke() callback.Invoke()