diff --git a/_maps/RandomRuins/SpaceRuins/spacemall.dmm b/_maps/RandomRuins/SpaceRuins/spacemall.dmm index 322ab73490f9..0f5d01fb7de8 100644 --- a/_maps/RandomRuins/SpaceRuins/spacemall.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacemall.dmm @@ -9901,12 +9901,12 @@ "Lx" = ( /obj/structure/rack, /obj/effect/turf_decal/corner/opaque/blue/half, -/obj/item/clothing/accessory/talisman, -/obj/item/clothing/accessory/wolftalisman, -/obj/item/clothing/accessory/talisman, -/obj/item/clothing/accessory/talisman, -/obj/item/clothing/accessory/wolftalisman, -/obj/item/clothing/accessory/wolftalisman, +/obj/item/clothing/accessory/bonearmlet, +/obj/item/clothing/neck/fangnecklace, +/obj/item/clothing/accessory/bonearmlet, +/obj/item/clothing/accessory/bonearmlet, +/obj/item/clothing/neck/fangnecklace, +/obj/item/clothing/neck/fangnecklace, /obj/item/clothing/accessory/skilt, /obj/item/clothing/accessory/skilt, /obj/item/clothing/accessory/skilt, diff --git a/code/datums/components/crafting/recipes/tribal.dm b/code/datums/components/crafting/recipes/tribal.dm index 83e5c03722bc..c831b85d7878 100644 --- a/code/datums/components/crafting/recipes/tribal.dm +++ b/code/datums/components/crafting/recipes/tribal.dm @@ -1,18 +1,16 @@ -/datum/crafting_recipe/bonetalisman - name = "Bone Talisman" - result = /obj/item/clothing/accessory/talisman +/datum/crafting_recipe/bonearmlet + name = "Bone Armlet" + result = /obj/item/clothing/accessory/bonearmlet time = 20 reqs = list(/obj/item/stack/sheet/bone = 2, /obj/item/stack/sheet/sinew = 1) category = CAT_PRIMAL -/datum/crafting_recipe/bonenecklace - name = "Hunter's Necklace" - result = /obj/item/clothing/accessory/wolftalisman - time = 35 - reqs = list(/obj/item/stack/sheet/bone = 2, - /obj/item/stack/sheet/sinew = 3, - /obj/item/mob_trophy/wolf_ear = 2, +/datum/crafting_recipe/fangnecklace + name = "Wolf Fang Necklace" + result = /obj/item/clothing/neck/fangnecklace + time = 20 + reqs = list(/obj/item/stack/sheet/sinew = 2, /obj/item/mob_trophy/fang = 1) category = CAT_PRIMAL diff --git a/code/modules/cargo/bounties/mining.dm b/code/modules/cargo/bounties/mining.dm index b2df34d8f964..4eb48b09c7cb 100644 --- a/code/modules/cargo/bounties/mining.dm +++ b/code/modules/cargo/bounties/mining.dm @@ -41,7 +41,7 @@ description = "Station 14's Research Director claims that pagan bone talismans protect their wearer. Ship them a few so they can start testing." reward = 7500 required_count = 3 - wanted_types = list(/obj/item/clothing/accessory/talisman) + wanted_types = list(/obj/item/clothing/accessory/bonearmlet) /datum/bounty/item/mining/bone_dagger name = "Bone Daggers" diff --git a/code/modules/client/loadout/loadout_accessories.dm b/code/modules/client/loadout/loadout_accessories.dm index b81588c8e72e..70225b60cc2e 100644 --- a/code/modules/client/loadout/loadout_accessories.dm +++ b/code/modules/client/loadout/loadout_accessories.dm @@ -50,6 +50,16 @@ display_name = "tie, recolorable" path = /obj/item/clothing/neck/tie +//Bone +/datum/gear/accessory/fangnecklace + display_name = "wolf fang necklace" + path = /obj/item/clothing/neck/fangnecklace + +/datum/gear/accessory/bonearmlet + display_name = "bone armlet" + path = /obj/item/clothing/accessory/bonearmlet + slot = null + //Misc /datum/gear/accessory/waistcoat diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm index 8d5251e9e8c8..13115f909812 100644 --- a/code/modules/clothing/neck/_neck.dm +++ b/code/modules/clothing/neck/_neck.dm @@ -433,3 +433,9 @@ playsound(src,"shatter", 70) new /obj/effect/decal/cleanable/glass/strange(get_turf(src)) return ..() + +/obj/item/clothing/neck/fangnecklace + name = "wolf fang necklace" + desc = "A necklace made out of a wolf's fang and some sinew. According to a common Frontier superstition, it brings good luck to it's wearer." + icon_state = "fang_necklace" + cuttable = FALSE diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm index 76de51b173cd..f6c8f6762be0 100644 --- a/code/modules/clothing/under/accessories.dm +++ b/code/modules/clothing/under/accessories.dm @@ -381,22 +381,13 @@ //OONGA BOONGA// //////////////// -/obj/item/clothing/accessory/talisman - name = "bone talisman" - desc = "A hunter's talisman, some say the old gods smile on those who wear it." - icon_state = "talisman" - armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 5, "bomb" = 20, "bio" = 20, "rad" = 5, "fire" = 0, "acid" = 25) +/obj/item/clothing/accessory/bonearmlet + name = "bone armlet" + desc = "An armlet made out of animal bone and sinew. According to a common Frontier superstition, it brings good luck to it's wearer." + icon_state = "bone_armlet" attachment_slot = ARMS above_suit = TRUE -/obj/item/clothing/accessory/wolftalisman - name = "hunter's necklace" - desc = "A thick necklace woven from sinew and bits of wolfhide, adorned with a carved fang. Slaying such beasts is rumoured to elate the gods of old, and such an item proves your worth." - icon_state = "wolf_talisman" - armor = list("melee" = 15 , "bullet" = 15, "laser" = 10, "energy" = 10, "bomb" = 20, "bio" = 20, "rad" = 5, "fire" = 25, "acid" = 25) - attachment_slot = CHEST - above_suit = TRUE - /obj/item/clothing/accessory/skullcodpiece name = "skull codpiece" desc = "A legion skull fitted to a codpiece, intended to protect the important things in life." diff --git a/icons/mob/clothing/accessories.dmi b/icons/mob/clothing/accessories.dmi index 861bb2701699..7e87f94fd183 100644 Binary files a/icons/mob/clothing/accessories.dmi and b/icons/mob/clothing/accessories.dmi differ diff --git a/icons/mob/clothing/neck.dmi b/icons/mob/clothing/neck.dmi index fe74923b657d..f168673850e0 100644 Binary files a/icons/mob/clothing/neck.dmi and b/icons/mob/clothing/neck.dmi differ diff --git a/icons/obj/clothing/accessories.dmi b/icons/obj/clothing/accessories.dmi index 4de00230ac76..ecf54fb9f61a 100644 Binary files a/icons/obj/clothing/accessories.dmi and b/icons/obj/clothing/accessories.dmi differ diff --git a/icons/obj/clothing/neck.dmi b/icons/obj/clothing/neck.dmi index 049da153701a..3109928ff7ae 100644 Binary files a/icons/obj/clothing/neck.dmi and b/icons/obj/clothing/neck.dmi differ