From 57d58163d20eaa4e1841eb4ebd03c202d5929aa1 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 8 Oct 2017 01:04:36 -0500 Subject: [PATCH] [MIRROR] Overloaded leg actuators now consume at least 100 power per step (#3211) * Merge pull request #31389 from Y0SH1M4S73R/patch-1 Overloaded leg actuators now consume at least 100 power per step * Overloaded leg actuators now consume at least 100 power per step --- code/game/mecha/mecha.dm | 1 + code/game/mecha/mecha_actions.dm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 9b27e1e7c6..f06d355078 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -30,6 +30,7 @@ var/dir_in = 2//What direction will the mech face when entered/powered on? Defaults to South. var/step_energy_drain = 10 var/melee_energy_drain = 15 + var/overload_step_energy_drain_min = 100 max_integrity = 300 //max_integrity is base health var/deflect_chance = 10 //chance to deflect the incoming projectiles, hits, or lesser the effect of ex_act. armor = list(melee = 20, bullet = 10, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 100) diff --git a/code/game/mecha/mecha_actions.dm b/code/game/mecha/mecha_actions.dm index 4102ba914b..96576db154 100644 --- a/code/game/mecha/mecha_actions.dm +++ b/code/game/mecha/mecha_actions.dm @@ -203,7 +203,7 @@ chassis.leg_overload_mode = 1 chassis.bumpsmash = 1 chassis.step_in = min(1, round(chassis.step_in/2)) - chassis.step_energy_drain = chassis.step_energy_drain*chassis.leg_overload_coeff + chassis.step_energy_drain = max(chassis.overload_step_energy_drain_min,chassis.step_energy_drain*chassis.leg_overload_coeff) chassis.occupant_message("You enable leg actuators overload.") else chassis.leg_overload_mode = 0