This commit is contained in:
Metis
2024-09-18 01:04:49 -04:00
parent d4e8c61e92
commit 24de9f5e4d
21 changed files with 45 additions and 60 deletions
@@ -114,7 +114,7 @@
if(hud_used.inventory_shown)
client.screen += ears
overlays_standing[EARS_LAYER] = ears.build_worn_icon(state = ears.icon_state, default_layer = EARS_LAYER, default_icon_file = ((ears.alternate_worn_icon) ? ears.alternate_worn_icon : 'icons/mob/ears.dmi'))
overlays_standing[EARS_LAYER] = ears.build_worn_icon(state = ears.icon_state, default_layer = EARS_LAYER, default_icon_file = ((ears.mob_overlay_icon) ? ears.mob_overlay_icon : 'icons/mob/ears.dmi'))
var/mutable_appearance/ears_overlay = overlays_standing[EARS_LAYER]
switch(dir)
if(NORTH)
@@ -146,7 +146,7 @@
if(!t_state)
t_state = belt.icon_state
overlays_standing[BELT_LAYER] = belt.build_worn_icon(state = t_state, default_layer = BELT_LAYER, default_icon_file = ((belt.alternate_worn_icon) ? belt.alternate_worn_icon : 'icons/mob/belt.dmi'))
overlays_standing[BELT_LAYER] = belt.build_worn_icon(state = t_state, default_layer = BELT_LAYER, default_icon_file = ((belt.mob_overlay_icon) ? belt.mob_overlay_icon : 'icons/mob/belt.dmi'))
var/mutable_appearance/belt_overlay = overlays_standing[BELT_LAYER]
switch(dir)
if(NORTH)
@@ -287,7 +287,7 @@
//HEAD
/mob/living/carbon/wendigo/update_inv_head()
remove_overlay(HEAD_LAYER)
if(head)
head.screen_loc = ui_head
if(client && hud_used && hud_used.hud_shown)
@@ -5,25 +5,25 @@
icon_state = "polygar"
item_color = "polygar"
item_state = "polygar"
alternate_worn_icon = 'hyperstation/icons/mob/eyes.dmi' //Because, as it appears, the item itself is normally not directly aware of its worn overlays, so this is about the easiest way, without adding a new var.
mob_overlay_icon = 'hyperstation/icons/mob/eyes.dmi' //Because, as it appears, the item itself is normally not directly aware of its worn overlays, so this is about the easiest way, without adding a new var.
hasprimary = TRUE
primary_color = "#0c0c0c"
vision_correction = 1
/obj/item/clothing/glasses/polychromic/worn_overlays(isinhands, icon_file) //this is where the main magic happens. Also mandates that ALL polychromic stuff MUST USE alternate_worn_icon
/obj/item/clothing/glasses/polychromic/worn_overlays(isinhands, icon_file) //this is where the main magic happens. Also mandates that ALL polychromic stuff MUST USE mob_overlay_icon
. = ..()
if(hasprimary | hassecondary | hastertiary)
if(!isinhands) //prevents the worn sprites from showing up if you're just holding them
if(hasprimary) //checks if overlays are enabled
var/mutable_appearance/primary_worn = mutable_appearance(alternate_worn_icon, "[item_color]-primary") //automagical sprite selection
var/mutable_appearance/primary_worn = mutable_appearance(mob_overlay_icon, "[item_color]-primary") //automagical sprite selection
primary_worn.color = primary_color //colors the overlay
. += primary_worn //adds the overlay onto the buffer list to draw on the mob sprite.
if(hassecondary)
var/mutable_appearance/secondary_worn = mutable_appearance(alternate_worn_icon, "[item_color]-secondary")
var/mutable_appearance/secondary_worn = mutable_appearance(mob_overlay_icon, "[item_color]-secondary")
secondary_worn.color = secondary_color
. += secondary_worn
if(hastertiary)
var/mutable_appearance/tertiary_worn = mutable_appearance(alternate_worn_icon, "[item_color]-tertiary")
var/mutable_appearance/tertiary_worn = mutable_appearance(mob_overlay_icon, "[item_color]-tertiary")
tertiary_worn.color = tertiary_color
. += tertiary_worn
+1 -1
View File
@@ -4,7 +4,7 @@
icon_state = "guncaster"
item_state = "guncaster"
icon = 'hyperstation/icons/obj/clothing/gloves.dmi'
alternate_worn_icon = 'hyperstation/icons/mobs/gloves.dmi'
mob_overlay_icon = 'hyperstation/icons/mobs/gloves.dmi'
item_color = null //So they don't wash.
transfer_prints = TRUE
strip_delay = 40
+1 -1
View File
@@ -4,5 +4,5 @@
icon_state = "maid_head"
item_state = "maid_head"
icon = 'hyperstation/icons/obj/clothing/head.dmi'
alternate_worn_icon = 'hyperstation/icons/mobs/head.dmi'
mob_overlay_icon = 'hyperstation/icons/mobs/head.dmi'
mutantrace_variation = NONE
@@ -5,7 +5,7 @@
item_state = "kaminacape"
body_parts_covered = 0
icon = 'hyperstation/icons/obj/clothing/suits.dmi'
alternate_worn_icon = 'hyperstation/icons/mobs/suits.dmi'
mob_overlay_icon = 'hyperstation/icons/mobs/suits.dmi'
mutantrace_variation = NONE
/obj/item/clothing/suit/gcvest
@@ -14,7 +14,7 @@
icon_state = "guncaster"
item_state = "guncaster"
icon = 'hyperstation/icons/obj/clothing/suits.dmi'
alternate_worn_icon = 'hyperstation/icons/mobs/suits.dmi'
mob_overlay_icon = 'hyperstation/icons/mobs/suits.dmi'
mutantrace_variation = NONE
/obj/item/clothing/suit/gcvest/alt
@@ -2,7 +2,7 @@
name = "lumberjack outfit"
desc = "I am a lumberjack and I am ok, I sleep all night and I work all day."
icon = 'hyperstation/icons/obj/clothing/suits.dmi'
alternate_worn_icon = 'hyperstation/icons/mobs/suits.dmi'
mob_overlay_icon = 'hyperstation/icons/mobs/suits.dmi'
icon_state = "lumberjack"
item_state = "lumberjack"
can_adjust = FALSE