shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add owner argument

Browse Source
This commit is contained in:
kevinz000
2020-03-16 03:24:19 -07:00
parent 5d2fb654e8
commit 703fca5f90
12 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/assembly/flash.dm
+1 -1
View File
@@ -312,7 +312,7 @@
if(holder)
holder.update_icon()
/obj/item/assembly/flash/shield/run_block(real_attack, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance)
/obj/item/assembly/flash/shield/run_block(mob/living/owner, real_attack, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance)
if(real_attack)
activate()
return ..()
code/modules/mob/living/living_block.dm
+1 -1
View File
@@ -73,7 +73,7 @@
/// The 0% to 100% chance for the default implementation of random block rolls.
var/block_chance = 0
/obj/item/proc/run_block(real_attack, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance)
/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)
/obj/item/proc/_hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
SEND_SIGNAL(src, COMSIG_ITEM_HIT_REACT, args)
code/modules/projectiles/guns/magic/staff.dm
+1 -1
View File
@@ -90,7 +90,7 @@
. = ..()
AddComponent(/datum/component/butchering, 15, 125, 0, hitsound)
/obj/item/gun/magic/staff/spellblade/run_block(real_attack, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance)
/obj/item/gun/magic/staff/spellblade/run_block(mob/living/owner, real_attack, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance)
// Do not block projectiles.
if(attack_type & PROJECTILE_ATTACK)
return BLOCK_NONE