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

Adds Urban Sprite For Ghillie Suit #6563

Merged
merged 3 commits into from
Jul 25, 2024
Merged

Conversation

Steelpoint
Copy link
Contributor

@Steelpoint Steelpoint commented Jun 25, 2024

About the pull request

Replaces the Green ghillie sprites for the Sniper/AMR into a more Urban sprite, using the Elite Mercenary Sprites akin to Forecon, for urban maps like Chances Claim or Fiorina.

Explain why it's good for the game

Very odd the Sniper/AMR are using Green on a grey map for camo. This makes it look appropriate, and precedent the USCM uses this scheme in forecon.

Testing Photographs and Procedure

Screenshots & Videos

Screenshot 2024-06-26 04 48 39

Changelog

🆑
imageadd: The Sniper and Anti-Material Rifle Specialists will now use an urban camouflage sprite for their ghillie suit instead of a green camouflage.
/:cl:

@github-actions github-actions bot added the Sprites Remove the soul from the game. label Jun 25, 2024
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jul 6, 2024
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Jul 7, 2024
Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Jul 15, 2024
@Drulikar Drulikar requested a review from a team July 15, 2024 18:00
@Drulikar Drulikar added Stale Exempt PR can't go stale and removed Stale beg a maintainer to review your PR labels Jul 15, 2024
@Drulikar
Copy link
Contributor

stale exempt until sprite reviewed

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.

not exactly much of a ghillie anymore but i suppose the alternative would be making it out of trash or something for urban

either way, approved, does the job

@nauticall nauticall added Sprites Approved confirmed no stray pixels and removed Stale Exempt PR can't go stale labels Jul 25, 2024
@harryob harryob added this pull request to the merge queue Jul 25, 2024
Merged via the queue into cmss13-devs:master with commit 8ceaaf9 Jul 25, 2024
27 checks passed
cm13-github added a commit that referenced this pull request Jul 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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