diff --git a/code/__DEFINES/colors.dm b/code/__DEFINES/colors.dm index d714298e1c0..4c19a78a3a4 100644 --- a/code/__DEFINES/colors.dm +++ b/code/__DEFINES/colors.dm @@ -153,6 +153,7 @@ #define COLOR_THEME_OPERATIVE "#B8221F" #define COLOR_THEME_GLASS "#75A4C4" #define COLOR_THEME_CLOCKWORK "#CFBA47" +#define COLOR_THEME_TRASENKNOX "#3ce375" ///Colors for eigenstates #define COLOR_PERIWINKLEE "#9999FF" diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index 333a030850d..fbac3ce88d3 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -12,7 +12,8 @@ GLOBAL_LIST_INIT(available_ui_styles, list( "Slimecore" = 'icons/hud/screen_slimecore.dmi', "Operative" = 'icons/hud/screen_operative.dmi', "Clockwork" = 'icons/hud/screen_clockwork.dmi', - "Glass" = 'icons/hud/screen_glass.dmi' + "Glass" = 'icons/hud/screen_glass.dmi', + "Trasen-Knox" = 'icons/hud/screen_trasenknox.dmi' )) /proc/ui_style2icon(ui_style) diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm index 9c8969ca8cd..6a2edd543e6 100644 --- a/code/_onclick/hud/human.dm +++ b/code/_onclick/hud/human.dm @@ -98,6 +98,7 @@ inv_box.icon = ui_style inv_box.slot_id = ITEM_SLOT_ICLOTHING inv_box.icon_state = "uniform" + inv_box.icon_full = "template" inv_box.screen_loc = ui_iclothing inv_box.hud = src toggleable_inventory += inv_box @@ -107,6 +108,7 @@ inv_box.icon = ui_style inv_box.slot_id = ITEM_SLOT_OCLOTHING inv_box.icon_state = "suit" + inv_box.icon_full = "template" inv_box.screen_loc = ui_oclothing inv_box.hud = src toggleable_inventory += inv_box @@ -131,6 +133,7 @@ inv_box.name = "id" inv_box.icon = ui_style inv_box.icon_state = "id" + inv_box.icon_full = "template_small" inv_box.screen_loc = ui_id inv_box.slot_id = ITEM_SLOT_ID inv_box.hud = src @@ -140,6 +143,7 @@ inv_box.name = "mask" inv_box.icon = ui_style inv_box.icon_state = "mask" + inv_box.icon_full = "template" inv_box.screen_loc = ui_mask inv_box.slot_id = ITEM_SLOT_MASK inv_box.hud = src @@ -149,6 +153,7 @@ inv_box.name = "neck" inv_box.icon = ui_style inv_box.icon_state = "neck" + inv_box.icon_full = "template" inv_box.screen_loc = ui_neck inv_box.slot_id = ITEM_SLOT_NECK inv_box.hud = src @@ -158,6 +163,7 @@ inv_box.name = "back" inv_box.icon = ui_style inv_box.icon_state = "back" + inv_box.icon_full = "template_small" inv_box.screen_loc = ui_back inv_box.slot_id = ITEM_SLOT_BACK inv_box.hud = src @@ -167,6 +173,7 @@ inv_box.name = "left pocket" inv_box.icon = ui_style inv_box.icon_state = "pocket" + inv_box.icon_full = "template_small" inv_box.screen_loc = ui_storage1 inv_box.slot_id = ITEM_SLOT_LPOCKET inv_box.hud = src @@ -176,6 +183,7 @@ inv_box.name = "right pocket" inv_box.icon = ui_style inv_box.icon_state = "pocket" + inv_box.icon_full = "template_small" inv_box.screen_loc = ui_storage2 inv_box.slot_id = ITEM_SLOT_RPOCKET inv_box.hud = src @@ -185,6 +193,7 @@ inv_box.name = "suit storage" inv_box.icon = ui_style inv_box.icon_state = "suit_storage" + inv_box.icon_full = "template" inv_box.screen_loc = ui_sstore1 inv_box.slot_id = ITEM_SLOT_SUITSTORE inv_box.hud = src @@ -212,6 +221,7 @@ inv_box.name = "gloves" inv_box.icon = ui_style inv_box.icon_state = "gloves" + inv_box.icon_full = "template" inv_box.screen_loc = ui_gloves inv_box.slot_id = ITEM_SLOT_GLOVES inv_box.hud = src @@ -221,6 +231,7 @@ inv_box.name = "eyes" inv_box.icon = ui_style inv_box.icon_state = "glasses" + inv_box.icon_full = "template" inv_box.screen_loc = ui_glasses inv_box.slot_id = ITEM_SLOT_EYES inv_box.hud = src @@ -230,6 +241,7 @@ inv_box.name = "ears" inv_box.icon = ui_style inv_box.icon_state = "ears" + inv_box.icon_full = "template" inv_box.screen_loc = ui_ears inv_box.slot_id = ITEM_SLOT_EARS inv_box.hud = src @@ -239,6 +251,7 @@ inv_box.name = "head" inv_box.icon = ui_style inv_box.icon_state = "head" + inv_box.icon_full = "template" inv_box.screen_loc = ui_head inv_box.slot_id = ITEM_SLOT_HEAD inv_box.hud = src @@ -248,6 +261,7 @@ inv_box.name = "shoes" inv_box.icon = ui_style inv_box.icon_state = "shoes" + inv_box.icon_full = "template" inv_box.screen_loc = ui_shoes inv_box.slot_id = ITEM_SLOT_FEET inv_box.hud = src @@ -257,7 +271,7 @@ inv_box.name = "belt" inv_box.icon = ui_style inv_box.icon_state = "belt" -// inv_box.icon_full = "template_small" + inv_box.icon_full = "template_small" inv_box.screen_loc = ui_belt inv_box.slot_id = ITEM_SLOT_BELT inv_box.hud = src @@ -365,15 +379,24 @@ H.head.screen_loc = ui_head screenmob.client.screen += H.head else - if(H.shoes) screenmob.client.screen -= H.shoes - if(H.gloves) screenmob.client.screen -= H.gloves - if(H.ears) screenmob.client.screen -= H.ears - if(H.glasses) screenmob.client.screen -= H.glasses - if(H.w_uniform) screenmob.client.screen -= H.w_uniform - if(H.wear_suit) screenmob.client.screen -= H.wear_suit - if(H.wear_mask) screenmob.client.screen -= H.wear_mask - if(H.wear_neck) screenmob.client.screen -= H.wear_neck - if(H.head) screenmob.client.screen -= H.head + if(H.shoes) + screenmob.client.screen -= H.shoes + if(H.gloves) + screenmob.client.screen -= H.gloves + if(H.ears) + screenmob.client.screen -= H.ears + if(H.glasses) + screenmob.client.screen -= H.glasses + if(H.w_uniform) + screenmob.client.screen -= H.w_uniform + if(H.wear_suit) + screenmob.client.screen -= H.wear_suit + if(H.wear_mask) + screenmob.client.screen -= H.wear_mask + if(H.wear_neck) + screenmob.client.screen -= H.wear_neck + if(H.head) + screenmob.client.screen -= H.head diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 4e0bc221b12..2ca6ac3345a 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -161,9 +161,8 @@ if(!icon_empty) icon_empty = icon_state - if(!hud?.mymob || !slot_id || !icon_full) - return ..() - icon_state = hud.mymob.get_item_by_slot(slot_id) ? icon_full : icon_empty + if(hud?.mymob && slot_id && icon_full) + icon_state = hud.mymob.get_item_by_slot(slot_id) ? icon_full : icon_empty return ..() /atom/movable/screen/inventory/proc/add_overlays() @@ -214,8 +213,7 @@ . += blocked_overlay if(held_index == hud.mymob.active_hand_index) - . += "hand_active" - + . += (held_index % 2) ? "lhandactive" : "rhandactive" /atom/movable/screen/inventory/hand/Click(location, control, params) // At this point in client Click() code we have passed the 1/10 sec check and little else diff --git a/code/modules/mob/living/carbon/human/human_update_icons.dm b/code/modules/mob/living/carbon/human/human_update_icons.dm index 5e258aa53aa..4031dd0c10f 100644 --- a/code/modules/mob/living/carbon/human/human_update_icons.dm +++ b/code/modules/mob/living/carbon/human/human_update_icons.dm @@ -452,8 +452,8 @@ There are several things that need to be remembered: var/atom/movable/screen/inventory/inv inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_LPOCKET) + 1] + inv.update_icon() inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_RPOCKET) + 1] - inv.update_icon() if(l_store) diff --git a/code/modules/tooltip/tooltip.html b/code/modules/tooltip/tooltip.html index 5be29994cf1..0c963a94981 100644 --- a/code/modules/tooltip/tooltip.html +++ b/code/modules/tooltip/tooltip.html @@ -80,6 +80,8 @@ .operative .wrap {border-color: #1E0101;} .operative .content {color: #FFFFFF; border-color: #750000; background-color: #350000;} + .trasen-knox .wrap {border-color: #998e81;} + .trasen-knox .content {color: #3ce375; border-color: #998e81; background-color: #1e1d21;} diff --git a/icons/hud/64x16_actions.dmi b/icons/hud/64x16_actions.dmi index ae81ace4d55..097fe1b26f1 100644 Binary files a/icons/hud/64x16_actions.dmi and b/icons/hud/64x16_actions.dmi differ diff --git a/icons/hud/screen_clockwork.dmi b/icons/hud/screen_clockwork.dmi index 5d92964abeb..78960e9ca5f 100644 Binary files a/icons/hud/screen_clockwork.dmi and b/icons/hud/screen_clockwork.dmi differ diff --git a/icons/hud/screen_glass.dmi b/icons/hud/screen_glass.dmi index ac8ba86d3c3..345cb0bd41c 100644 Binary files a/icons/hud/screen_glass.dmi and b/icons/hud/screen_glass.dmi differ diff --git a/icons/hud/screen_midnight.dmi b/icons/hud/screen_midnight.dmi index a632ec803bc..a27dcc94ed8 100644 Binary files a/icons/hud/screen_midnight.dmi and b/icons/hud/screen_midnight.dmi differ diff --git a/icons/hud/screen_operative.dmi b/icons/hud/screen_operative.dmi index ed89b28a1a3..15d9ecce70e 100644 Binary files a/icons/hud/screen_operative.dmi and b/icons/hud/screen_operative.dmi differ diff --git a/icons/hud/screen_plasmafire.dmi b/icons/hud/screen_plasmafire.dmi index f8d667e6a47..115aa1f2c9d 100644 Binary files a/icons/hud/screen_plasmafire.dmi and b/icons/hud/screen_plasmafire.dmi differ diff --git a/icons/hud/screen_retro.dmi b/icons/hud/screen_retro.dmi index ac1b121b7e0..5af574a8213 100644 Binary files a/icons/hud/screen_retro.dmi and b/icons/hud/screen_retro.dmi differ diff --git a/icons/hud/screen_slimecore.dmi b/icons/hud/screen_slimecore.dmi index e7cf6320520..9ae20f6a425 100644 Binary files a/icons/hud/screen_slimecore.dmi and b/icons/hud/screen_slimecore.dmi differ diff --git a/icons/hud/screen_trasenknox.dmi b/icons/hud/screen_trasenknox.dmi new file mode 100644 index 00000000000..8956250a4c0 Binary files /dev/null and b/icons/hud/screen_trasenknox.dmi differ diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi index 4b44fd0867f..1d86660a489 100644 Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ diff --git a/icons/obj/clothing/neck.dmi b/icons/obj/clothing/neck.dmi index 88d8a891abf..1f75bd6c12b 100644 Binary files a/icons/obj/clothing/neck.dmi and b/icons/obj/clothing/neck.dmi differ