This commit is contained in:
kevinz000
2020-03-16 04:24:18 -07:00
parent 69374c64c9
commit 2a9e4bebdd
8 changed files with 20 additions and 3 deletions
@@ -1,7 +1,7 @@
/mob/living/carbon/human/get_blocking_items()
. = ..()
if(wear_suit)
. += wear_suit)
. += wear_suit
if(w_uniform)
. += w_uniform
if(wear_neck)
+3
View File
@@ -50,6 +50,7 @@
if((. & BLOCK_SUCCESS) && !(. & BLOCK_CONTINUE_CHAIN))
return
var/list/obj/item/tocheck = get_blocking_items()
sortTim(tocheck, /proc/cmp_item_block_priority_asc)
// i don't like this
var/block_chance_modifier = round(damage / -3)
for(var/obj/item/I in tocheck)
@@ -72,6 +73,8 @@
/obj/item
/// The 0% to 100% chance for the default implementation of random block rolls.
var/block_chance = 0
/// Block priority, higher means we check this higher in the "chain".
var/block_priority = BLOCK_PRIORITY_DEFAULT
/obj/item/proc/run_block(mob/living/owner, real_attack, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)
SEND_SIGNAL(src, COMSIG_ITEM_RUN_BLOCK, args)