Adds mercenary statues and mercenary rings - #7507

Open

Monkeke2 wants to merge 26 commits into

Monkestation:mainfrom

Monkeke2:MercStatue

Commits on Aug 6, 2026

adds the mercenary statue and rings
Monkeke2
committed
070f7d7
Merge branch 'main' into MercStatue
Monkeke2
committed
e1b5364
Adds statues to maps and changes statue description
Monkeke2
committed
951b509
accidental deletion
Monkeke2
committed
c96fa8c
Empty commit to restart checks
Monkeke2
committed
8d07989
fixes href
Monkeke2
committed
4019795
space indentations
Monkeke2
committed
341c2cb
hopefully fixed item_detail_sanity
Monkeke2
committed
2b8f5d2
attempt number two
Monkeke2
committed
e23f022
Empty commit because checks decided to cancel
Monkeke2
committed
7b85bf8

Commits on Aug 8, 2026

Update servant_bell.dm

Monkeke2
and
ModDownloading
authored
e046afc
Update mercstatue.dm

Monkeke2
and
ModDownloading
authored
2491c50
Changes statue description
Monkeke2
committed
1544039
Removes "sign up" pop-up on voyage
Monkeke2
committed
069aae3

Commits on Aug 11, 2026

Makes the ring a separate thing from the servant bell.
Monkeke2
committed
ec093c4

Commits on Aug 20, 2026

Merge conflicts
Monkeke2
committed
a98d98e
placing the statues again because maps broke
Monkeke2
committed
572f153

Commits on Aug 21, 2026

Merge branch 'main' into MercStatue
Monkeke2
committed
da8db1b
Accidentally removed the campfire icon, somehow.
Monkeke2
committed
8559125

Commits on Aug 27, 2026

Merge branch 'main' into MercStatue
Monkeke2
committed
59dc78d

Commits on Aug 28, 2026

Merge branch 'main' into MercStatue
Monkeke2
committed
ee4dd70
The diffbots have been stuck for 40 minutes
Monkeke2
committed
7811048