Port(ish) of Den Jackets, Jumpsuit, Shoe#211
Conversation
|
RSI Diff Bot; head commit c0bb979 merging into e314aa1 Resources/Textures/_DEN/Clothing/OuterClothing/Coats/spots_jacket_blue.rsi
Resources/Textures/_DEN/Clothing/OuterClothing/Coats/spots_jacket_red.rsi
Resources/Textures/_DEN/Clothing/Shoes/Misc/high_tops.rsi
Resources/Textures/_DEN/Clothing/Uniforms/Jumpsuit/strainedshorts.rsi
|
|
What makes this not quite a port is that Den has colorable loadout items, I believe a carry-over from EE that this fork does not possess. As such, these jackets were pre-colored red and blue. Same with the shoes and strained jort things, had to color them from B-W to something. I also had to change the formatting of the loadout YML as it was not compatible with the Wizden-base way of setting it up. As such, this is not a direct rip but more of a transition of free assets, recolored to fit our system |
|
Drafting for now, to code in the ability to switch between variants as opposed to making them separate entities |
|
Fixed - Now Spots jackets contain both variants |
|
APPROVED |
| - type: loadout | ||
| id: StrainedShorts | ||
| price: 0 # Mono | ||
| equipment: | ||
| jumpsuit: ClothingUniformStrainedShorts |
There was a problem hiding this comment.
This one kinda concern me since the outfit is very suggestive and we don't want suggestive stuff to be on the front. Will be discussed with other maintainers, the item is fine just the way it's obtained rn.
There was a problem hiding this comment.
I would like to argue that there are still laws and rules in place against public nudity during consent rulings. It is an opportunity for things like bras to take stage, or for overwear to take charge on the upper half of the body. I feel this is a case where it takes trust in player agency to use this in their private time, as while sexuality isn't the forefront it also isn't outright banned, and how they use the shorts is ultimately to their discretion so long as they still abide by the other laws/rules during gameplay.
There was a problem hiding this comment.
Ultimately I would sooner drop the shorts than pull the PR out, but I would ask at least some consideration on inclusion.
There was a problem hiding this comment.
Aye it's gonna be discussed, again the item is fine it's just the way it's obtained by loadout is a bit concerning because we don't want suggestive stuff in the front.. But I've tested the PR itself and it looks good.
There was a problem hiding this comment.
Okidoki, just let me know whether to remove it from loadout or not and I am happy to comply. The jackets are my greatest concern
DDrakov
left a comment
There was a problem hiding this comment.
I've tested it and as per discussion, this have my approval. One more maintainer approval then they or I could merge it
mnva0
left a comment
There was a problem hiding this comment.
Thank you for this PR! Sorry about holding things up with my pedantry. Laaargely just whatever commenting and namespacing things I noticed
| - type: Butcherable | ||
| butcheringType: Knife | ||
| spawned: | ||
| - id: ClothingOuterCoatRedSpotsJacket |
There was a problem hiding this comment.
I'm not sure why this butchers into itself? This seems like a now-useless holdover from Den used to switch between two variants. This logic is now handled by folding, so you could probably just comment this component out (with a # Triad removal block comment or similar) to restore the preferred "clothing should butcher into cloth" behavior
| - type: Butcherable | ||
| butcheringType: Knife | ||
| spawned: | ||
| - id: ClothingOuterCoatBlueSpotsJacket |
There was a problem hiding this comment.
I'm not sure why this butchers into itself? This seems like a now-useless holdover from Den used to switch between two variants. This logic is now handled by folding, so you could probably just comment this component out (with a # Triad removal block comment or similar) to restore the preferred "clothing should butcher into cloth" behavior
| @@ -0,0 +1,5 @@ | |||
| - type: loadout | |||
| id: StrainedShorts | |||
| price: 0 # Mono | |||
There was a problem hiding this comment.
We aren't Monolith, so this comment should probably be fixed
There was a problem hiding this comment.
Copy-paste strikes yet again 😔
There was a problem hiding this comment.
Depending on how much of this loadout entry was rewritten, it may be worth moving this into Triad namespace. If it's about the same, you may resolve this comment
| @@ -8,3 +8,6 @@ fold-flip-verb = Flip | |||
|
|
|||
| fold-zip-verb = Zip up | |||
| fold-unzip-verb = Unzip | |||
|
|
|||
| fold-verb-clothing-jacket = Adjust jacket | |||
| unfold-verb-clothing-jacket = Adjust jacket | |||
There was a problem hiding this comment.
These two do not match the current state of upstream as of https://github.com/space-wizards/space-station-14/blob/master/Resources/Locale/en-US/foldable/components/foldable-component.ftl, which leads me to believe that this was changed for logical consistency
Please add a Triad comment above these if they're Triad-specific changes (on a separate line because FTL does not support in-line comments). Correct me if I'm wrong though
| { | ||
| "version": 1, | ||
| "license": "CC0-1.0", | ||
| "copyright": "Original bomber jacket by Sha-Seng (Github), edited by octofoss (Github) with permission, recolored by Sketch (Discord)", |
There was a problem hiding this comment.
I believe giving full Discord names (in this case, etch_sketch) is more common than nicknames? If this is not preferred, using the name of your GitHub account would be sufficient I think
|
|
||
| - type: entity | ||
| abstract: true | ||
| id: ClothingFoldableBase |
There was a problem hiding this comment.
I wasn't able to find any prior instance of this particular spelling in either Den or Wizden, assuming I got my Git commands for digging up histories right
ClothingUniformFoldableBase is how it is upstream and on the current version of Den, though I did not dig through commits the hard way to learn this. I'm kind of curious why this doesn't match?
There was a problem hiding this comment.
This file has also likely changed enough to warrant moving it into Triad namespace. It's probably just original at this point?
| @@ -0,0 +1,31 @@ | |||
| - type: entity | |||
| parent: [ClothingOuterStorageBase, ClothingFoldableBase] | |||
There was a problem hiding this comment.
This line seems changed from Den? I think there should be a Triad comment here since you apparently added new,, Triad-specific compatibility here
| amount: 1 | ||
|
|
||
| - type: entity | ||
| parent: [ClothingOuterStorageBase, ClothingFoldableBase] |
There was a problem hiding this comment.
This line seems changed from Den? I think there should be a Triad comment here since you apparently added new,, Triad-specific compatibility here


















About the PR
Added more civilian clothing options to the loadout menu
Why / Balance
Too much milsim larp, about time the TDF Civilian line see some rep B) (And also because someone requested it)
Media
Requirements
How to test
Check loadout under outer clothing for jacket and 3 other variants
Check under jumpsuit for strained shorts
Check under shoes for hightops
Switch between species to ensure a reasonable sprite while wearing them
Rotate the species to verify every direction looks viable
Hold the item in hand to verify inhand sprites looks correct
Breaking changes
N/A
Changelog
🆑