Merge pull request #11471 from Hatterhat/the-last-minute

helLO i forgot to change an icon name for crusher overlays please merge
2026-08-25 21:19:44 +01:00 · 2021-08-22 17:21:39 -04:00
parent bfac91465b cb05e053a5
commit d58afefd58
2 changed files with 2 additions and 1 deletions
@@ -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)