From 681e5220588fa75888de0f6c11ab25427884aff3 Mon Sep 17 00:00:00 2001 From: Tyranicranger4 <80382633+Tyranicranger4@users.noreply.github.com> Date: Thu, 30 May 2024 08:43:49 -0700 Subject: [PATCH] Fixes Burrowers being able to use corrosive acid while underground (#6348) # About the pull request Adds an extra check for being burrowed *after* the do_after in corrosive acid. Without this (how things are before this PR) it's possible to start channeling the burrow ability and then start aciding an object, in which case the acid will finish applying while you're underground since you've already cleared the check for being burrowed. # Explain why it's good for the game Obviously unintended behavior and I *have* seen people in-game abusing this. It's quite awful to play against since there is absolutely zero counterplay. # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags. https://streamable.com/22ualc
# Changelog :cl: fix: Fixed an exploit that allowed Burrowers to apply acid to objects while underground /:cl: --- .../living/carbon/xenomorph/abilities/ability_helper_procs.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/ability_helper_procs.dm b/code/modules/mob/living/carbon/xenomorph/abilities/ability_helper_procs.dm index 0990df678f61..0472dd9901b2 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/ability_helper_procs.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/ability_helper_procs.dm @@ -106,6 +106,10 @@ to_chat(src, SPAN_WARNING("[A] is already drenched in acid.")) return + if(HAS_TRAIT(src, TRAIT_ABILITY_BURROWED)) //Checked again to account for people trying to place acid while channeling the burrow ability + to_chat(src, SPAN_WARNING("We can't melt [O] from here!")) + return + if(!check_state()) return