cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

oopsie (#26810)

Browse Source
This commit is contained in:
Qwertytoforty
2024-09-17 16:19:08 +00:00
committed by GitHub
parent bac06b2f0e
commit 8925b33df4
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/melee/energy_melee_weapons.dm
+8 -7
View File
@@ -311,13 +311,14 @@
return
if(isprojectile(hitby))
var/obj/item/projectile/P = hitby
if(P.reflectability == REFLECTABILITY_NEVER) //only 1 magic spell does this, but hey, needed
owner.visible_message("<span class='danger'>[owner] blocks [attack_text] with [src]!</span>")
playsound(src, 'sound/weapons/effects/ric3.ogg', 100, TRUE)
return TRUE
owner.visible_message("<span class='danger'>[owner] parries [attack_text] with [src]!</span>")
add_attack_logs(P.firer, src, "hit by [P.type] but got parried by [src]")
return -1
if(P.reflectability == REFLECTABILITY_ENERGY)
owner.visible_message("<span class='danger'>[owner] parries [attack_text] with [src]!</span>")
add_attack_logs(P.firer, src, "hit by [P.type] but got parried by [src]")
return -1
owner.visible_message("<span class='danger'>[owner] blocks [attack_text] with [src]!</span>")
playsound(src, 'sound/weapons/effects/ric3.ogg', 100, TRUE)
return TRUE
return TRUE
//////////////////////////////