From dfd88b4ba7e713bdec2fbaedb340837cfbfc8ca1 Mon Sep 17 00:00:00 2001
From: Aronai Sieyes <arokha@arokha.com>
Date: Mon, 2 Aug 2021 09:40:03 -0400
Subject: [PATCH] Merge pull request #11326 from Verkister/hudbutts

Fixes the small hud buttons not getting hud colors
---
 code/datums/components/crafting/crafting.dm | 4 +++-
 code/modules/mob/living/living.dm           | 6 ++++--
 code/modules/nifsoft/nif_tgui.dm            | 8 +++++---
 code/modules/vore/eating/living_vr.dm       | 2 ++
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/code/datums/components/crafting/crafting.dm b/code/datums/components/crafting/crafting.dm
index c4d8bcc3d4..c866711ab5 100644
--- a/code/datums/components/crafting/crafting.dm
+++ b/code/datums/components/crafting/crafting.dm
@@ -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
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 9e981dd0ef..5b2d45a29e 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -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
 
diff --git a/code/modules/nifsoft/nif_tgui.dm b/code/modules/nifsoft/nif_tgui.dm
index 7be13ceff6..203e0bb858 100644
--- a/code/modules/nifsoft/nif_tgui.dm
+++ b/code/modules/nifsoft/nif_tgui.dm
@@ -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)
diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm
index 15d2313bcf..2c5cbafac9 100644
--- a/code/modules/vore/eating/living_vr.dm
+++ b/code/modules/vore/eating/living_vr.dm
@@ -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