From 95cd7c657138ad5d417288eff99a14eacfeeb681 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Thu, 23 Jul 2020 11:46:46 -0700
Subject: [PATCH] fix

---
 code/_onclick/click.dm                         | 3 ++-
 code/_onclick/hud/screen_objects/clickdelay.dm | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index df7cdbaae8..ab93cc3cd6 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -316,8 +316,9 @@
 		var/mob/living/carbon/human/H = user
 		H.dna.species.grab(H, src, H.mind.martial_art)
 		H.DelayNextAction(CLICK_CD_MELEE)
+		return TRUE
 	else
-		..()
+		return ..()
 /*
 	Alt click
 	Unused except for AI
diff --git a/code/_onclick/hud/screen_objects/clickdelay.dm b/code/_onclick/hud/screen_objects/clickdelay.dm
index 7b546b9ee2..b17978b1ba 100644
--- a/code/_onclick/hud/screen_objects/clickdelay.dm
+++ b/code/_onclick/hud/screen_objects/clickdelay.dm
@@ -47,5 +47,5 @@
 	if(left < 0 || diff < 0)
 		icon_state = "prog_bar_100"
 		return FALSE
-	icon_state = "prog_bar[round(clamp(((diff - left)/diff) * 100, 0, 100), 5)]"
+	icon_state = "prog_bar_[round(clamp(((diff - left)/diff) * 100, 0, 100), 5)]"
 	return TRUE