From 40c4c1ed856e02683a8bbffec8222131539c415e Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Thu, 11 Jul 2024 16:15:33 +0200 Subject: [PATCH] [MIRROR] Fixes improvised cauterization of wounds (#28779) * Fixes improvised cauterization of wounds (#84803) ## About The Pull Request Fixes some weird order of operations stuff that was making it impossible to use improvised cauterisation tools to cauterise wounds. ## Changelog :cl: fix: Fixed being unable to cauterise wounds with improvised cautery tools such as welders. /:cl: * Fixes improvised cauterization of wounds --------- Co-authored-by: GoblinBackwards <22856555+GoblinBackwards@users.noreply.github.com> --- code/datums/wounds/_wounds.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/wounds/_wounds.dm b/code/datums/wounds/_wounds.dm index f713819c817..47f29a21e9d 100644 --- a/code/datums/wounds/_wounds.dm +++ b/code/datums/wounds/_wounds.dm @@ -498,7 +498,7 @@ // check if we have a valid treatable tool if(potential_treater.tool_behaviour in treatable_tools) return TRUE - if(TOOL_CAUTERY in treatable_tools && potential_treater.get_temperature() && user == victim) // allow improvised cauterization on yourself without an aggro grab + if((TOOL_CAUTERY in treatable_tools) && potential_treater.get_temperature() && (user == victim)) // allow improvised cauterization on yourself without an aggro grab return TRUE // failing that, see if we're aggro grabbing them and if we have an item that works for aggro grabs only if(user.pulling == victim && user.grab_state >= GRAB_AGGRESSIVE && check_grab_treatments(potential_treater, user))