Skip to content
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
merged 16 commits into from
Sep 19, 2023

Conversation

FluffiestFloof
Copy link
Contributor

@FluffiestFloof FluffiestFloof commented Sep 15, 2023

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

ss (2023-09-18 at 12 30 01)
ss (2023-09-18 at 12 00 06)
ss (2023-09-18 at 12 00 12)
ss (2023-09-18 at 12 00 18)

Breaking changes

Changelog

🆑

  • add: Martial Artists, Prison Guards, Prisoners and Gladiators are back.

@github-actions
Copy link
Contributor

github-actions bot commented Sep 15, 2023

RSI Diff Bot; head commit 4e86bab merging into fc05d77
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi

State Old New Status
nyanoGladiator Added
nyanoMartialArtist Added
nyanoPrisonGuard Added

Resources/Textures/DeltaV/Markers/jobs.rsi

State Old New Status
green Added
nyanogladiator Added
nyanomartialartist Added
nyanoprisoner Added
nyanoprisonguard Added

Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi

State Old New Status
blue-inhand-left Added
blue-inhand-right Added
centcom Added
default-inhand-left Added
default-inhand-right Added
default Added
gold-inhand-left Added
gold-inhand-right Added
gold Added
nyanogladiator Added
nyanomartialartist Added
nyanoprisoner Added
nyanoprisonguard Added
orange-inhand-left Added
orange-inhand-right Added
orange Added
silver-inhand-left Added
silver-inhand-right Added
silver Added

Resources/Textures/Nyanotrasen/Clothing/Shoes/Misc/geta.rsi

State Old New Status
equipped-FEET Added
icon Added
inhand-left Added
inhand-right Added

Edit: diff updated after 4e86bab

@FluffiestFloof FluffiestFloof marked this pull request as ready for review September 16, 2023 12:29
Copy link
Contributor

@Colin-Tel Colin-Tel left a 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.

@Colin-Tel Colin-Tel merged commit 795fe5c into DeltaV-Station:master Sep 19, 2023
14 checks passed
DeltaV-Bot pushed a commit that referenced this pull request Sep 19, 2023
@FluffiestFloof FluffiestFloof deleted the martialartist branch September 19, 2023 14:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants