forked from Darkrp-community/OpenKeep
-
Notifications
You must be signed in to change notification settings - Fork 372
Adds mercenary statues and mercenary rings #7507
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Monkeke2
wants to merge
24
commits into
Monkestation:main
Choose a base branch
from
Monkeke2:MercStatue
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 10 commits
Commits
Show all changes
24 commits
Select commit
Hold shift + click to select a range
070f7d7
adds the mercenary statue and rings
Monkeke2 e1b5364
Merge branch 'main' into MercStatue
Monkeke2 951b509
Adds statues to maps and changes statue description
Monkeke2 c96fa8c
accidental deletion
Monkeke2 8d07989
Empty commit to restart checks
Monkeke2 4019795
fixes href
Monkeke2 341c2cb
space indentations
Monkeke2 2b8f5d2
hopefully fixed item_detail_sanity
Monkeke2 e23f022
attempt number two
Monkeke2 7b85bf8
Empty commit because checks decided to cancel
Monkeke2 e046afc
Update servant_bell.dm
Monkeke2 2491c50
Update mercstatue.dm
Monkeke2 1544039
Changes statue description
Monkeke2 069aae3
Removes "sign up" pop-up on voyage
Monkeke2 ec093c4
Makes the ring a separate thing from the servant bell.
Monkeke2 1249403
Requested changes + proper status effect for the ring instead of the …
Monkeke2 a4067bc
Requested changes + proper status effect for the ring instead of the …
Monkeke2 e604de2
Merge branch 'MercStatue' of https://github.com/Monkeke2/monkelin int…
Monkeke2 617f539
Merge branch 'main' into MercStatue
Monkeke2 a98d98e
Merge conflicts
Monkeke2 572f153
placing the statues again because maps broke
Monkeke2 da8db1b
Merge branch 'main' into MercStatue
Monkeke2 8559125
Accidentally removed the campfire icon, somehow.
Monkeke2 59dc78d
Merge branch 'main' into MercStatue
Monkeke2 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.