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

organic ui fix (#8457)

Browse Source 
* organic ui fix

Reimplementing UI fixes

* fuc u, i won

* some skyrat buerocracy stuff

Co-authored-by: Lamella-0587 <76873041+Lamella-0587@users.noreply.github.com>
This commit is contained in:
GemInee
2021-09-29 00:05:06 +07:00
committed by GitHub
parent eadc7f1379
commit ae2111bfc0
15 changed files with 90 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
code/_onclick/hud/hud.dm
View File

@@ -15,9 +15,30 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
"Glass" = 'icons/hud/screen_glass.dmi'
))
//SKYRAT EDIT - ADDITION - ERP ICONS FIX
GLOBAL_LIST_INIT(available_erp_ui_styles, list(
"Midnight" = 'modular_skyrat/modules/modular_items/lewd_items/icons/obj/lewd_items/inventory_icons/midnight.dmi',
"Retro" = 'modular_skyrat/modules/modular_items/lewd_items/icons/obj/lewd_items/inventory_icons/retro.dmi',
"Plasmafire" = 'modular_skyrat/modules/modular_items/lewd_items/icons/obj/lewd_items/inventory_icons/plasmafire.dmi',
"Slimecore" = 'modular_skyrat/modules/modular_items/lewd_items/icons/obj/lewd_items/inventory_icons/slimecore.dmi',
"Operative" = 'modular_skyrat/modules/modular_items/lewd_items/icons/obj/lewd_items/inventory_icons/operative.dmi',
"Clockwork" = 'modular_skyrat/modules/modular_items/lewd_items/icons/obj/lewd_items/inventory_icons/clockwork.dmi',
"Glass" = 'modular_skyrat/modules/modular_items/lewd_items/icons/obj/lewd_items/inventory_icons/glass.dmi'
))
//SKYRAT EDIT - ADDITION - ERP ICONS FIX - END
/proc/ui_style2icon(ui_style)
return GLOB.available_ui_styles[ui_style] || GLOB.available_ui_styles[GLOB.available_ui_styles[1]]
//SKYRAT EDIT - ADDITION - ERP ICONS FIX
/proc/erp_ui_style2icon(ui_style)
return GLOB.available_erp_ui_styles[ui_style] || GLOB.available_erp_ui_styles[GLOB.available_erp_ui_styles[1]]
//SKYRAT EDIT - ADDITION - ERP ICONS FIX - END
/datum/hud
var/mob/mymob
@@ -82,6 +103,7 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
var/atom/movable/screen/spacesuit
// subtypes can override this to force a specific UI style
var/ui_style
var/erp_ui_style //SKYRAT EDIT - ADDITION - ERP ICONS FIX
/datum/hud/New(mob/owner)
mymob = owner
@@ -89,6 +111,7 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
if (!ui_style)
// will fall back to the default if any of these are null
ui_style = ui_style2icon(owner.client?.prefs?.read_preference(/datum/preference/choiced/ui_style))
erp_ui_style = erp_ui_style2icon(owner.client?.prefs?.read_preference(/datum/preference/choiced/ui_style)) //SKYRAT EDIT - ADDITION - ERP ICONS FIX
hide_actions_toggle = new
hide_actions_toggle.InitialiseIcon(src)
@@ -293,16 +316,26 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
if (item.icon == ui_style)
item.icon = new_ui_style
//SKYRAT EDIT ADDITION BEGIN - ERP_SLOT_SYSTEM
for(var/atom/item in ERP_toggleable_inventory)
if (item.icon == ui_style)
item.icon = new_ui_style
//SKYRAT EDIT ADDITION END
ui_style = new_ui_style
build_hand_slots()
hide_actions_toggle.InitialiseIcon(src)
//SKYRAT EDIT - ADDITION - ERP ICONS FIX
/datum/hud/proc/update_erp_ui_style(new_erp_ui_style)
// do nothing if overridden by a subtype or already on that style
if (initial(erp_ui_style) || erp_ui_style == new_erp_ui_style)
return
for(var/atom/item in ERP_toggleable_inventory)
if (item.icon == erp_ui_style)
item.icon = new_erp_ui_style
erp_ui_style = new_erp_ui_style
hide_actions_toggle.InitialiseIcon(src)
//SKYRAT EDIT - ADDITION - ERP ICONS FIX - END
//Triggered when F12 is pressed (Unless someone changed something in the DMF)
/mob/verb/button_pressed_F12()
set name = "F12"