This repository was archived by the owner on May 22, 2025. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 457
ports knife boxing gloves and knife boxing martial arts from hippie (port) #8528
Merged
Conversation
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
JamieD1
approved these changes
May 16, 2020
Member
|
Enables greytiding |
Contributor
|
reopening for traitor recipe |
Hopekz
approved these changes
May 28, 2020
Contributor
Hopekz
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Resolved your merge conflict for you. All good.
yogstation13-bot
added a commit
that referenced
this pull request
May 28, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Labels
Awaiting - Action - Maintainer
This PR is awaiting an action from a maintainer
DME Edit
This PR affects the yogstation.DME file
Feature
This adds new content to the game
Sprites
This PR has spriting changes
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.
https://github.com/HippieStation/HippieStation/pull/7690 original pr
"can be constructed out of 1 pair of boxing gloves of any color (they all become red due to the influence of Armok on this plane of reality) and 2 knives. does between 9-13 brute damage (for humans)" (from original pr)
Changelog
// maintainer edit: fixed changelog
🆑 zamolxius
rscadd: ported knife boxing gloves and its corresponding martial arts
/:cl: