cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #28590 from optimumtact/korthemoorstrikesthebooritsquiteashorethatbringsustothefore

Browse Source 
Refactors hitreaction to pass in the hitting atom
This commit is contained in:
Jordan Brown
2017-06-20 09:21:14 -04:00
committed by GitHub
parent 6f1a4e22b0 186d17b77b
commit 1c8badd8fe
28 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/assembly/flash.dm
View File

@@ -278,6 +278,6 @@
if(holder)
holder.update_icon()
/obj/item/device/assembly/flash/shield/hit_reaction(obj/item/weapon/W, mob/user, params)
/obj/item/device/assembly/flash/shield/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
activate()
return ..()