-
Notifications
You must be signed in to change notification settings - Fork 81
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
Socks, Arm-Warmers, and Uniforms #116
Conversation
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]>
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
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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
unequipDelay: 0 | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Test fails are legit, this need to be resolved.
-Fixed the RSI error due to a Metafile inconsistency. Signed-off-by: Dakota Haven <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Test fails are still valid.
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. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice!
cost: 2 | ||
exclusive: true | ||
items: | ||
- ClothingClothingUniformStripedThongWhite |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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. |
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. |
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