This commit is contained in:
silicons
2020-06-30 03:05:15 -07:00
parent 9756431612
commit 2039496739
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -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
@@ -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>")