Socks, Arm-Warmers, and Uniforms #116
Merged
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
Signed-off-by: Dakota Haven <[email protected]>
Signed-off-by: Dakota Haven <[email protected]>
Signed-off-by: Dakota Haven <[email protected]>
Signed-off-by: Dakota Haven <[email protected]>
Signed-off-by: Dakota Haven <[email protected]>
github-actions
bot
added
Status: Needs Review
Floof-Station-Bot
changed the title
|
RSI Diff Bot; head commit 60b457d merging into 6784811 Resources/Textures/Floof/Clothing/Departmental/Command/captsocks.rsi
Resources/Textures/Floof/Clothing/Departmental/Command/captthong.rsi
Resources/Textures/Floof/Clothing/Departmental/Command/captwarmer.rsi
Resources/Textures/Floof/Clothing/Departmental/Command/commandsocks.rsi
Resources/Textures/Floof/Clothing/Departmental/Command/commandthong.rsi
Resources/Textures/Floof/Clothing/Departmental/Command/commandwarmer.rsi
Resources/Textures/Floof/Clothing/Departmental/Engineering/engisocks.rsi
Resources/Textures/Floof/Clothing/Departmental/Engineering/engithong.rsi
Resources/Textures/Floof/Clothing/Departmental/Engineering/engiwarmer.rsi
Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainmantle.rsi
Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainmantlehood.rsi
Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainsocks.rsi
Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainthong.rsi
Resources/Textures/Floof/Clothing/Departmental/Epistemics/chaplainwarmer.rsi
Resources/Textures/Floof/Clothing/Departmental/Epistemics/episocks.rsi
Resources/Textures/Floof/Clothing/Departmental/Epistemics/epithong.rsi
Resources/Textures/Floof/Clothing/Departmental/Epistemics/epiwarmer.rsi
Resources/Textures/Floof/Clothing/Departmental/Logistics/logisocks.rsi
Resources/Textures/Floof/Clothing/Departmental/Logistics/logithong.rsi
Resources/Textures/Floof/Clothing/Departmental/Logistics/logiwarmer.rsi
Resources/Textures/Floof/Clothing/Departmental/Medical/medicalsocks.rsi
Resources/Textures/Floof/Clothing/Departmental/Medical/medicalthong.rsi
Resources/Textures/Floof/Clothing/Departmental/Medical/medicalwarmer.rsi
Resources/Textures/Floof/Clothing/Departmental/Security/secsocks.rsi
Resources/Textures/Floof/Clothing/Departmental/Security/secthong.rsi
Resources/Textures/Floof/Clothing/Departmental/Security/secwarmer.rsi
Resources/Textures/Floof/Clothing/Departmental/Service/janitorsocks.rsi
Resources/Textures/Floof/Clothing/Departmental/Service/janitorthong.rsi
Resources/Textures/Floof/Clothing/Departmental/Service/janitorwarmer.rsi
Resources/Textures/Floof/Clothing/Departmental/Service/servicesocks.rsi
Resources/Textures/Floof/Clothing/Departmental/Service/servicethong.rsi
Resources/Textures/Floof/Clothing/Departmental/Service/servicewarmer.rsi
Resources/Textures/Floof/Clothing/Head/hoodmarshoodie.rsi
Resources/Textures/Floof/Clothing/Head/sexcompcirclet.rsi
Resources/Textures/Floof/Clothing/OuterClothing/Misc/beltedouterwear.rsi
Resources/Textures/Floof/Clothing/OuterClothing/Misc/marshoodie.rsi
Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltbronze.rsi
Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltgold.rsi
Resources/Textures/Floof/Clothing/OuterClothing/Misc/sexcompbeltsilver.rsi
Resources/Textures/Floof/Clothing/OuterClothing/Misc/transparentouterwear.rsi
Resources/Textures/Floof/Clothing/Under/Gloves/beewarmer.rsi
Resources/Textures/Floof/Clothing/Under/Gloves/codervalidwarmer.rsi
Resources/Textures/Floof/Clothing/Under/Gloves/coderwarmer.rsi
Resources/Textures/Floof/Clothing/Under/Gloves/plainwarmer.rsi
Resources/Textures/Floof/Clothing/Under/Gloves/sexcompbluegloves.rsi
Resources/Textures/Floof/Clothing/Under/Gloves/sexcompredgloves.rsi
Resources/Textures/Floof/Clothing/Under/Gloves/stripewarmerpurple.rsi
Resources/Textures/Floof/Clothing/Under/Gloves/stripewarmerrainbow.rsi
Resources/Textures/Floof/Clothing/Under/Gloves/stripewarmerwhite.rsi
Resources/Textures/Floof/Clothing/Under/Socks/plainsocks.rsi
Resources/Textures/Floof/Clothing/Under/Socks/sexcompblueboots.rsi
Resources/Textures/Floof/Clothing/Under/Socks/sexcompredboots.rsi
Resources/Textures/Floof/Clothing/Under/Socks/stripesockspurple.rsi
Resources/Textures/Floof/Clothing/Under/Socks/stripesocksrainbow.rsi
Resources/Textures/Floof/Clothing/Under/Socks/stripesockswhite.rsi
Resources/Textures/Floof/Clothing/Uniforms/beethong.rsi
Resources/Textures/Floof/Clothing/Uniforms/coderthong.rsi
Resources/Textures/Floof/Clothing/Uniforms/codervalidthong.rsi
Resources/Textures/Floof/Clothing/Uniforms/loinclothblack.rsi
Resources/Textures/Floof/Clothing/Uniforms/loinclothwhite.rsi
Resources/Textures/Floof/Clothing/Uniforms/plainthong.rsi
Resources/Textures/Floof/Clothing/Uniforms/reotasuit.rsi
Resources/Textures/Floof/Clothing/Uniforms/sexcompblue.rsi
Resources/Textures/Floof/Clothing/Uniforms/sexcompred.rsi
Resources/Textures/Floof/Clothing/Uniforms/stripethongpurple.rsi
Resources/Textures/Floof/Clothing/Uniforms/stripethongrainbow.rsi
Resources/Textures/Floof/Clothing/Uniforms/stripethongwhite.rsi
|
FoxxoTrystan
requested changes
Aug 17, 2024
There was a problem hiding this comment.
Self-Insert request approval of @Memeji But even maybe @Fansana as im not sure if we allow such.
But this will be @Memeji call.
Metafiles for textures need to have more information on the copyright, at least provide the discordID saying This is the discord ID.
Others changes suggested below, i will say im not a fan do give more item in lockers, its already more like a mess.
Resources/Prototypes/Floof/Entities/Clothing/OuterClothing/MiscOuterwear.yml
Outdated
Show resolved
Hide resolved
Comment on lines
14
to
15
| unequipDelay: 0 | ||
|
|
There was a problem hiding this comment.
Suggested change
| unequipDelay: 0 | |
| unequipDelay: 0 | |
| - type: Tag #DeltaV, needed for species with nonhuman legs/can only wear skirts | |
| tags: | |
| - Skirt | |
This is needed so harpies can wear loincloth.`
There was a problem hiding this comment.
Ah! Should I actually add that to most of the uniforms that don't cover the legs? Cause the thongs are pretty small uniform sprites that don't really go lower then the pelvis.
Resources/Prototypes/Floof/Entities/Clothing/Uniforms/base_uniform.yml
Outdated
Show resolved
Hide resolved
|
Okay! I'll pull the items out of the lockers, since they have been added elsewhere, so it's not as messy. And I will work on going through the Meta files and revising the copyright. |
- Removed added locker inventory - Added the Skirt tag to loincloths - Renamed uniform and hood to make it generic Signed-off-by: Dakota Haven <[email protected]>
FoxxoTrystan
requested changes
Aug 17, 2024
-Fixed the RSI error due to a Metafile inconsistency. Signed-off-by: Dakota Haven <[email protected]>
FoxxoTrystan
requested changes
Aug 17, 2024
|
Looks like you put "ClothingClothingStripedUniformThongWhite". I believe you have an extra clothing in there, and that's why the test is failing. |
-Fixed a code error typo Signed-off-by: Dakota Haven <[email protected]>
Yeah. Saw that, I fixed them! Hope that was all. |
ShatteredSwords
approved these changes
Aug 17, 2024
| cost: 2 | ||
| exclusive: true | ||
| items: | ||
| - ClothingClothingUniformStripedThongWhite |
There was a problem hiding this comment.
Yup, here's the error!
|
I had no idea that made me a reviewer in the top, that's kinda funny |
Fixed some fiber type errors
|
@FoxxoTrystan That test error doesn't look legit |
Yeah. I looked through and I can't see anything that would be from my stuff. Hmm. |
|
Yeah that error is not legit, but still i need to relunch the test until its passes. |
FoxxoTrystan
approved these changes
Aug 18, 2024
Merged
Memeji
approved these changes
Aug 18, 2024
|
Why was this merged when it still had tasks unchecked aaaaaa |
Task unchecked does not mean unfinished PR, this PR was open and not a draft, and current phase looked fine. |
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.
Description
Just adding in a bunch of socks, arm-warmers, and uniforms. A few generic ones, and a bunch of departmental ones. Also set up to add in a few more at a later date. This includes adding them to loadouts, the uniform printer, and vendors.
TODO
Media
fit
Changelog
🆑 Dakota Haven