From 1d573c2ccc0f79f2c62b1f360363d342a9f45c7d Mon Sep 17 00:00:00 2001 From: GDN <96800819+GDNgit@users.noreply.github.com> Date: Wed, 4 Jan 2023 15:57:28 -0600 Subject: [PATCH] Fixes an OOO issue with flashes (#20010) --- code/game/objects/items/devices/flash.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 42cc2acc509..3c5374867f4 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -77,15 +77,15 @@ /obj/item/flash/proc/try_use_flash(mob/user = null) + if(broken) + return FALSE + if(cooldown >= world.time) to_chat(user, "Your [name] is still too hot to use again!") return FALSE cooldown = world.time + cooldown_duration flash_recharge(user) - if(broken) - return FALSE - playsound(loc, use_sound, 100, 1) flick("[initial(icon_state)]2", src) set_light(2, 1, COLOR_WHITE)