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

1 real fix, two bandaid ones. (#7270)

Browse Source
This commit is contained in:
FluffMedic
2023-11-25 13:53:46 +01:00
committed by GitHub
parent eb65b5721c
commit 08e7b6658b
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/material/twohanded_vr.dm
+2
View File
@@ -59,6 +59,7 @@
edge = FALSE
sharp = FALSE
/* ChompEDit: This code provides full protection from melee, and I am unsure how to fix it currently. So temp.removal hopefully.
/obj/item/weapon/material/twohanded/staff/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
var/parry_chance
if(istype(damage_source, /obj/item/projectile)) //can't block ranged attacks, only melee!
@@ -73,6 +74,7 @@
playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1)
return 1
return 0
*/
/obj/item/weapon/material/twohanded/staff/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
. = ..()