Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Conversation

@boodaliboo
Copy link
Contributor

@boodaliboo boodaliboo commented May 16, 2020

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:

@yogstation13-bot yogstation13-bot added Feature This adds new content to the game Icon Change labels May 16, 2020
@github-actions github-actions bot added the Sprites This PR has spriting changes label May 16, 2020
@swissloaf swissloaf added the Awaiting - Action - Maintainer This PR is awaiting an action from a maintainer label May 16, 2020
@boodaliboo boodaliboo changed the title ports knife boxing gloves and knife boxing martial arts from hippie ports knife boxing gloves and knife boxing martial arts from hippie (port) May 18, 2020
@alexkar598
Copy link
Member

Enables greytiding

@alexkar598 alexkar598 closed this May 21, 2020
@yogstation13-bot yogstation13-bot added the DME Edit This PR affects the yogstation.DME file label May 21, 2020
@Hopekz
Copy link
Contributor

Hopekz commented May 21, 2020

reopening for traitor recipe

@Hopekz Hopekz reopened this May 21, 2020
Copy link
Contributor

@Hopekz Hopekz left a 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.

@Hopekz Hopekz merged commit 3dcc316 into yogstation13:master 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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants