cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 15:47:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes improvised cauterization of wounds (#28779)

Browse Source 
* 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
🆑
fix: Fixed being unable to cauterise wounds with improvised cautery
tools such as welders.
/🆑

* Fixes improvised cauterization of wounds

---------

Co-authored-by: GoblinBackwards <22856555+GoblinBackwards@users.noreply.github.com>
This commit is contained in:
SkyratBot
2024-07-11 19:45:33 +05:30
committed by GitHub
co-authored by GoblinBackwards
parent 526d3604f0
commit 40c4c1ed85
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/wounds/_wounds.dm
+1 -1
View File
@@ -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))