cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-10 17:52:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix hard delete related to martial arts combo HUDs (#92277)

Browse Source 
## About The Pull Request

Martial arts styles that feature a combo UI add themselves to
`hud_used.infodisplay` when they're activated, but they do not remove
themselves from there before qdeling, leading to a hard delete and the
user's viewport becoming unusable. (See downstream report
[here](https://github.com/Bubberstation/Bubberstation/issues/4091) for
screenshots). Adds code to clean up properly in `deactivate_style()`

## Why It's Good For The Game

Fix hard delete and HUD bug

## Changelog

🆑
fix: fixed scarp breaking your HUD sometimes
/🆑
This commit is contained in:
Roxy
2025-07-24 00:03:34 -04:00
parent d457ce1384
commit 2dea279d73
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/datums/martial/_martial.dm
View File

@@ -352,6 +352,9 @@
remove_verb(remove_from, help_verb)
UnregisterSignal(remove_from, list(COMSIG_LIVING_UNARMED_ATTACK, COMSIG_LIVING_GRAB, COMSIG_LIVING_TABLE_SLAMMING, COMSIG_LIVING_TABLE_LIMB_SLAMMING))
if(!isnull(combo_display))
var/datum/hud/hud_used = remove_from.hud_used
hud_used.infodisplay -= combo_display
hud_used.show_hud(hud_used.hud_version)
QDEL_NULL(combo_display)
///Gives the owner of the martial art the combo HUD.