-
Notifications
You must be signed in to change notification settings - Fork 193
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
Goob Mechs #1611
Open
sleepyyapril
wants to merge
13
commits into
Simple-Station:master
Choose a base branch
from
sleepyyapril:mech-ops
base: master
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
Goob Mechs #1611
+4,701
−106
Conversation
This file contains 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
Co-authored-by: gluesniffler <[email protected]>
github-actions
bot
added
Changes: C#
Changes any cs files
Changes: Localization
Changes any ftl files
Changes: YML
Changes any yml files
Changes: Sprite
Changes any png or json in an RSI
Status: Needs Review
Someone please review this
labels
Jan 20, 2025
RSI Diff Bot; head commit 46d80a6 merging into 82a26e2 Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi
Resources/Textures/Objects/Specific/Mech/mecha_equipment.rsi
Resources/Textures/_Goobstation/Objects/Specific/Mech/clarke_construction.rsi
Resources/Textures/_Goobstation/Objects/Specific/Mech/durand_construction.rsi
Resources/Textures/_Goobstation/Objects/Specific/Mech/gygax_construction.rsi
Resources/Textures/_Goobstation/Objects/Specific/Mech/ripleymkii_construction.rsi
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Signed-off-by: sleepyyapril <[email protected]>
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Signed-off-by: sleepyyapril <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Changes: C#
Changes any cs files
Changes: Localization
Changes any ftl files
Changes: Sprite
Changes any png or json in an RSI
Changes: YML
Changes any yml files
Status: Needs Review
Someone please review this
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.
Description
We like mechs here, yeah?
Changelog
🆑 Mocho, John Space