From a62dccb68d5baea65b73df6ee469394d2cab8434 Mon Sep 17 00:00:00 2001 From: Menshin Date: Tue, 26 Feb 2019 07:16:54 +0100 Subject: [PATCH] * Removed unusued variables (#42891) * Generators now stop processing when they need --- code/modules/power/port_gen.dm | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index 0b9c7d002b2..2bb013f65ed 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -1,4 +1,3 @@ - //Baseline portable generator. Has all the default handling. Not intended to be used on it's own (since it generates unlimited power). /obj/machinery/power/port_gen name = "portable generator" @@ -9,9 +8,8 @@ anchored = FALSE use_power = NO_POWER_USE - var/active = 0 + var/active = FALSE var/power_gen = 5000 - var/recent_fault = 0 var/power_output = 1 var/consumption = 0 var/base_icon = "portgen0" @@ -49,8 +47,9 @@ active = FALSE update_icon() soundloop.stop() - else if(HasFuel() && !crit_fail) + else if(HasFuel()) active = TRUE + START_PROCESSING(SSmachines, src) update_icon() soundloop.start() @@ -59,7 +58,7 @@ /obj/machinery/power/port_gen/process() if(active) - if(!HasFuel() || crit_fail || !anchored) + if(!HasFuel() || !anchored) TogglePower() return if(powernet) @@ -72,7 +71,6 @@ ..() to_chat(user, "It is[!active?"n't":""] running.") - ///////////////// // P.A.C.M.A.N // ///////////////// @@ -95,8 +93,8 @@ /obj/machinery/power/port_gen/pacman/Initialize() . = ..() - var/obj/sheet = new sheet_path(null) - sheet_name = sheet.name + var/obj/S = sheet_path + sheet_name = initial(S.name) /obj/machinery/power/port_gen/pacman/Destroy() DropFuel() @@ -120,8 +118,6 @@ to_chat(user, "The generator has [sheets] units of [sheet_name] fuel left, producing [DisplayPower(power_gen)] per cycle.") if(anchored) to_chat(user, "It is anchored to the ground.") - if(crit_fail) - to_chat(user, "The generator seems to have broken down.") if(in_range(user, src) || isobserver(user)) to_chat(user, "The status display reads: Fuel efficiency increased by [(consumption*100)-100]%.") @@ -164,12 +160,11 @@ if (current_heat > 300) overheat() qdel(src) - return /obj/machinery/power/port_gen/pacman/handleInactive() - - if (current_heat > 0) - current_heat = max(current_heat - 2, 0) + current_heat = max(current_heat - 2, 0) + if(current_heat == 0) + STOP_PROCESSING(SSmachines, src) /obj/machinery/power/port_gen/pacman/proc/overheat() explosion(src.loc, 2, 5, 2, -1) @@ -235,7 +230,7 @@ data["active"] = active data["sheet_name"] = capitalize(sheet_name) data["sheets"] = sheets - data["stack_percent"] = sheet_left * 100 + data["stack_percent"] = round(sheet_left * 100, 0.1) data["anchored"] = anchored data["connected"] = (powernet == null ? 0 : 1)