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

Merge remote-tracking branch 'xPokee/upstream-4-17-2026'

Browse Source 
# Conflicts:
#	code/__DEFINES/hud.dm
#	code/_onclick/hud/hud.dm
#	code/_onclick/hud/human.dm
This commit is contained in:
nevimer
2026-05-29 15:26:48 -04:00
parent b17330c92a 9604f623f5
commit 36163aecbd
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_onclick/hud/hud.dm
+1
View File
@@ -52,6 +52,7 @@ GLOBAL_LIST_INIT(available_erp_ui_styles, list(
var/inventory_shown = FALSE
/// This is to hide the buttons that can be used via hotkeys. (hotkeybuttons list of buttons)
var/atom/movable/screen/ammo_counter //SKYRAT EDIT ADDITION
var/atom/movable/screen/text/activation_text/activation // BUBBER EDIT ADDITION
var/hotkey_ui_hidden = FALSE