From cf1d074e63a86f06a4df1b475d2f341d50879ead Mon Sep 17 00:00:00 2001
From: Aquilar <20759278+Aquilar@users.noreply.github.com>
Date: Sun, 27 Sep 2020 20:54:02 +0800
Subject: [PATCH] fixes lasers ignoring shields of all types.
---
code/modules/mob/living/carbon/human/human_defense.dm | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index cf61162733e..5f76f595497 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -16,6 +16,11 @@ emp_act
var/can_reflect = check_reflect(def_zone)
if(!can_reflect)
return (..(P , def_zone)) //Bad luck
+ else if(can_reflect == 1)
+ P.reflect_back(src)
+
+ return -1 // complete projectile permutation
+
else
if(can_reflect == 2) //If target is holding a toy sword
var/list/safe_list = list(/obj/item/projectile/beam/lasertag, /obj/item/projectile/beam/practice)
@@ -24,9 +29,9 @@ emp_act
visible_message("The [P.name] gets reflected by [src]!", \
"The [P.name] gets reflected by [src]!")
- P.reflect_back(src)
+ P.reflect_back(src)
- return -1 // complete projectile permutation
+ return -1 // complete projectile permutation
//Shields
if(check_shields(P, P.damage, "the [P.name]", PROJECTILE_ATTACK, P.armour_penetration))