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

Fuck you *Ungreens your Peacekeepers* #20053

Merged
merged 14 commits into from
Aug 19, 2023

Conversation

Scrambledeggs00
Copy link
Contributor

@Scrambledeggs00 Scrambledeggs00 commented Aug 14, 2023

Document the changes in your pull request

Turns the Peacekeeper ERT from the green menace into the space UN by giving their equipment unique sprites.
All new items added in by this PR have no stat changes from their original versions and are added to further the new blue and white color scheme.
Only change that affects other ERTs is the new sprite for the tactical breath mask as multiple ERTs use them, though I believe it to be basic enough to fit in with their gear.
I've tested it and, as far as I can tell, all sprites are implemented correctly and do show up on the officer, heavy, and commander roles.

Spriting

Mob Sprites:
PeacekeeperClothing
PeacekeeperUniforms
Peacekeepermob1
Peacekeepermob2m

Object Sprites:
PeacekeeperObjects

Animated Sprites:
PeacekeeperBatonActive
PeacekeeperBatonActiveMob

Wiki Documentation

Peacekeeper's ERT images on the Wiki should be changed to have their newly colored equipment

Changelog

🆑
rscadd: Peacekeeper helm, belt, vest, and uniforms added
imageadd: Peacekeeper riot suit, helm, beret, tactical stunprod, and tactical breath mask have new sprites
imagedel: Most Peacekeeper gear is no longer green tinted Security gear
/:cl:

@Scrambledeggs00 Scrambledeggs00 requested a review from a team as a code owner August 14, 2023 22:40
@Yogbot-13 Yogbot-13 added Feature This adds new content to the game Sprites This PR has spriting changes labels Aug 14, 2023
@MajManatee
Copy link
Contributor

MajManatee commented Aug 15, 2023

Man literally stole my unique item.
because of that i like everything except the beret

@azzzertyy
Copy link
Contributor

agreed berets colours are off from the other items

@Scrambledeggs00
Copy link
Contributor Author

Man literally stole my unique item. because of that i like everything except the beret

Sprite-0001
Top is this PR's beret, bottom is yours.
The only thing in common is that they're both blue with gold insignias. Besides that, yours is a different, brighter blue, has a bigger insignia, and is animated. They're similar, but I used the HoS beret for mine and just added a brighter version of the vest's blue while yours is a more modified beret with a bigger insignia and more subtle shading for the object sprite.
image

@Scrambledeggs00
Copy link
Contributor Author

agreed berets colours are off from the other items

The beret's blue is just a lighter shade of blue than the vest's blue, with the difference between the beret's darkest blue and the vest's brightest blue being 4 value. The reason why is because most cloth items are brighter than items that are clearly armor, so I made it lighter. Plus it helps the commander stick out more.

@cuackles
Copy link
Contributor

Man literally stole my unique item. because of that i like everything except the beret

Sprite-0001 Top is this PR's beret, bottom is yours. The only thing in common is that they're both blue with gold insignias. Besides that, yours is a different, brighter blue, has a bigger insignia, and is animated. They're similar, but I used the HoS beret for mine and just added a brighter version of the vest's blue while yours is a more modified beret with a bigger insignia and more subtle shading for the object sprite. image

ok so first of all before the actual review, u should not have a beret similar to the one of manatees donor item, the sprite is great and it absolutely fits, but i cannot in good faith add that to the game as its visually the same thing to an exclusive item for manatee, would be injust to them, specially cus i know that the item has sentimental value to them, another form of hat or another interpretation of the beret could work but as it currently its i cannot add that

Copy link
Contributor

@MajManatee MajManatee left a comment

Choose a reason for hiding this comment

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

looks fine to me

Copy link
Contributor

@Hopekz Hopekz left a comment

Choose a reason for hiding this comment

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

Creator of Peacekeeper and Amber task force approved (#8223, #10326)
1070556572088029235

Shame about the beret recolor but that's yogdev

@MajManatee MajManatee merged commit 9db2f06 into yogstation13:master Aug 19, 2023
5 checks passed
Yogbot-13 added a commit that referenced this pull request Aug 19, 2023
@Scrambledeggs00 Scrambledeggs00 deleted the PeacekeeperPR branch August 25, 2023 21:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature This adds new content to the game Sprites This PR has spriting changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants