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.

Sign up for GitHub

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

Jump to bottom

Pride Scarves #34448

Merged
merged 8 commits into from
Jan 17, 2025
Merged

Pride Scarves #34448

merged 8 commits into from
Jan 17, 2025
+381 −9

Conversation

southbridge-fur
Copy link
Contributor

About the PR

Swapped out the pride cloaks in the Pride-O-Mat for pride scarves.
These scarves are also being moved upstream from
cosmatic-drift-14/cosmatic-drift#216
and
cosmatic-drift-14/cosmatic-drift#467

Why / Balance

Admins wanted the cloaks to feel special, and these scarves are a nice addition to the game.

Technical details

Cherry picked two PRs from another branch and adjusted them to the standard folders for upstream clothing.

Media

image

Requirements

Breaking changes

Changelog

🆑

  • tweak: Pride-O-Mats now have scarves instead of cloaks

PursuitInAshes and others added 7 commits January 14, 2025 19:56
@PursuitInAshes @southbridge-fur
More scarfs (space-wizards#216)
4fac174 
* Sprites + Colored Scarf Implimentation

Doesn't include into quickthreads or other clothing vendors

* File Paths are important

* Metas, items exist, winterdrobe

I'm iffy on them being in the winterdrobe but the other option is quickthreads so idk

* File Path Fix

* Typo fix
@BackeTako @southbridge-fur
Resolved merge conflict
9774cbd
@southbridge-fur
Moved scarves around
dc38e24
@southbridge-fur
Moved scarf textures out of the _CD directory
cb3f1e4
@southbridge-fur
Removed final CD folder
5a2a5c0
@southbridge-fur
Removed extra scarfs
5b79074
@southbridge-fur
Removed extra scarfs, again
8a19f6a
@github-actions github-actions bot added S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. size/M Denotes a PR that changes 100-999 lines. Changes: No C# Changes: Requires no C# knowledge to review or fix this item. Changes: Sprites Changes: Might require knowledge of spriting or visual design. and removed S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. labels Jan 15, 2025
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 15, 2025 •
edited
Loading

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

Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/ace.rsi

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

Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aro.rsi

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

Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/bi.rsi

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

Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/gay.rsi

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

Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/inter.rsi

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

Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/lesbian.rsi

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

Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/non.rsi

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

Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/pan.rsi

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

Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/rainbow.rsi

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

Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/trans.rsi

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

Edit: diff updated after dac39f5

@K-Dynamic
Copy link
Contributor

The exact reason we don't give more cloaks out is because it hides player silhouettes and what they're wearing

@TeenSarlacc
Copy link
Contributor

holy shit, long bacon store real

@Boaz1111 Boaz1111 added P3: Standard Priority: Default priority for repository items. T: New Feature Type: New feature or content, or extending existing content DB: Beginner Friendly Difficulty: Great for beginners. Unambiguous in scope, and explains how to achieve the result. A: Art Area: Art with no implications for other areas. labels Jan 15, 2025
@Boaz1111 Boaz1111 self-requested a review January 15, 2025 12:54
@github-actions github-actions bot added the S: Needs Review Status: Requires additional reviews before being fully accepted label Jan 15, 2025
Boaz1111
Boaz1111 approved these changes Jan 15, 2025
View reviewed changes
Copy link
Contributor

@Boaz1111 Boaz1111 left a comment

Choose a reason for hiding this comment

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

Looks good, works in game, will still need art director approval for the sprites.

@Boaz1111 Boaz1111 added the S: Approved Status: Reviewed and approved by at least one maintainer; a PR may require another approval. label Jan 15, 2025
@Emisse
Copy link
Contributor

Emisse commented Jan 16, 2025

art approval

slarticodefast
slarticodefast approved these changes Jan 17, 2025
View reviewed changes
Copy link
Member

@slarticodefast slarticodefast left a comment

Choose a reason for hiding this comment

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

Thank you for your contribution!

@slarticodefast slarticodefast merged commit 8295bfb into space-wizards:master Jan 17, 2025
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@slarticodefast slarticodefast slarticodefast approved these changes

@Boaz1111 Boaz1111 Boaz1111 approved these changes

@Emisse Emisse Emisse approved these changes

Assignees
No one assigned
Labels
A: Art Area: Art with no implications for other areas. Changes: No C# Changes: Requires no C# knowledge to review or fix this item. Changes: Sprites Changes: Might require knowledge of spriting or visual design. DB: Beginner Friendly Difficulty: Great for beginners. Unambiguous in scope, and explains how to achieve the result. P3: Standard Priority: Default priority for repository items. S: Approved Status: Reviewed and approved by at least one maintainer; a PR may require another approval. S: Needs Review Status: Requires additional reviews before being fully accepted size/M Denotes a PR that changes 100-999 lines. T: New Feature Type: New feature or content, or extending existing content
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@southbridge-fur @K-Dynamic @TeenSarlacc @Emisse @Boaz1111 @slarticodefast @PursuitInAshes @BackeTako