From 88faca369ea2a5956aca5b79ce2bbfdd5c14e186 Mon Sep 17 00:00:00 2001 From: Kyep Date: Fri, 14 Jul 2017 02:34:24 -0700 Subject: [PATCH] New fix method: delete thrower=chassis arg --- code/game/atoms_movable.dm | 2 +- code/game/mecha/equipment/weapons/weapons.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index a7c5e6ef8c2..61eec85e9cc 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -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 && isliving(thrower) && thrower.client && thrower.client.move_delay >= world.time + world.tick_lag * 2) + if(thrower && thrower.last_move && 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 diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index 77bcc4c1966..ef4330800ed 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -348,7 +348,7 @@ if(heavy_missile) M.heavy_missile = 1 playsound(chassis, fire_sound, 50, 1) - M.throw_at(target, missile_range, missile_speed, chassis) + M.throw_at(target, missile_range, missile_speed) projectiles-- log_message("Fired from [name], targeting [target].") var/turf/T = get_turf(src)