diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 3796071f..917dcddc 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -652,16 +652,17 @@ name = "Red fingerless gloves" desc = "A pair of red and black fingerless gloves that stretch up the arm. They look to be made of a soft wool and are well worn." icon = 'icons/obj/custom_items.dmi' - icon_state = "" - item_state = "" + icon_state = "amy_gloves" + item_state = "amy_gloves" clipped = 1 /obj/item/clothing/tie/storage/fluff/cecillia_locket - name = "Old Locket" - desc = "" + name = "old locket" + desc = "A dark metal locket, it seems at least sixty years old. The photo that was once inside is gone." icon = 'icons/obj/custom_items.dmi' icon_state = "cecillia_locket0" item_state = "cecillia_locket0" + item_color = "cecillia_locket0" slots = 1 /obj/item/weapon/reagent_containers/pill/cecillia_pill @@ -673,10 +674,15 @@ reagents.add_reagent("space_drugs", 5) reagents.add_reagent("paroxetine", 5) + +/obj/item/clothing/tie/storage/fluff/cecillia_locket/attackby(/*var/obj/item/O as obj, mob/user as mob*/) + ..() + update() + /obj/item/clothing/tie/storage/fluff/cecillia_locket/proc/update() var/count = 0 for(var/obj/item/I in hold) - if(istype(I,/obj/item/weapon/reagent_containers/pill)) + if(istype(I,/obj/item/weapon/reagent_containers/pill/)) count++ if(count>1) count = 1 item_state = "cecillia_locket[count]" @@ -688,3 +694,16 @@ if(istype(U.loc, /mob/living/carbon/human)) var/mob/living/carbon/human/H = U.loc H.update_inv_w_uniform() + +/obj/item/clothing/tie/storage/fluff/cecillia_locket/New() + ..() + new /obj/item/weapon/reagent_containers/pill/cecillia_pill(src) + return + +/obj/item/clothing/glasses/regular/fluff/cecillia_glasses + name = "red prescription glasses" + desc = "These glasses have been prescribed for a terrible pair of eyes." + icon = 'icons/obj/custom_items.dmi' + icon_state = "cecillia_glasses" + item_state = "cecillia_glasses" + diff --git a/code/modules/customitems/item_spawning.dm b/code/modules/customitems/item_spawning.dm index f1bd79a9..7c572912 100644 --- a/code/modules/customitems/item_spawning.dm +++ b/code/modules/customitems/item_spawning.dm @@ -79,6 +79,17 @@ M.belt=null M.equip_if_possible(Pda, slot_l_store, 0) ok = M.equip_if_possible(I, slot_belt, 0)*/ + else if(istype(Item,/obj/item/clothing/glasses)) + if(M.ckey == "skull132" && M.real_name == "Cecillia Lambert") + ok = 1 + del(Item) + goto skip + var/obj/item/clothing/glasses/regular/fluff/cecillia_glasses/I = Item + if(istype(M.glasses,/obj/item/clothing/glasses)) + for(var/obj/item/clothing/glasses/B in M) + del(B) + M.glasses=null + ok = M.equip_if_possible(Item, slot_glasses, 0) else if(istype(M.back,/obj/item/weapon/storage) && M.back:contents.len < M.back:storage_slots) // Try to place it in something on the mob's back Item.loc = M.back ok = 1 diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi index 272f79fc..4c6ab6db 100644 Binary files a/icons/mob/eyes.dmi and b/icons/mob/eyes.dmi differ diff --git a/icons/mob/hands.dmi b/icons/mob/hands.dmi index 7f43af4a..350ccc21 100644 Binary files a/icons/mob/hands.dmi and b/icons/mob/hands.dmi differ diff --git a/icons/obj/clothing/ties_overlay.dmi b/icons/obj/clothing/ties_overlay.dmi index 6c6a65af..953ae574 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 7e3406b8..4e13788d 100644 Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ