cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 12:35:33 +01: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
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