diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 2a952f90f4c..dfe0c7d24ee 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -1178,16 +1178,6 @@ All custom items with worn sprites must follow the contained sprite system: http unique = 1 -/obj/item/clothing/shoes/fluff/hikmat_shoes //Native Tajaran Foot-wear - Hikmat Rrhazkal-Jawdat - prospekt1559 - name = "native tajaran foot-wear" - desc = "Native foot and leg wear worn by Tajara, completely covering the legs in wraps and the feet in native Tajaran fabric." - icon = 'icons/obj/custom_items/hikmat_shoes.dmi' - icon_state = "hikmat_shoes" - item_state = "hikmat_shoes" - species_restricted = null - contained_sprite = TRUE - - /obj/item/clothing/suit/storage/fluff/vira_coat //Designer Military Coat - Vira Bolivar - scheveningen name = "designer military coat" desc = "A dark funnel neck designer military-style dress coat, specially fitted on commission, clearly designed for a woman's figure. \ @@ -2402,9 +2392,9 @@ All custom items with worn sprites must follow the contained sprite system: http name = "stainless [material.display_name] [initial(name)]" -/obj/item/sign/fluff/tokash_sign //Tokash Ancestral Spear - Suvek Tokash - evandorf - name = "ancestral spear" - desc = "This spear is clearly very old but well cared for." +/obj/item/sign/fluff/tokash_sign //Shark Jaw Trophy - Suvek Tokash - evandorf + name = "shark jaw trophy" + desc = "A pair of jaws from what must have been a large and impressive shark." icon_state = "tokash_sign" sign_state = "tokash_sign" w_class = 2 @@ -2732,4 +2722,89 @@ All custom items with worn sprites must follow the contained sprite system: http stored_name = "Kelt" badge_string = "Tau Ceti Foreign Legion" contained_sprite = TRUE - slot_flags = SLOT_MASK | SLOT_TIE \ No newline at end of file + slot_flags = SLOT_MASK | SLOT_TIE + + +/obj/item/device/radio/headset/fluff/resolve_headset //Antennae - Decisive Resolve - itanimulli + name = "antennae" + desc = "Collapsible spherical antennae designed to interface with an IPC. On it, in permanent marker, are the words: \"Cody Brickstend was here\" is immaculate, tiny handwriting." + icon = 'icons/obj/custom_items/resolve_items.dmi' + icon_state = "resolve_antennae" + item_state = "resolve_antennae" + contained_sprite = TRUE + +/obj/item/clothing/shoes/fluff/resolve_shoes //Treads - Decisive Resolve - itanimulli + name = "treads" + desc = "Clip-on rubber treads, for that extra grip. Designed for an IPC." + icon = 'icons/obj/custom_items/resolve_items.dmi' + icon_state = "resolve_shoes" + item_state = "resolve_shoes" + contained_sprite = TRUE + +/obj/item/clothing/under/fluff/resolve_uniform //Haphaestus Experimental Projector - Decisive Resolve - itanimulli + name = "haphaestus experimental projector" + desc = "A flashing device seemingly attached to an officer's corporate security uniform. On the side of the casing are the words: \"Brickstend\", \"Dernestess\", \"Jastovski\", and \"Finch.\"" + icon = 'icons/obj/custom_items/resolve_items.dmi' + icon_state = "resolve_uniform" + item_state = "resolve_uniform" + contained_sprite = TRUE + +/obj/item/clothing/accessory/poncho/fluff/resolve_poncho //Poncho - Decisive Resolve - itanimulli + desc = "A decorative synthleather covering. Probably isn't the best for rain. On the shoulder's edge is a small, paper tag, that reads: \"Cassidy Finch was here\" in sloppy handwriting." + icon = 'icons/obj/custom_items/resolve_items.dmi' + icon_state = "resolve_poncho" + item_state = "resolve_poncho" + contained_sprite = TRUE + icon_override = FALSE + + +/obj/item/weapon/storage/bible/fluff/oscar_bible //The Holy Book Of The Trinary Perfection - Oscar O'Neil - ironchaos + name = "holy book of the trinary perfection" + desc = "A holy book for followers of The Trinary Perfection." + icon = 'icons/obj/custom_items/oscar_bible.dmi' + icon_state = "oscar_bible" + deity_name = "Trinary Perfection" + + +/obj/item/fluff/tokash_spear //Ancestral Spear - Suvek Tokash - evandorf + name = "display stand" + desc = "A small plasteel display stand which uses magnetic fields to levitate an object." + icon = 'icons/obj/custom_items/tokash_spear.dmi' + icon_state = "stand-spear" + w_class = 3 + var/has_spear = TRUE + +/obj/item/fluff/tokash_spear/examine(mob/user) + if(..(user, 1) && has_spear) + to_chat(user, "It currently holds an old looking spearhead.") + +/obj/item/fluff/tokash_spear/update_icon() + if(has_spear) + icon_state = "stand-spear" + else + icon_state = "stand" + +/obj/item/fluff/tokash_spear/attack_self(var/mob/user) + if(has_spear) + to_chat(user, "You remove the spearhead from \the [src].") + var/obj/item/fluff/tokash_spearhead/piece = new(get_turf(user)) + user.put_in_hands(piece) + has_spear = FALSE + update_icon() + +/obj/item/fluff/tokash_spear/attackby(var/obj/item/W, var/mob/user) + if(!has_spear && istype(W, /obj/item/fluff/tokash_spearhead)) + to_chat(user, "You place \the [W] on the [src].") + user.drop_from_inventory(W,src) + qdel(W) + has_spear = TRUE + update_icon() + else + ..() + +/obj/item/fluff/tokash_spearhead + name = "ancestral spearhead" + desc = "An aged and worn spearhead. It seems to be made of bronze or composite metal." + icon = 'icons/obj/custom_items/tokash_spear.dmi' + icon_state = "spearhead" + w_class = 2 \ No newline at end of file diff --git a/icons/mob/custom_synthetic.dmi b/icons/mob/custom_synthetic.dmi index 0c988240537..09c89081b8f 100644 Binary files a/icons/mob/custom_synthetic.dmi and b/icons/mob/custom_synthetic.dmi differ diff --git a/icons/obj/custom_items/hikmat_shoes.dmi b/icons/obj/custom_items/hikmat_shoes.dmi deleted file mode 100644 index 172037de159..00000000000 Binary files a/icons/obj/custom_items/hikmat_shoes.dmi and /dev/null differ diff --git a/icons/obj/custom_items/kelt_tags.dmi b/icons/obj/custom_items/kelt_tags.dmi index 5d202b58e6c..659ca960636 100644 Binary files a/icons/obj/custom_items/kelt_tags.dmi and b/icons/obj/custom_items/kelt_tags.dmi differ diff --git a/icons/obj/custom_items/oscar_bible.dmi b/icons/obj/custom_items/oscar_bible.dmi new file mode 100644 index 00000000000..91d8b7222d4 Binary files /dev/null and b/icons/obj/custom_items/oscar_bible.dmi differ diff --git a/icons/obj/custom_items/resolve_items.dmi b/icons/obj/custom_items/resolve_items.dmi new file mode 100644 index 00000000000..01d8e6d3c7b Binary files /dev/null and b/icons/obj/custom_items/resolve_items.dmi differ diff --git a/icons/obj/custom_items/tokash_spear.dmi b/icons/obj/custom_items/tokash_spear.dmi new file mode 100644 index 00000000000..4bfed6747aa Binary files /dev/null and b/icons/obj/custom_items/tokash_spear.dmi differ diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi index caf8dd519f9..de0d22f690a 100644 Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ