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.

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

Aviators PT2 Electric Boogaloo #32

Merged
merged 3 commits into from
Nov 11, 2023
Merged

Aviators PT2 Electric Boogaloo #32

merged 3 commits into from
Nov 11, 2023

Conversation

PursuitInAshes
Copy link
Contributor

About the PR

Adds a new set of sunglasses to the game, aviators. They can be found in the quickthreads and secdrobe. They do not have flash protection. NOTE: Sprite was done by MrGreen, he's been credited accordingly.

Why / Balance

More clothing variety. May need to increase the amount that can be found in quickthreads, but we'll see how quickly they get used.

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase.

Icon:
ShareX_r1iZxfiRVQ

Front Facing:
ShareX_ZNzhucjDTP
Content Client_81es8J20nG

Side Facing:
Content Client_ZXAlZPHJtO
Content Client_G5XBOEoVay

Dropped/Floor
Content Client_4pdwoFvcjS

In Secdrobe:
Content Client_gH0Cs2EByl

In QUickthreads
Content Client_j38r5ZBKtq

@LankLTE
Copy link
Contributor

LankLTE commented Nov 10, 2023

These being in the secdrobe feels kind of weird, given they don’t actually work as sunglasses.

@PursuitInAshes
Copy link
Contributor Author

PursuitInAshes commented Nov 10, 2023

These being in the secdrobe feels kind of weird, given they don’t actually work as sunglasses.

Im fine removing them from the secdrobe, the main reason they are in there is for security to have them if they want, you opposed to me adding them to the quickthreads (increasing them probably to four or five total) and then adding a set to the bardrobe?

@LankLTE
Copy link
Contributor

LankLTE commented Nov 11, 2023

you opposed to me adding them to the quickthreads (increasing them probably to four or five total) and then adding a set to the bardrobe?

I'm fine with that, yeah.

@LankLTE LankLTE merged commit f410392 into cosmatic-drift-14:master Nov 11, 2023
@PursuitInAshes PursuitInAshes deleted the Aviators-2-Electric-Boogaloo branch November 11, 2023 14:08
LankLTE pushed a commit to LankLTE/cosmatic-drift that referenced this pull request Nov 12, 2023
* Hey look! My changes are back. Test fails should be fixed too.

* Requested Changes (Remove from secdrobe -> Add to bardrobe)

* Upped to four
LankLTE pushed a commit that referenced this pull request Nov 12, 2023
* Hey look! My changes are back. Test fails should be fixed too.

* Requested Changes (Remove from secdrobe -> Add to bardrobe)

* Upped to four
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants