diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm index f5256ecfaef..f0914f612f8 100644 --- a/code/game/objects/items/weapons/cosmetics.dm +++ b/code/game/objects/items/weapons/cosmetics.dm @@ -4,6 +4,9 @@ desc = "A generic brand of lipstick." icon = 'icons/obj/cosmetics.dmi' icon_state = "lipstick" + item_state = "lipstick" + build_from_parts = TRUE + contained_sprite = TRUE w_class = ITEMSIZE_TINY slot_flags = SLOT_EARS update_icon_on_init = TRUE @@ -13,15 +16,17 @@ pickup_sound = 'sound/items/pickup/screwdriver.ogg' /obj/item/lipstick/update_icon() - . = ..() cut_overlays() if(open) + worn_overlay = "open_overlay" + worn_overlay_color = lipstick_color icon_state = "[initial(icon_state)]_open" var/image/stick_overlay = image('icons/obj/cosmetics.dmi', null, "[initial(icon_state)]_open_overlay") stick_overlay.color = lipstick_color add_overlay(stick_overlay) else icon_state = initial(icon_state) + worn_overlay = initial(worn_overlay) /obj/item/lipstick/purple name = "purple lipstick" diff --git a/html/changelogs/doxxmedearly-lipstick_inhand_fix.yml b/html/changelogs/doxxmedearly-lipstick_inhand_fix.yml new file mode 100644 index 00000000000..a66bfcf118b --- /dev/null +++ b/html/changelogs/doxxmedearly-lipstick_inhand_fix.yml @@ -0,0 +1,4 @@ +author: Doxxmedearly +delete-after: True +changes: + - bugfix: "Fixes lipstick inhand sprites disappearing when open." diff --git a/icons/mob/items/lefthand.dmi b/icons/mob/items/lefthand.dmi index deb6778f9e9..04cc93e4adf 100644 Binary files a/icons/mob/items/lefthand.dmi and b/icons/mob/items/lefthand.dmi differ diff --git a/icons/mob/items/righthand.dmi b/icons/mob/items/righthand.dmi index 306acdcb191..ac79695c41d 100644 Binary files a/icons/mob/items/righthand.dmi and b/icons/mob/items/righthand.dmi differ diff --git a/icons/obj/cosmetics.dmi b/icons/obj/cosmetics.dmi index c3f10a03d11..a84d92671df 100644 Binary files a/icons/obj/cosmetics.dmi and b/icons/obj/cosmetics.dmi differ