diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 52c04b14894..3ad9c835afe 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -390,6 +390,7 @@ desc = "A simple necklace." icon_state = "necklace" item_state = "necklace" + item_color = "necklace" slot_flags = SLOT_MASK | SLOT_TIE /obj/item/clothing/accessory/necklace/locket @@ -397,6 +398,7 @@ desc = "A gold locket that seems to have space for a photo within." icon_state = "locket" item_state = "locket" + item_color = "locket" slot_flags = SLOT_MASK | SLOT_TIE var/base_icon var/open @@ -404,6 +406,8 @@ /obj/item/clothing/accessory/necklace/locket/Destroy() QDEL_NULL(held) + return ..() + /obj/item/clothing/accessory/necklace/locket/attack_self(mob/user as mob) if(!base_icon) @@ -440,7 +444,6 @@ else return ..() - //Cowboy Shirts /obj/item/clothing/accessory/cowboyshirt name = "black cowboy shirt" diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 741b35eff97..a56250c5ca5 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -931,10 +931,11 @@ -/obj/item/clothing/accessory/necklace/locket/fethasnecklace //Fethas: Sefra'neem +/obj/item/clothing/accessory/necklace/locket/fluff/fethasnecklace //Fethas: Sefra'neem name = "Orange gemmed locket" desc = "A locket with a orange gem set on the front, the picture inside seems to be of a Tajaran." icon = 'icons/obj/custom_items.dmi' icon_state = "fethasnecklace" item_state = "fethasnecklace" + item_color = "fethasnecklace" slot_flags = SLOT_MASK | SLOT_TIE diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi index 8e37ab08a84..8f2c49b09d7 100644 Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index e38fa7df582..a482ece8b38 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/obj/clothing/ties_overlay.dmi b/icons/obj/clothing/ties_overlay.dmi index 5817ab0e8ef..a17fed4818c 100644 Binary files a/icons/obj/clothing/ties_overlay.dmi and b/icons/obj/clothing/ties_overlay.dmi differ diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi index 6c9f81c2485..3aa68526db0 100644 Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ