Merge pull request #11326 from Verkister/hudbutts

Fixes the small hud buttons not getting hud colors
This commit is contained in:
Aronai Sieyes
2021-08-02 09:40:03 -04:00
committed by Chompstation Bot
parent 30329906ea
commit dfd88b4ba7
4 changed files with 14 additions and 6 deletions
+3 -1
View File
@@ -8,6 +8,8 @@
var/datum/hud/H = user.hud_used
var/obj/screen/craft/C = new()
C.icon = H.ui_style
C.color = H.ui_color
C.alpha = H.ui_alpha
LAZYADD(H.other_important, C)
CL.screen += C
RegisterSignal(C, COMSIG_CLICK, .proc/component_ui_interact)
@@ -392,7 +394,7 @@
cur_subcategory = subcats[1]
else
cur_subcategory = CAT_NONE
var/list/data = list()
data["busy"] = busy
data["category"] = cur_category
+4 -2
View File
@@ -848,9 +848,9 @@
if(lying)
density = FALSE
if(l_hand)
if(l_hand)
unEquip(l_hand)
if(r_hand)
if(r_hand)
unEquip(r_hand)
for(var/obj/item/weapon/holder/holder in get_mob_riding_slots())
unEquip(holder)
@@ -1164,6 +1164,8 @@
screen_icon = new()
RegisterSignal(screen_icon, COMSIG_CLICK, .proc/character_setup_click)
screen_icon.icon = HUD.ui_style
screen_icon.color = HUD.ui_color
screen_icon.alpha = HUD.ui_alpha
LAZYADD(HUD.other_important, screen_icon)
user.client?.screen += screen_icon
+5 -3
View File
@@ -47,7 +47,7 @@
qdel_null(screen_icon)
if(ishuman(parent))
owner.verbs -= /mob/living/carbon/human/proc/nif_menu
/datum/component/nif_menu/proc/create_mob_button(mob/user)
var/datum/hud/HUD = user.hud_used
@@ -55,9 +55,11 @@
screen_icon = new()
RegisterSignal(screen_icon, COMSIG_CLICK, .proc/nif_menu_click)
screen_icon.icon = HUD.ui_style
screen_icon.color = HUD.ui_color
screen_icon.alpha = HUD.ui_alpha
LAZYADD(HUD.other_important, screen_icon)
user.client?.screen += screen_icon
user.verbs |= /mob/living/carbon/human/proc/nif_menu
/datum/component/nif_menu/proc/nif_menu_click(source, location, control, params, user)
@@ -118,7 +120,7 @@
data["nif_percent"] = round((durability/initial(durability))*100)
data["nif_stat"] = stat
var/list/modules = list()
if(stat == NIF_WORKING)
for(var/nifsoft in nifsofts)
+2
View File
@@ -973,6 +973,8 @@
screen_icon = new()
RegisterSignal(screen_icon, COMSIG_CLICK, .proc/vore_panel_click)
screen_icon.icon = HUD.ui_style
screen_icon.color = HUD.ui_color
screen_icon.alpha = HUD.ui_alpha
LAZYADD(HUD.other_important, screen_icon)
user.client?.screen += screen_icon