Skip to content

Commit

Permalink
staff and longaxe now in the elite vendor (#7576)
Browse files Browse the repository at this point in the history
# About the pull request

the staff and the longaxe weapons are now in the elite yautja vendor

Changes the description of the staff to be more fitting.

Also adds back onmobs for the longaxe. Sprites by Thwomper of course
# Explain why it's good for the game

I thought I had added the weapons to both the normal and elite vendors,
but I guess I gaslit myself or something.



# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>


![image](https://github.com/user-attachments/assets/aaf43e6d-ce58-4626-a802-66e52a6d387d)

![image](https://github.com/user-attachments/assets/9da946f8-05d7-423b-b0bb-bfe64d694f15)

![image](https://github.com/user-attachments/assets/b0cc5ae7-0a9d-4fd4-aa79-f14904bae330)

![image](https://github.com/user-attachments/assets/d0f53198-3b2c-4650-80a0-e0027fd673dc)


</details>


# Changelog
:cl: Nomoresolvalou, Thwomper
add: Added staff and longaxe weapons to the elite yautja vendor.
imageadd: Adds onmob sprites for the longaxe.
spellcheck: Changes hunter staff description to be more in line with
other weapons.
/:cl:

---------

Co-authored-by: harryob <[email protected]>
  • Loading branch information
Nomoresolvalou and hry-gh authored Dec 25, 2024
1 parent deb8af3 commit 7681b62
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,15 @@ GLOBAL_LIST_INIT(cm_vending_elder_yautja, list(
list("The Rending Hunting Sword", 0, /obj/item/weapon/yautja/sword/alt_1, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED),
list("The Piercing Hunting Sword", 0, /obj/item/weapon/yautja/sword/alt_2, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED),
list("The Severing Hunting Sword", 0, /obj/item/weapon/yautja/sword/alt_3, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED),
list("The Taruulan Staff", 0, /obj/item/weapon/yautja/sword/staff, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED),
list("The Sundering Chain-Whip", 0, /obj/item/weapon/yautja/chain, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED),
list("The Cleaving War-Scythe", 0, /obj/item/weapon/yautja/scythe, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED),
list("The Ripping War-Scythe", 0, /obj/item/weapon/yautja/scythe/alt, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED),
list("The Adaptive Combi-Stick", 0, /obj/item/weapon/yautja/chained/combistick, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED),
list("The Butchering War Axe", 0, /obj/item/weapon/yautja/chained/war_axe, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED),
list("The Lumbering Glaive", 0, /obj/item/weapon/twohanded/yautja/glaive, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED),
list("The Imposing Glaive", 0, /obj/item/weapon/twohanded/yautja/glaive/alt, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED),
list("The Crushing Longaxe", 0, /obj/item/weapon/twohanded/yautja/glaive/longaxe, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED),

list("Bracer Attachments", 0, null, null, null),
list("Wrist Blades", 0,list(/obj/item/bracer_attachments/wristblades, /obj/item/bracer_attachments/wristblades), MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_MANDATORY),
Expand Down
2 changes: 1 addition & 1 deletion code/modules/cm_preds/yaut_weapons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@

/obj/item/weapon/yautja/sword/staff
name = "cruel staff"
desc = "A large staff with a sharp curve at the top. Commonly wielded by the shamans that roam the desert steppe."
desc = "A wicked and battered staff wrapped in worn crimson rags. A crescent shaped blade adorns the top, while the bottom is rounded and blunt."
icon_state = "staff"
item_state = "staff"

Expand Down
Binary file modified icons/mob/humans/onmob/hunter/pred_gear.dmi
Binary file not shown.

0 comments on commit 7681b62

Please sign in to comment.