Skip to content

Commit

Permalink
Reflavors tribal talismans. (#3130)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Bone Talisman and Hunter's Necklace were ancient items meant to give ash
walkers some bonus armor. Their fluff was "divine protection", which was
also used to explain said armor.
Now, instead:
- They get no armor. There is no way a little bracelet grants any
protection.
- Instead, fluff-wise, there is a superstition that they bring good
luck. Something that, especially hunters and miners, could believe in.
There is no mechanical backing - they are fluff items.
- They are also in the loadout, for character building.

Other changes:
- Wolf necklace is a /neck clothing instead of an accessory.
- Sprites were also renamed.
- Wolf necklace crafting recipe was nerfed.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
I assume those items were on the chopping block. Might as well save
them, cause the concept of a little good luck charm is pretty cool I
think.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
add: Bone Talisman and Hunter's Necklace were added to loadout.
tweak: Bone Talisman and Hunter's Necklace were reflavored into good
lack charms. They are no longer armored.
tweak: Wolf talisman crafting recipe now requires less stuff.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
Sadhorizon authored Jun 21, 2024
1 parent 66019ab commit eef0591
Show file tree
Hide file tree
Showing 10 changed files with 35 additions and 30 deletions.
12 changes: 6 additions & 6 deletions _maps/RandomRuins/SpaceRuins/spacemall.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
18 changes: 8 additions & 10 deletions code/datums/components/crafting/recipes/tribal.dm
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion code/modules/cargo/bounties/mining.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
10 changes: 10 additions & 0 deletions code/modules/client/loadout/loadout_accessories.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions code/modules/clothing/neck/_neck.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 its wearer."
icon_state = "fang_necklace"
cuttable = FALSE
17 changes: 4 additions & 13 deletions code/modules/clothing/under/accessories.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 its 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."
Expand Down
Binary file modified icons/mob/clothing/accessories.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/neck.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/accessories.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/neck.dmi
Binary file not shown.

0 comments on commit eef0591

Please sign in to comment.