From 64591634182541f614c4cfe01ddbd041ac5aa36d Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Sat, 14 Mar 2020 15:37:52 +0100 Subject: [PATCH 1/2] Recharger fixes --- code/game/machinery/rechargestation.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 5907a27f70e..754c47820a8 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -13,6 +13,10 @@ var/recharge_speed_nutrition var/repairs +/obj/machinery/recharge_station/Destroy() + go_out() + . = ..() + /obj/machinery/recharge_station/New() ..() component_parts = list() @@ -140,8 +144,8 @@ var/mob/living/carbon/human/H = occupant if(H.get_int_organ(/obj/item/organ/internal/cell) && H.nutrition < 450) H.set_nutrition(min(H.nutrition + recharge_speed_nutrition, 450)) - if(repairs) - H.heal_overall_damage(repairs, repairs, TRUE, 0, 1) + if(repairs) + H.heal_overall_damage(repairs, repairs, TRUE, 0, 1) /obj/machinery/recharge_station/proc/go_out() if(!occupant) From ca8d9c7c95cf8273a8fded3fb720e38b50dcedb2 Mon Sep 17 00:00:00 2001 From: farie82 Date: Sat, 14 Mar 2020 19:49:21 +0100 Subject: [PATCH 2/2] Update rechargestation.dm --- code/game/machinery/rechargestation.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 754c47820a8..cf44098bb8c 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -15,7 +15,7 @@ /obj/machinery/recharge_station/Destroy() go_out() - . = ..() + return ..() /obj/machinery/recharge_station/New() ..()