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

More jumpskirts #2840

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Conversation

HTMLSystem
Copy link
Contributor

About the PR

I made jumpskirts for prison guard and salv then made formal jumpskirts for chem and epi. Hurray!

Why / Balance

Because jobs only having a jumpsuit version of something but no jumpskirt version is very weird.

Technical details

Sprite stuff, loadout stuff, and lathe recipe stuff

Media

more jumpskirts chem more jumpskirts epi
more jumpskirts prison guard more jumpskirts salv

Requirements

  • I have tested all added content and changes.
  • I have added media to this PR or it does not require an ingame showcase.

Breaking changes

Changelog

🆑

  • add: Added jumpskirts for prison guards, salvagers, chemist, and scientist.

@HTMLSystem HTMLSystem requested review from a team as code owners February 1, 2025 17:40
@github-actions github-actions bot added size/M 64-255 lines Changes: YML Changes any yml files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi S: Needs Review S: Merge Conflict Fix your PR! and removed size/M 64-255 lines labels Feb 1, 2025
Copy link
Contributor

github-actions bot commented Feb 1, 2025

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Copy link
Contributor

github-actions bot commented Feb 1, 2025

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

Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/chemsuitskirt.rsi

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

Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/explorer.rsi

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

Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/prisonguard.rsi

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

Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/scientist_formal.rsi

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

Edit: diff updated after 13bbba0

@github-actions github-actions bot added size/M 64-255 lines and removed S: Merge Conflict Fix your PR! labels Feb 1, 2025
Lyndomen
Lyndomen previously approved these changes Feb 1, 2025
Copy link
Contributor

@Lyndomen Lyndomen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hurray!

@Lyndomen
Copy link
Contributor

Lyndomen commented Feb 1, 2025

Yaml linter fail real, missing locale

Copy link
Contributor

@Radezolid Radezolid left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The JSON needs proper indentation of four spaces, for an example check this:

{
"version": 1,
"license": "CC0-1.0",
"copyright": "Original work by TJohnson.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "rolled-equipped-INNERCLOTHING",
"directions": 4
}
]
}

@HTMLSystem
Copy link
Contributor Author

Real, I'll do these changes probably tomorrow & I will mark them as resolved as I go along.

@HTMLSystem
Copy link
Contributor Author

IT WORKS YES!!!

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 S: Needs Review size/M 64-255 lines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants