diff --git a/code/__DEFINES/color_defines.dm b/code/__DEFINES/color_defines.dm index a99bdd04a53..59509bfc8c7 100644 --- a/code/__DEFINES/color_defines.dm +++ b/code/__DEFINES/color_defines.dm @@ -139,6 +139,7 @@ #define COLOR_THEME_OPERATIVE "#B8221F" #define COLOR_THEME_GLASS "#75A4C4" #define COLOR_THEME_CLOCKWORK "#CFBA47" +#define COLOR_THEME_MINDFLAYER "#e8b942" // Color matrix utilities #define COLOR_MATRIX_ADD(C) list(COLOR_RED, COLOR_GREEN, COLOR_BLUE, C) diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm index 7034031090e..1ee9988d5ad 100644 --- a/code/__HELPERS/type2type.dm +++ b/code/__HELPERS/type2type.dm @@ -164,6 +164,8 @@ return 'icons/mob/screen_white.dmi' if("Clockwork") return 'icons/mob/screen_clockwork.dmi' + if("Mindflayer") + return 'icons/mob/screen_mindflayer.dmi' if("Midnight") return 'icons/mob/screen_midnight.dmi' else diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index dbe6226b65f..44adbb4fd0b 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -857,6 +857,8 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons outline_color = COLOR_THEME_OPERATIVE if("clockwork") outline_color = COLOR_THEME_CLOCKWORK // if you want free gbp go fix the fact that clockwork's tooltip css is glass' + if("mindflayer") + outline_color = COLOR_THEME_MINDFLAYER if("glass") outline_color = COLOR_THEME_GLASS else // this should never happen, hopefully diff --git a/code/modules/client/preference/link_processing.dm b/code/modules/client/preference/link_processing.dm index 09d76a39107..98b6f45b165 100644 --- a/code/modules/client/preference/link_processing.dm +++ b/code/modules/client/preference/link_processing.dm @@ -924,7 +924,7 @@ if("hear_adminhelps") sound ^= SOUND_ADMINHELP if("ui") - var/new_UI_style = tgui_input_list(user, "Choose your UI style", "UI style", list("Midnight", "Plasmafire", "Retro", "Slimecore", "Operative", "White", "Clockwork")) + var/new_UI_style = tgui_input_list(user, "Choose your UI style", "UI style", list("Midnight", "Plasmafire", "Retro", "Slimecore", "Operative", "White", "Clockwork", "Mindflayer")) if(!new_UI_style) return switch(new_UI_style) @@ -942,6 +942,8 @@ UI_style = "White" if("Clockwork") UI_style = "Clockwork" + if("Mindflayer") + UI_style = "Mindflayer" if(ishuman(usr)) //mid-round preference changes, for aesthetics var/mob/living/carbon/human/H = usr diff --git a/code/modules/client/preference/preferences_mysql.dm b/code/modules/client/preference/preferences_mysql.dm index a939ff6724a..e52c7d617eb 100644 --- a/code/modules/client/preference/preferences_mysql.dm +++ b/code/modules/client/preference/preferences_mysql.dm @@ -40,7 +40,7 @@ //Sanitize ooccolor = sanitize_hexcolor(ooccolor, initial(ooccolor)) - UI_style = sanitize_inlist(UI_style, list("White", "Midnight", "Plasmafire", "Retro", "Slimecore", "Operative", "Clockwork"), initial(UI_style)) + UI_style = sanitize_inlist(UI_style, list("White", "Midnight", "Plasmafire", "Retro", "Slimecore", "Operative", "Clockwork", "Mindflayer"), initial(UI_style)) default_slot = sanitize_integer(default_slot, 1, max_save_slots, initial(default_slot)) toggles = sanitize_integer(toggles, 0, TOGGLES_TOTAL, initial(toggles)) toggles2 = sanitize_integer(toggles2, 0, TOGGLES_2_TOTAL, initial(toggles2)) diff --git a/icons/hud/64x16_actions.dmi b/icons/hud/64x16_actions.dmi index 3658754279d..1f9868ccd12 100644 Binary files a/icons/hud/64x16_actions.dmi and b/icons/hud/64x16_actions.dmi differ diff --git a/icons/mob/screen_mindflayer.dmi b/icons/mob/screen_mindflayer.dmi new file mode 100644 index 00000000000..f0e11bab0b6 Binary files /dev/null and b/icons/mob/screen_mindflayer.dmi differ