From 203949673970673a2fb3688b743832401567d08a Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Tue, 30 Jun 2020 03:05:15 -0700
Subject: [PATCH] groan

---
 code/game/objects/items/shields.dm             | 2 +-
 code/modules/mob/living/living_active_block.dm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm
index aefa5d3cc8..21a26f7cd8 100644
--- a/code/game/objects/items/shields.dm
+++ b/code/game/objects/items/shields.dm
@@ -386,7 +386,7 @@ obj/item/shield/riot/bullet_proof
 	max_integrity = 100
 	obj_integrity = 100
 	can_shatter = FALSE
-	item_flags = SLOWS_WHILE_IN_HAND
+	item_flags = SLOWS_WHILE_IN_HAND | ITEM_CAN_BLOCK
 	var/recharge_timerid
 	var/recharge_delay = 15 SECONDS
 
diff --git a/code/modules/mob/living/living_active_block.dm b/code/modules/mob/living/living_active_block.dm
index 95b1fad320..fc66908b7f 100644
--- a/code/modules/mob/living/living_active_block.dm
+++ b/code/modules/mob/living/living_active_block.dm
@@ -87,7 +87,7 @@
 	if(SEND_SIGNAL(src, COMSIG_LIVING_ACTIVE_BLOCK_START, I, other_items) & COMPONENT_PREVENT_BLOCK_START)
 		to_chat(src, "<span class='warning'>Something is preventing you from blocking!</span>")
 		return
-	if(!I && length(other_items))
+	if(!I?.can_active_block() && length(other_items))
 		I = other_items[1]
 	if(!I)
 		to_chat(src, "<span class='warning'>You can't block with your bare hands!</span>")