From cb05e053a52a0f1d77333128b84a9c25e1b5a3c3 Mon Sep 17 00:00:00 2001
From: Hatterhat <Hatterhat@users.noreply.github.com>
Date: Sun, 22 Aug 2021 16:08:49 -0500
Subject: [PATCH] helLO i forgot to change an icon name

---
 code/modules/mining/kinetic_crusher.dm |   3 ++-
 icons/obj/mining_vr.dmi                | Bin 11738 -> 11736 bytes
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/modules/mining/kinetic_crusher.dm b/code/modules/mining/kinetic_crusher.dm
index 8731ea062fe..498f0b16bb4 100644
--- a/code/modules/mining/kinetic_crusher.dm
+++ b/code/modules/mining/kinetic_crusher.dm
@@ -163,7 +163,8 @@
 		D.fire()
 		charged = FALSE
 		update_icon()
-		addtimer(CALLBACK(src, .proc/Recharge), charge_time * (user?.ConflictElementCount(CONFLICT_ELEMENT_CRUSHER) || 1))
+		addtimer(CALLBACK(src, .proc/Recharge), charge_time)
+		// * (user?.ConflictElementCount(CONFLICT_ELEMENT_CRUSHER) || 1 - tentatively commented out
 		return
 	if(proximity_flag && isliving(target))
 		detonate(target, user)
diff --git a/icons/obj/mining_vr.dmi b/icons/obj/mining_vr.dmi
index cc7d586e71ad62171d2ebd0b5eb394c776b81b83..0ff360ec708f69a7a8cec25f259303586ccea02e 100644
GIT binary patch
delta 159
zcmV;Q0AT;xTi9EWBmqH@B{>CXRf-UXkz+j_2O!KTLP^9YhkBI_F1l!jF;!*pdg??t
zP%X~m^^v_86B0ZZjYbcjvX{@Zwrjh#YtMo|k?1*17bg654U2YhCVwy<+{m8bh~LuS
zx8%+~59$XE#xM*#p;=uX6#<k*#!o%P@2K$KeOZV)v%R+vb-uCWRIav5x!kP97X&@X
NCkE?R=d*ADYAmzGNgMzG

delta 161
zcmV;S0ABytTiRQYBmqN_B{>D4Dn$s>kz+j_8z9UnLP^9YhkBC@F1l!jF;!*pcIrep
zP%X~m?UB706B;}hjYbcjvX{@Zwrjh#YcGOdk?1*3S0?;%4U2YhA%8F)+{m8bh~LxT
zN%F@&59$XE#xM*#qgh=Z6#<k*#!o%R@ABcK`RBqcM4j11EkvE~EIE~{?NTl`Yw-p2
P;>fF$@P2x;ZUJg6H0?^T