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

Updates placeable flag turret to the UA flag, rather than a generic orange flag. #5601

Merged
merged 3 commits into from
Feb 1, 2024

Conversation

blackdragonTOW
Copy link
Contributor

@blackdragonTOW blackdragonTOW commented Jan 31, 2024

About the pull request

Swaps out the two tone orange flag for the flag turret with a stylized UA flag (the animation should be matched as well)

Explain why it's good for the game

Flavor good! Marines are more likely to be motivated by a UA flag rather than the generic orange.

Testing Photographs and Procedure

Screenshots & Videos

Capture

Changelog

🆑
imageadd: altered the turret flag to the UA flag, from generic orange
fix: Flag turrets now correct reference the destroyed state
/:cl:

@github-actions github-actions bot added the Sprites Remove the soul from the game. label Jan 31, 2024
@realforest2001
Copy link
Member

Super nitpicky, but the destroyed icon state is misspelt, could you fix it at same time?
Not mandatory though.

@harryob
Copy link
Member

harryob commented Jan 31, 2024

CleanShot 2024-01-31 at 12 46 24@2x
a commandment

@harryob harryob marked this pull request as draft January 31, 2024 12:47
@blackdragonTOW
Copy link
Contributor Author

PR existed before the commandment. guffaw

I'll get screenies soon.

I'll also see about fixing the typo, I'll just want to make sure that all refs are corrected as well.

@blackdragonTOW
Copy link
Contributor Author

Super nitpicky, but the destroyed icon state is misspelt, could you fix it at same time? Not mandatory though.

Update on this front. The icon references are spelled correctly in planted_flag.dm... meaning the destroyed state of these flags has just been busted since forever. I guess this is a bug fix PR now too, lmao.

@blackdragonTOW blackdragonTOW marked this pull request as ready for review January 31, 2024 23:22
@Drulikar Drulikar added the Fix Fix one bug, make ten more label Feb 1, 2024
Copy link
Contributor

@nauticall nauticall left a comment

Choose a reason for hiding this comment

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

Red on the flag is a little too saturated. Try reducing it to a desaturated, darker red sort of like #6b1515. Also change the pure white to more of a grayish color.

@blackdragonTOW
Copy link
Contributor Author

Red on the flag is a little too saturated. Try reducing it to a desaturated, darker red sort of like #6b1515. Also change the pure white to more of a grayish color.

Desaturated!

Copy link
Contributor

@nauticall nauticall left a comment

Choose a reason for hiding this comment

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

yuhh

@nauticall nauticall added the Sprites Approved confirmed no stray pixels label Feb 1, 2024
@Drulikar Drulikar added this pull request to the merge queue Feb 1, 2024
Merged via the queue into cmss13-devs:master with commit af8507f Feb 1, 2024
26 checks passed
cm13-github added a commit that referenced this pull request Feb 1, 2024
Guidesu pushed a commit to Guidesu/cmss13 that referenced this pull request Feb 10, 2024
…range flag. (cmss13-devs#5601)

# About the pull request

Swaps out the two tone orange flag for the flag turret with a stylized
UA flag (the animation should be matched as well)


# Explain why it's good for the game

Flavor good! Marines are more likely to be motivated by a UA flag rather
than the generic orange.


# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>


![Capture](https://github.com/cmss13-devs/cmss13/assets/31581761/4d4bfd03-5cc1-436d-afe7-3753279288f1)

</details>

# Changelog
:cl:
imageadd: altered the turret flag to the UA flag, from generic orange
fix: Flag turrets now correct reference the destroyed state
/:cl:
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix Fix one bug, make ten more Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants