-
Notifications
You must be signed in to change notification settings - Fork 338
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
Martial Artist, Prison Guard, Prisoner and Gladiator #21
Merged
Colin-Tel
merged 16 commits into
DeltaV-Station:master
from
FluffiestFloof:martialartist
Sep 19, 2023
Merged
Martial Artist, Prison Guard, Prisoner and Gladiator #21
Colin-Tel
merged 16 commits into
DeltaV-Station:master
from
FluffiestFloof:martialartist
Sep 19, 2023
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
Prisoner is like halfway in wizden so that's a bit funky
RSI Diff Bot; head commit 4e86bab merging into fc05d77 Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi
Resources/Textures/DeltaV/Markers/jobs.rsi
Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi
Resources/Textures/Nyanotrasen/Clothing/Shoes/Misc/geta.rsi
|
Not that specific
For some reason the security officer id card icon is not at the correct place.
Colin-Tel
approved these changes
Sep 19, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All upstream files have comments where changes were made, all tests passed.
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.
About the PR
Adds them jobs.
Job icons and ID icons are separated into DeltaV for less overall duplication and to avoid adding images to the base folders.
Same for the spawner icons.
Why / Balance
Technical details
whitelistRequired and alwaysUseSpawner are commented out due to not existing and probably requiring a bit more work.
Includes the boxing component
Media
Breaking changes
Changelog
🆑