From 4b0f3e8b78ffbcd23e773b6fd67ce284dbca1039 Mon Sep 17 00:00:00 2001 From: ESwordTheCat Date: Fri, 7 Feb 2014 03:37:58 +0800 Subject: [PATCH] "Else" clause removal (/obj/machinery/portable_atmospherics/canister/update_icon()). --- code/game/machinery/atmoalter/canister.dm | 49 ++++++++++++++--------- 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index ca7bbd75be6..38b893e89d5 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -60,31 +60,42 @@ _color = "grey" can_label = 0 +/* + * return 0 (reached the proc code end) + * 1 (canister is destroyed) + */ /obj/machinery/portable_atmospherics/canister/update_icon() - src.overlays = 0 + var/L[0] + overlays = L - if (src.destroyed) - src.icon_state = text("[]-1", src._color) + if (destroyed) + icon_state = "[_color]-1" + return 1 - else - icon_state = "[_color]" - if(holding) - overlays += "can-open" + icon_state = "[_color]" - if(connected_port) - overlays += "can-connector" + L += "can-o3" - var/tank_pressure = air_contents.return_pressure() + var/tank_pressure = air_contents.return_pressure() - if (tank_pressure < 10) - overlays += image('icons/obj/atmos.dmi', "can-o0") - else if (tank_pressure < ONE_ATMOSPHERE) - overlays += image('icons/obj/atmos.dmi', "can-o1") - else if (tank_pressure < 15*ONE_ATMOSPHERE) - overlays += image('icons/obj/atmos.dmi', "can-o2") - else - overlays += image('icons/obj/atmos.dmi', "can-o3") - return + if (tank_pressure < 10) + L[L.len] = "can-o0" + else if (tank_pressure < ONE_ATMOSPHERE) + L[L.len] = "can-o1" + else if (tank_pressure < 15 * ONE_ATMOSPHERE) + L[L.len] = "can-o2" + + tank_pressure = null + + if (holding) + L += "can-open" + + if (connected_port) + L += "can-connector" + + overlays = L + L = null + return 0 /obj/machinery/portable_atmospherics/canister/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) if(exposed_temperature > temperature_resistance)