Skip to content

Complete Triumph Shop overhaul#6512

Open
dwasint wants to merge 75 commits into
Monkestation:mainfrom
dwasint:special-request
Open

Complete Triumph Shop overhaul#6512
dwasint wants to merge 75 commits into
Monkestation:mainfrom
dwasint:special-request

Conversation

@dwasint
Copy link
Copy Markdown

@dwasint dwasint commented May 20, 2026

About The Pull Request

Why It's Good For The Game

Easier to use and maintain

Changelog

🆑
refactor: Loadout, Be Special, and Triumph Buy menu combined with new UI.
qol: Loadouts can now be made by non-donators, using TRIUMPHs to purchase items to use.
qol: Many loadout items now support dying and detailing
balance: Be Special is now saved until used, and will not go away until you play a round with it.
balance: Be Special now allows you to purchase specific specials at the cost of TRIUMPHs, donators get a discount.
add: wedding bands & other rings, can be crafted at an anvil with the respective metal & gem
add: new tailorable clothes to mirror new items in the loadout shop
add: new smelt results for items that previously lacked them like ancient armors
add: new gold armor set that can be smithed with gold ingots
/:cl:

Pre-Merge Checklist

  • You tested this on a local server.
  • This code did not runtime during testing.
  • You documented all of your changes.

@github-actions github-actions Bot added Feature adds a new thing Fix This PR is for fixing bugs labels May 20, 2026
@Ben10083
Copy link
Copy Markdown

I think you should improve the changelog for this.

🆑
refactor: Loadout, Be Special, and Triumph Buy menu combined with new UI.
qol: Loadouts can now be made by non-donators, using TRIUMPHs to purchase items to use.
qol: Many loadout items now support dying and detailing
balance: Be Special is now saved until used, and will not go away until you play a round with it.
balance: Be Special now allows you to purchase specific specials at the cost of TRIUMPHs, donators get a discount.
/:cl:

Copy link
Copy Markdown
Collaborator

@tired-wired tired-wired left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Various consistency checks & lore touch-ups.


/obj/item/clothing/cloak/kazengun
name = "jinbaori"
desc = "A simple kind of Blackmeadow surcoat, worn here in the distant battlefields of Azuria to differentiate friend from foe."
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might want to swap the mention of Azuria to something else. Mention the refugee communities in Valoria?

Comment thread code/modules/clothing/gloves/plate.dm Outdated

/obj/item/clothing/gloves/plate/graggar/heavy
name = "vicious plated gauntlets"
desc = "Steel plated gauntlets overlaid by an ornamental imagery of fractured bone and entrails. The violet smears; a tether to the lyfe that once was - and now, a stinging reminder of what could've been."
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
desc = "Steel plated gauntlets overlaid by an ornamental imagery of fractured bone and entrails. The violet smears; a tether to the lyfe that once was - and now, a stinging reminder of what could've been."
desc = "Steel plated gauntlets overlaid by an ornamental imagery of fractured bone and entrails. The violet smears; a tether to the life that once was - and now, a stinging reminder of what could've been."


/obj/item/clothing/head/helmet/heavy/undivided
name = "templar silver sallet"
desc = "A silver-plated jousting helm, and symbol of hope worn by the Azurian Sect of The Undivided. Those who don it have sworn to lay down their lyves for the greater good, for no cost is too great to preserve Their will."
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't have a sect of the undivided, and I don't want to use the silly y thing.


/obj/item/clothing/head/helmet/heavy/graggar/skull
name = "vicious skullhelm"
desc = "Nigh lyke a crushed skull worn with pride; as sturdy as one that has seen fractures.. and survived them, too. Godliness was never meant to be tainted with minds so fragile and passionate."
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
desc = "Nigh lyke a crushed skull worn with pride; as sturdy as one that has seen fractures.. and survived them, too. Godliness was never meant to be tainted with minds so fragile and passionate."
desc = "Nigh like a crushed skull worn with pride; as sturdy as one that has seen fractures.. and survived them, too. Godliness was never meant to be tainted with minds so fragile and passionate."


/obj/item/clothing/head/helmet/sallet/iron/banded
name = "banded iron helmet"
desc = "A menacing horned half-face iron helmet worn primarily by mercenaries hailing from an unaligned conflict-ridden enclave within the Gronn-Hammerhold border. \
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
desc = "A menacing horned half-face iron helmet worn primarily by mercenaries hailing from an unaligned conflict-ridden enclave within the Gronn-Hammerhold border. \
desc = "A menacing horned half-face iron helmet worn primarily by mercenaries hailing from an unaligned conflict-ridden enclave near the borders of Ossland. \

desc = "A bronze helmet that veils the wearer's face behind a perforated visor; a distant ancestor to both the sallet and sayovard, \
providing excellent coverage while ensuring one doesn't suffocate on their own adrenal huffs. </br>Out of all actorial labors, none surpass \
the reenactment of Ravox's duel against Graggar atop Ur-Syon's ruins - mythologized not as a tentacled star, but as a towering doppelganger-champion; \
sculpted by the Archdevil to be the inverse to all who stood for justice and chivalry."
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
sculpted by the Archdevil to be the inverse to all who stood for justice and chivalry."
sculpted by the followers of evil to be the inverse to all who stood for justice and chivalry."

Comment thread code/modules/clothing/head/hood.dm Outdated

/obj/item/clothing/head/roguehood/studded
name = "studded hood"
desc = "A padded hood splinted across creating a cocooon for whoever wears it - won't protect your face however."
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
desc = "A padded hood splinted across creating a cocooon for whoever wears it - won't protect your face however."
desc = "A padded hood splinted across creating a cocoon for whoever wears it - won't protect your face however."

Comment thread code/modules/clothing/neck/misc.dm Outdated

/obj/item/clothing/neck/gorget/kazengun
name = "kazengunite gorget"
desc = "A series of interlocking rings of metal set around the throat. Used by the kouken of Kazengun for precisely the same reason as the knights of Psydonia."
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
desc = "A series of interlocking rings of metal set around the throat. Used by the kouken of Kazengun for precisely the same reason as the knights of Psydonia."
desc = "A series of interlocking rings of metal set around the throat. Used by the warriors of Blackmeadow for precisely the same reason as the knights of Psydonia."

Comment thread code/modules/clothing/neck/misc.dm Outdated
ADD_TRAIT(src, TRAIT_HARD_TO_STEAL, TRAIT_GENERIC)

/obj/item/clothing/neck/gorget/kazengun
name = "kazengunite gorget"
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
name = "kazengunite gorget"
name = "blackmeadow gorget"

/obj/item/clothing/ring/signet/psy/g
name = "psydonian golden signet ring"
icon_state = "psysignet_gold"
desc = "A ring of opulent gold, embodying the Naledian belief in Psydon's eternity. Its face is cut to seal writs of religious importance, a bead of tallow nested in the underside."
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
desc = "A ring of opulent gold, embodying the Naledian belief in Psydon's eternity. Its face is cut to seal writs of religious importance, a bead of tallow nested in the underside."
desc = "A ring of opulent gold, embodying the unforgotten belief in Psydon's eternity. Its face is cut to seal writs of religious importance, a bead of tallow nested in the underside."

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Feature adds a new thing Fix This PR is for fixing bugs Mapping You changed a map file, thank you for your tiles. May require additional approval.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants