From 56cc04a8dc0ce89af8e6addf35f4ac795092f2dd Mon Sep 17 00:00:00 2001 From: Nazsgull Date: Fri, 11 Nov 2022 20:07:40 +0100 Subject: [PATCH] Fix #19520 Adds a check for SSD players so they don't get harvested by revenants (#19549) * Adds a check for SSD players If the target is alive but SSD, it sends a warning and returns, otherwise they Harvest(target) * Logic fix Made a mistake with the indentation, fixing it here. * Update revenant_abilities.dm Removes the space at line 33 Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com> * Update revenant_abilities.dm Properly fixes the issue, revenants now should acknowledge harvesting SSD players Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> * Update revenant_abilities.dm Removes ?. operator since client cannot be null in this case. Co-authored-by: Farie82 Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> Co-authored-by: Farie82 --- code/game/gamemodes/miniantags/revenant/revenant_abilities.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm index 367f7a44832..fe9b95d9497 100644 --- a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm +++ b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm @@ -23,6 +23,8 @@ return A.attack_ghost(src) if(ishuman(A) && in_range(src, A)) + if(isLivingSSD(A) && client.send_ssd_warning(A)) //Do NOT Harvest SSD people unless you accept the warning + return Harvest(A) /mob/living/simple_animal/revenant/proc/Harvest(mob/living/carbon/human/target)