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

[MIRROR] Fix some shenanigans involving interaction order with wound tending [MDB IGNORE] (#25551)

Browse Source 
* Fix some shenanigans involving interaction order with wound tending (#80225)

## About The Pull Request

Fixes #80223 . See issue for information about the bug.

This PR fixes it by placing wound tending before parent call but after
surgery.

It also fixes it by rewriting a little bit of medical stack item code to
only block interaction chain when actually healing someone - This is not
necessary with the above fix, but it futureproofs things.

## Changelog

🆑 Melbert
fix: When using an item on a mob, you will always attempt to fix wounds
AFTER surgery, BUT BEFORE the item's own interactions. As an example,
this means using a mesh on a mob will attempt to progress surgery first,
then attempt to fix any burn wounds, then heal burn damage.
/🆑

* Fix some shenanigans involving interaction order with wound tending

---------

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
This commit is contained in:
SkyratBot
2023-12-10 20:47:35 -05:00
committed by GitHub
co-authored by MrMelbert
parent d26272cd96
commit 2cbbccf4e7
4 changed files with 60 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/tools/weldingtool.dm
+1 -1
View File
@@ -143,7 +143,7 @@
var/mob/living/carbon/human/attacked_humanoid = interacting_with
var/obj/item/bodypart/affecting = attacked_humanoid.get_bodypart(check_zone(user.zone_selected))
if(isnull(affecting) || !IS_ROBOTIC_LIMB(affecting))
return ITEM_INTERACT_BLOCKING
return NONE
if(!use_tool(attacked_humanoid, user, 0, volume=50, amount=1))
return ITEM_INTERACT_BLOCKING