Skip to content

Adds mercenary statues and mercenary rings - #7507

Open
Monkeke2 wants to merge 24 commits into
Monkestation:mainfrom
Monkeke2:MercStatue
Open

Adds mercenary statues and mercenary rings#7507
Monkeke2 wants to merge 24 commits into
Monkestation:mainfrom
Monkeke2:MercStatue

Conversation

@Monkeke2

@Monkeke2 Monkeke2 commented Aug 6, 2026

Copy link
Copy Markdown

About The Pull Request

Adds the mercenary statue. The statue lets you send a message to mercenaries who have signed up for it, as a way to contact them if you have a job for them. Signing up for the statue gives you a (worthless) ring, which acts as a servant bell except it can only be bound to 1 mercenary. Unregistering from the statue removes the ring. Examining the statue lists all available mercenaries

Why It's Good For The Game

Easier to contact mercenaries, more difference between them and adventurers.

Changelog

🆑
add: Added mercenary statue and mercenary ring.
del: Removed mentions of gaffer from mercenary spawn text.
map: Added the mercenary statues to Vanderlin, Daftmarsh and WPP.
/: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 Mapping You changed a map file, thank you for your tiles. May require additional approval. Sprites This affects the appearance of something in game. Such as an item or a wall. labels Aug 6, 2026
@github-actions
github-actions Bot requested a review from MissyNym August 6, 2026 08:40
@Monkeke2

Monkeke2 commented Aug 6, 2026

Copy link
Copy Markdown
Author

Finally

@CheffieGithub

Copy link
Copy Markdown
Collaborator

changelog is wrong the opening and closing tags are needed

@ModDownloading ModDownloading left a comment

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.

Seems good to me, just a few changes I spotted! I know having a statue on Voyage doesn't make loads of sense but we do have Mercenaries there so I feel they should have a statue on that map too.

Comment thread code/game/objects/items/servant_bell.dm Outdated
Comment thread code/game/objects/structures/mercstatue.dm Outdated
Comment thread code/game/objects/structures/mercstatue.dm Outdated
Monkeke2 and others added 2 commits August 8, 2026 08:37
Co-authored-by: ModDownloading <dsodium92@gmail.com>
Co-authored-by: ModDownloading <dsodium92@gmail.com>
@github-actions github-actions Bot added Feature adds a new thing Removal What used to be there is no longer there. How sad. labels Aug 8, 2026
@Monkeke2

Monkeke2 commented Aug 8, 2026

Copy link
Copy Markdown
Author

Seems good to me, just a few changes I spotted! I know having a statue on Voyage doesn't make loads of sense but we do have Mercenaries there so I feel they should have a statue on that map too.

The map so small you dont really need to message them, and Archeon mentioned in the discord thread that the mercenaries/adventurers are implied to be hired by the captain.

Comment thread code/game/objects/items/servant_bell.dm Outdated
Comment thread code/game/objects/items/mercenary_ring.dm Outdated
Comment thread code/game/objects/items/mercenary_ring.dm Outdated
@github-actions github-actions Bot added the Merge Conflict This PR has conflicting changes with the main branch and can't be merged label Aug 17, 2026
@Monkeke2

Monkeke2 commented Aug 23, 2026

Copy link
Copy Markdown
Author

Not sure how to notify you, but I did the requested changes a while ago, but they still show up as requested. Can you mark them as done?

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

Labels

Feature adds a new thing Mapping You changed a map file, thank you for your tiles. May require additional approval. Merge Conflict This PR has conflicting changes with the main branch and can't be merged Removal What used to be there is no longer there. How sad. Sprites This affects the appearance of something in game. Such as an item or a wall.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants