diff --git a/code/modules/client/client_colour.dm b/code/modules/client/client_colour.dm index b569faf75b10..6c068124ce55 100644 --- a/code/modules/client/client_colour.dm +++ b/code/modules/client/client_colour.dm @@ -170,10 +170,10 @@ colour = "#ffff66" /datum/client_colour/glass_colour/red - colour = "#ffaaaa" + colour = "#ffbfcf" /datum/client_colour/glass_colour/darkred - colour = "#bb5555" + colour = "#e5a5b5" /datum/client_colour/glass_colour/orange colour = "#ffbb99" @@ -182,7 +182,10 @@ colour = "#ffddaa" /datum/client_colour/glass_colour/purple - colour = "#ff99ff" + colour = "#ffbbff" + +/datum/client_colour/glass_colour/darkpurple + colour = "#dd99dd" /datum/client_colour/glass_colour/gray colour = "#cccccc" diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm index 6b289f944b8b..70a9fe677263 100644 --- a/code/modules/clothing/glasses/_glasses.dm +++ b/code/modules/clothing/glasses/_glasses.dm @@ -39,6 +39,12 @@ . = ..() if(. && user) user.update_sight() + if(icon_state == "welding-g") + change_glass_color(user, /datum/client_colour/glass_colour/gray) + else if(icon_state == "bustin-g") + change_glass_color(user, /datum/client_colour/glass_colour/green) + else + change_glass_color(user, null) //called when thermal glasses are emped. /obj/item/clothing/glasses/proc/thermal_overload() @@ -238,6 +244,7 @@ icon_state = "sunhudbeer" desc = "A pair of sunglasses outfitted with apparatus to scan reagents, as well as providing an innate understanding of liquid viscosity while in motion." clothing_flags = SCAN_REAGENTS + glass_colour_type = /datum/client_colour/glass_colour/orange /obj/item/clothing/glasses/sunglasses/reagent/equipped(mob/user, slot) . = ..() @@ -253,6 +260,7 @@ icon_state = "sunhudsci" desc = "A pair of tacky purple sunglasses that allow the wearer to recognize various chemical compounds with only a glance." clothing_flags = SCAN_REAGENTS + glass_colour_type = /datum/client_colour/glass_colour/darkpurple /obj/item/clothing/glasses/sunglasses/garb name = "black gar glasses" diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index fd802cf55ec6..b267db209293 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -92,6 +92,7 @@ item_state = "glasses" flash_protect = FLASH_PROTECTION_FLASH tint = 1 + glass_colour_type = /datum/client_colour/glass_colour/orange /obj/item/clothing/glasses/hud/security name = "security HUD" @@ -260,6 +261,7 @@ icon_state = "inteq_goggles" item_state = "inteq_goggles" supports_variations = KEPORI_VARIATION + glass_colour_type = /datum/client_colour/glass_colour/orange /obj/item/clothing/glasses/hud/health/prescription name = "prescription health scanner HUD"