forked from Simple-Station/Einstein-Engines
-
Notifications
You must be signed in to change notification settings - Fork 6
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
Sprites again #2
Merged
spess-empyrean
merged 39 commits into
vgstation-coders:master
from
Inorien:sprites-again
Jan 12, 2025
Merged
Sprites again #2
spess-empyrean
merged 39 commits into
vgstation-coders:master
from
Inorien:sprites-again
Jan 12, 2025
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 7f880d2 merging into 7f32e00 Resources/Textures/Clothing/Head/Hats/hoshat.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi
Resources/Textures/Objects/Economy/cash.rsi
Resources/Textures/Objects/Fun/pai.rsi
Resources/Textures/Objects/Materials/ore.rsi
Resources/Textures/Objects/Misc/bedsheets.rsi
Resources/Textures/Objects/Misc/bureaucracy.rsi
Resources/Textures/Objects/Misc/fire_extinguisher.rsi
Resources/Textures/Objects/Misc/stamps.rsi
Resources/Textures/Objects/Misc/stock_parts.rsi
Resources/Textures/Objects/Power/power_cells.rsi
Resources/Textures/Objects/Specific/Atmos/gasanalyzer.rsi
Resources/Textures/Objects/Specific/Chemistry/beaker.rsi
Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi
Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi
Resources/Textures/Objects/Specific/Chemistry/syringe.rsi
Resources/Textures/Objects/Specific/Chemistry/vial.rsi
Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi
Resources/Textures/Objects/Specific/Janitorial/light_replacer.rsi
Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi
Resources/Textures/Objects/Specific/Medical/healthanalyzer.rsi
Resources/Textures/Objects/Specific/Medical/medical.rsi
Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi
Resources/Textures/Objects/Storage/boxes.rsi
|
this should be fine to merge whenever |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
un-TG the shit as much as i can bear for the third time
also mostly fix the weird broken table thing from the playtest while at it
also some hardsuits
How it was tested
insufficiently
the testing is trivial and left as an exercise to the player (i am not checking thousands of sprites myself)
Changelog
🆑