From ee8ca86e3abf1c2f85731de5b7afe69d423693e1 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Sat, 2 Dec 2017 09:46:48 -0500
Subject: [PATCH] Merge pull request #33192 from Robustin/SavioroftheUniverse

Fixes terrible Flash logic
---
 code/modules/assembly/flash.dm | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/code/modules/assembly/flash.dm b/code/modules/assembly/flash.dm
index 3a36b4cdd0..a55016e2dd 100644
--- a/code/modules/assembly/flash.dm
+++ b/code/modules/assembly/flash.dm
@@ -71,15 +71,12 @@
 	return 1
 
 /obj/item/device/assembly/flash/proc/try_use_flash(mob/user = null)
-	flash_recharge(10)
-
 	if(crit_fail)
 		return 0
-
 	playsound(src.loc, 'sound/weapons/flash.ogg', 100, 1)
-	update_icon(1)
 	times_used++
-
+	flash_recharge(10)
+	update_icon(1)
 	if(user && !clown_check(user))
 		return 0
 
@@ -107,11 +104,9 @@
 /obj/item/device/assembly/flash/attack(mob/living/M, mob/user)
 	if(!try_use_flash(user))
 		return 0
-
 	if(iscarbon(M))
 		flash_carbon(M, user, 5, 1)
 		return 1
-
 	else if(issilicon(M))
 		var/mob/living/silicon/robot/R = M
 		add_logs(user, R, "flashed", src)