cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 04:30:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactors hitreaction to pass in the hitting atom

Browse Source 
Required some upstream changes to the check_shields proc to also
reliably pass in the atom
This commit is contained in:
oranges
2017-06-20 02:48:17 +00:00
parent d0be33f480
commit 186d17b77b
28 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/holodeck/items.dm
+1 -1
View File
@@ -32,7 +32,7 @@
..()
item_color = "red"
/obj/item/weapon/holo/esword/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance)
/obj/item/weapon/holo/esword/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
if(active)
return ..()
return 0