From 8925b33df469fc2709b80c69d37917a0984599e5 Mon Sep 17 00:00:00 2001
From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date: Tue, 17 Sep 2024 12:19:08 -0400
Subject: [PATCH] oopsie (#26810)
---
.../items/weapons/melee/energy_melee_weapons.dm | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/code/game/objects/items/weapons/melee/energy_melee_weapons.dm b/code/game/objects/items/weapons/melee/energy_melee_weapons.dm
index 5fef9bf2214..96893ff65c9 100644
--- a/code/game/objects/items/weapons/melee/energy_melee_weapons.dm
+++ b/code/game/objects/items/weapons/melee/energy_melee_weapons.dm
@@ -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("[owner] blocks [attack_text] with [src]!")
- playsound(src, 'sound/weapons/effects/ric3.ogg', 100, TRUE)
- return TRUE
- owner.visible_message("[owner] parries [attack_text] with [src]!")
- 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("[owner] parries [attack_text] with [src]!")
+ add_attack_logs(P.firer, src, "hit by [P.type] but got parried by [src]")
+ return -1
+ owner.visible_message("[owner] blocks [attack_text] with [src]!")
+ playsound(src, 'sound/weapons/effects/ric3.ogg', 100, TRUE)
+ return TRUE
+
return TRUE
//////////////////////////////