diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index a10b397f..94df7677 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -660,9 +660,9 @@ 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" + icon_state = "cecillia_locket1" //Keep as one, to indicate glass. + item_state = "cecillia_locket1" + item_color = "cecillia_locket1" slots = 1 /obj/item/weapon/reagent_containers/pill/cecillia_pill @@ -709,12 +709,52 @@ desc = "A pair of high quality, fingerless driving gloves made of faux leather and faux velvet-leathern without and velvet within." icon = 'icons/obj/custom_items.dmi' icon_state = "peter_gloves" - item_state = "peter gloves" + item_state = "peter_gloves" clipped = 1 -/obj/item/clothing/under/fluff/peter_shirt //Plaid shirt - Peter Thrushwood - farcry11 - DONE +/obj/item/clothing/under/fluff/peter_shirt //Plaid shirt - Peter Thrushwood - farcry11 - SPRITE name = "plaid shirt" desc = "A worn and rugged looking plaid button-up overshirt. The initials 'P.T.' are scrawled in pen on the neck tag." icon_state = "sl_suit" item_state = "sl_suit" - item_color = "sl_suit" \ No newline at end of file + item_color = "sl_suit" + +/obj/item/clothing/head/det_hat/fluff/leo_hat //Tagged brown hat - Leo Wyatt - keinto - DONE + name = "tagged brown hat" + desc = "A worn mid 20th century brown hat. If you look closely at the back, you can see a an embedded tag from the 'Museum of Terran Culture and Technology'." + icon = 'icons/obj/custom_items.dmi' + icon_state = "leo_hat" + item_state = "leo_hat" + +/obj/item/clothing/suit/storage/det_suit/fluff/leo_coat //Tagged brown coat - Leo Wyatt - keinto - DONE + name = "tagged brown coat" + desc = "A worn mid 20th century brown trenchcoat. If you look closely at bottom of the back, you can see an embedded tag from the 'Museum of Terran Culture and Technology'." + icon = 'icons/obj/custom_items.dmi' + icon_state = "leo_coat" + item_state = "leo_coat" + +/obj/item/device/modkit/fluff/omnivac_modkit //Weapon case - Leo Wyatt - keinto - DONE + name = "ornate box" + desc = "A sturdy leather case, with a velvet covered interior.." + icon = 'icons/obj/custom_items.dmi' + icon_state = "leo_modkit" + parts = MODKIT_HELMET + from_helmet = /obj/item/weapon/gun/projectile/detective/semiauto + to_helmet = /obj/item/weapon/gun/projectile/detective/semiauto/fluff/leo_gun + +/obj/item/weapon/gun/projectile/detective/semiauto/fluff/leo_gun //Instant Prosecutor - Leo Wyatt - keinto - DONE (stab) + name = "\improper Instant Prosecutor" + desc = "An original Colt 1911 pistol. Slightly worn on the edges, this gun has its name embedded on the side." + +/obj/item/weapon/bikehorn/rubberducky/fluff/bryce_ducky //Sir Duckens - Bryce Hunt - mrmajestic - DONE + name = "Sir Duckens" + desc = "A important and manly looking duck. He adorns a official looking cap and sunglasses. The hair on the back of your neck tingles as you look at it." + icon = 'icons/obj/custom_items.dmi' + icon_state = "bryce_duck" + +/obj/item/weapon/reagent_containers/food/drinks/fluff/bryce_mug //duck mug - Bryce Hunt - mrmajestic - DONE + name = "\improper duck mug" + desc = "A fashionable and reasonably large mug filled with a delicious smelling coffee drink. The mug adorns what looks to be a rubber duck." + icon = 'icons/obj/custom_items.dmi' + icon_state = "bryce_mug" + volume = 30 \ No newline at end of file diff --git a/code/modules/customitems/item_spawning.dm b/code/modules/customitems/item_spawning.dm index 9beaca9c..baf84eb6 100644 --- a/code/modules/customitems/item_spawning.dm +++ b/code/modules/customitems/item_spawning.dm @@ -90,7 +90,7 @@ del(B) M.glasses=null ok = M.equip_if_possible(I, slot_glasses, 0) - else if(istype(Item,/obj/item/device/pda)) +/* else if(istype(Item,/obj/item/device/pda)) if(M.ckey == "meowykins" && M.real_name == "Miyako Yukimura") ok = 1 del(Item) @@ -105,7 +105,7 @@ for(var/obj/item/device/pda/B in M) del(B) M.l_store=null - ok = M.equip_if_possible(I, slot_l_store,0) + ok = M.equip_if_possible(I, slot_l_store,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/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index e3fad9d7..26393c3f 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -29,6 +29,9 @@ if(!M.mind.assigned_role == "Detective") M << "You don't feel cool enough to name this gun, chump." return 0 + if(istype(src, /obj/item/weapon/gun/projectile/detective/semiauto/fluff/leo_gun)) + M << "You find it impossible to name this weapon something other." + return 0 var/input = stripped_input(usr,"What do you want to name the gun?", ,"", MAX_NAME_LEN) diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 31e51620..33aff9c9 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 688d0fe1..4166f1ff 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi index 53730fc6..dc60d4a0 100644 Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ