Adds Clothing / sprites to various jobs. #18
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
fixed girder.yml
…dache and doesnt actually prevent upstream conflicts
… sprite on mapping mode warden spawner
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
RSI Diff Bot; head commit 0bcd0c3 merging into 76cabcd Resources/Textures/Clothing/Head/Hardsuits/sp14liberator.rsi
Resources/Textures/Clothing/Head/Hardsuits/sp14liberatorcommander.rsi
Resources/Textures/Clothing/Head/Hardsuits/sp14warden.rsi
Resources/Textures/Clothing/Head/Hats/sp14wardencap.rsi
Resources/Textures/Clothing/Neck/Cloaks/sp14liberatorcommander.rsi
Resources/Textures/Clothing/Neck/Cloaks/sp14warden.rsi
Resources/Textures/Clothing/OuterClothing/Armor/sp14warden_carapace.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14liberator.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14liberatorcommander.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/sp14warden.rsi
Resources/Textures/Clothing/Uniforms/Jumpskirt/sp14wardens.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14liberator.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14maintenancetech.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/sp14warden.rsi
Resources/Textures/Markers/jobs.rsi
Resources/Textures/Structures/Storage/closet.rsi
|
|
forgot to revert my branch. its over. |
|
fixing stupid pr mistake |
… am no gitbash sorcerer.
|
Conflict is me changing the sprite for the warden spawner for the sake of my eyes. TO DO:
|
Truoizys
requested changes
Aug 7, 2024
There was a problem hiding this comment.
definitions for new clothing and hardsuits should be in separate files to ss14 clothing.
e.g. Clothing/Head/SP14/hardsuit-helmets.yml
for the sake of consistency also might be worth changing ids from including SP14 to just including SP. (might do it myself in a sec)
Really cooked here boss! love the sprites, love the tooltips.
Truoizys
added
the
Status: Changes Needed
|
will be ready for merge once ive actually tested this. changes done. |
Truoizys
requested changes
Aug 22, 2024
There was a problem hiding this comment.
as much as it may help your skyblock trading coflmod probably won't be any use in this repo
There was a problem hiding this comment.
I WAS WONDERING WHERE I PUT IT HAHAHAHA
Comment on lines
-413
to
+414
| name: warden's uniform | ||
| description: A formal security suit for officers complete with Nanotrasen belt buckle. | ||
| name: chief custodial officer's uniform | ||
| description: A formal security skirt for officers complete with Nanotrasen belt buckle. |
There was a problem hiding this comment.
gunna need to separate these to a sp14 file
| name: warden's uniform | ||
| name: chief custodial officer's uniform |
Comment on lines
545
to
563
| - type: construction | ||
| name: plastitanium window | ||
| id: PlastitaniumWindow | ||
| graph: Window | ||
| startNode: start | ||
| targetNode: plastitaniumWindow | ||
| category: construction-category-structures | ||
| canBuildInImpassable: true | ||
| description: Extremely hardy window to keep an eye on prisoners with little risk of them reaching you. | ||
| conditions: | ||
| - !type:EmptyOrWindowValidInTile | ||
| - !type:NoWindowsInTile | ||
| icon: | ||
| sprite: Structures/Windows/plastitanium_window.rsi | ||
| state: full | ||
| objectType: Structure | ||
| placementMode: SnapgridCenter | ||
| canRotate: false | ||
|
|
There was a problem hiding this comment.
should this still be here?
|
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
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
Clothes for unique SP14 roles.
Why / Balance
cooooooooool asf.
Media
Breaking changes
Changelog