Merged
Conversation
* Port Goob Martial Arts Part 1 * minor tweaks to make it work * Port Goob Grabbing Refactor / Rework / Table Slamming * Port Goob Martial Arts Part 2 * ported a Goob mald pr relating to martial arts that's just... good? * another small pr port from Goob * Port Goob Martial Arts Tweak * some more fixes before PR'ing * quick linter fix * second attempt to fix linter fails
Removes non working wall
|
RSI Diff Bot; head commit da18359 merging into 14f8004 Resources/Textures/_Goobstation/Actions/kravmaga.rsi
Resources/Textures/_Goobstation/Clothing/Belt/judobelt.rsi
Resources/Textures/_Goobstation/Clothing/Hands/Gloves/kravgloves.rsi
Resources/Textures/_Goobstation/Objects/Misc/cqc_manual.rsi
Resources/Textures/_Goobstation/Wizard/Objects/scroll.rsi
Resources/Textures/_White/Interface/Alerts/pull.rsi
|
Owner
Author
|
fails not connected to this PR |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
adds goob martial arts
removes wall from ramsmalldrone that doesnt work