From 2afd5f2cf5288cceb684d084df6ff05d0f3d94ea Mon Sep 17 00:00:00 2001 From: GunHog Date: Thu, 30 Mar 2017 15:39:43 -0500 Subject: [PATCH] Mech fixes - Fixes mech mining scanner being unclickable - Fixes mech action buttons breaking upon being regranted --- code/game/mecha/equipment/tools/mining_tools.dm | 1 + code/game/mecha/mecha_actions.dm | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/mecha/equipment/tools/mining_tools.dm b/code/game/mecha/equipment/tools/mining_tools.dm index 3ac2e54f7ed..61151f086f3 100644 --- a/code/game/mecha/equipment/tools/mining_tools.dm +++ b/code/game/mecha/equipment/tools/mining_tools.dm @@ -112,6 +112,7 @@ var/scanning = 0 /obj/item/mecha_parts/mecha_equipment/mining_scanner/New() + ..() START_PROCESSING(SSobj, src) /obj/item/mecha_parts/mecha_equipment/mining_scanner/attach(obj/mecha/M) diff --git a/code/game/mecha/mecha_actions.dm b/code/game/mecha/mecha_actions.dm index 3a3d979537c..65fa8b49b9e 100644 --- a/code/game/mecha/mecha_actions.dm +++ b/code/game/mecha/mecha_actions.dm @@ -25,7 +25,8 @@ var/obj/mecha/chassis /datum/action/innate/mecha/Grant(mob/living/L, obj/mecha/M) - chassis = M + if(M) + chassis = M ..() /datum/action/innate/mecha/Destroy()