cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-28 14:37:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes mech missile launchers

Browse Source
This commit is contained in:
Kyep
2017-07-13 00:14:45 -07:00
parent a22212e70a
commit d6d558b6f8
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/atoms_movable.dm
+7 -7
View File
@@ -138,12 +138,12 @@
return
/atom/movable/Bump(atom/A, yes) //the "yes" arg is to differentiate our Bump proc from byond's, without it every Bump() call would become a double Bump().
if(A && yes)
if(throwing)
throwing.hit_atom(A)
. = 1
if(!A || qdeleted(A))
return
if(A && yes)
if(throwing)
throwing.hit_atom(A)
. = 1
if(!A || qdeleted(A))
return
A.Bumped(src)
/atom/movable/proc/forceMove(atom/destination)
@@ -237,7 +237,7 @@
pulledby.stop_pulling()
// They are moving! Wouldn't it be cool if we calculated their momentum and added it to the throw?
if(thrower && thrower.last_move && thrower.client && thrower.client.move_delay >= world.time + world.tick_lag * 2)
if(thrower && thrower.last_move && !istype(thrower, /obj/mecha) && thrower.client && thrower.client.move_delay >= world.time + world.tick_lag * 2)
var/user_momentum = thrower.movement_delay()
if(!user_momentum) // no movement_delay, this means they move once per byond tick, let's calculate from that instead
user_momentum = world.tick_lag