-
Notifications
You must be signed in to change notification settings - Fork 48
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
More Pets! #151
Draft
SomeCabbage
wants to merge
29
commits into
Simple-Station:master
Choose a base branch
from
SomeCabbage:more-pets
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.
Draft
More Pets! #151
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
RSI Diff Bot; head commit fe33e93 merging into 4d330a7 Resources/Textures/Objects/Tanks/anesthetic.rsi
Resources/Textures/Objects/Tanks/emergency.rsi
Resources/Textures/Objects/Tanks/emergency_double.rsi
Resources/Textures/Objects/Tanks/emergency_yellow.rsi
Resources/Textures/SimpleStation14/Clothing/Belt/shirowebbing.rsi
Resources/Textures/SimpleStation14/Mobs/Pets/fox.rsi
Resources/Textures/SimpleStation14/Mobs/Pets/hughes.rsi
Resources/Textures/SimpleStation14/Mobs/Pets/jackparker.rsi
Resources/Textures/SimpleStation14/Mobs/Pets/mc.rsi
Resources/Textures/SimpleStation14/Mobs/Pets/problems.rsi
Resources/Textures/SimpleStation14/Mobs/Pets/shiro.rsi
Resources/Textures/SimpleStation14/Objects/Consumable/Food/shiro.rsi
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Changes: Localization
Changes any ftl files
Changes: Sprite
Changes any png or json in an rsi
Changes: YML
Changes any yml files
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
As you would expect this adds in some more pets.
TODO
Media
uh no media yet
Changelog
🆑 SomeCabbage
(make changelog better when more progress is made)