From ea9696341d3b01d844c4c9ab8a0b82e0f3f5bfe7 Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Wed, 8 Jul 2020 10:27:04 -0400 Subject: [PATCH] fixes laserpointer runtime (#52074) --- code/game/objects/items/devices/laserpointer.dm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index 3c3c899e749..245a044286c 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -15,7 +15,7 @@ var/energy = 10 var/max_energy = 10 var/effectchance = 30 - var/recharging = 0 + var/recharging = FALSE var/recharge_locked = FALSE var/obj/item/stock_parts/micro_laser/diode //used for upgrading! @@ -178,7 +178,7 @@ energy -= 1 if(energy <= max_energy) if(!recharging) - recharging = 1 + recharging = TRUE START_PROCESSING(SSobj, src) if(energy <= 0) to_chat(user, "[src]'s battery is overused, it needs time to recharge!") @@ -188,10 +188,13 @@ icon_state = "pointer" /obj/item/laser_pointer/process() + if(!diode) + recharging = FALSE + return PROCESS_KILL if(prob(20 + diode.rating*20 - recharge_locked*2)) //t1 is 20, 2 40 energy += 1 if(energy >= max_energy) energy = max_energy - recharging = 0 + recharging = FALSE recharge_locked = FALSE - ..() + return ..()