From be02287dca17ab4422b39edfc38d46da6297d888 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Sun, 24 May 2020 15:21:52 -0700
Subject: [PATCH] category + compile

---
 code/modules/keybindings/keybind/__defines.dm | 2 +-
 code/modules/mob/living/living_block.dm       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/modules/keybindings/keybind/__defines.dm b/code/modules/keybindings/keybind/__defines.dm
index c809022eac..93d033eea5 100644
--- a/code/modules/keybindings/keybind/__defines.dm
+++ b/code/modules/keybindings/keybind/__defines.dm
@@ -8,7 +8,7 @@
 #define CATEGORY_MISC "MISC"
 #define CATEGORY_MOVEMENT "MOVEMENT"
 #define CATEGORY_TARGETING "TARGETING"
-#define CATEGORY_COMBAT "combat"
+#define CATEGORY_COMBAT "COMBAT"
 
 #define WEIGHT_HIGHEST 0
 #define WEIGHT_ADMIN 10
diff --git a/code/modules/mob/living/living_block.dm b/code/modules/mob/living/living_block.dm
index e9f1ad70a2..2cef06c9f4 100644
--- a/code/modules/mob/living/living_block.dm
+++ b/code/modules/mob/living/living_block.dm
@@ -94,7 +94,7 @@
   * Considers a block return_list and calculates damage to use from that.
   */
 /proc/block_calculate_resultant_damage(damage, list/block_return)
-	if(!isnull(block_return[BLOCK_RETURN_SET_DAMAGE_TO))	// higher priority
+	if(!isnull(block_return[BLOCK_RETURN_SET_DAMAGE_TO]))	// higher priority
 		return block_return[BLOCK_RETURN_SET_DAMAGE_TO]
 	else if(!isnull(block_return[BLOCK_RETURN_MITIGATION_PERCENT]))
 		return damage * ((100 - block_return[BLOCK_RETURN_MITIGATION_PERCENT]) * 0.01)