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

Changes old donator kit sprites. #6887

Merged
merged 6 commits into from
Aug 21, 2024
Merged

Conversation

SASoperative
Copy link
Contributor

@SASoperative SASoperative commented Aug 6, 2024

About the pull request

This pull replaces extremely old outdated donator sprites with a new donator armor set.

Explain why it's good for the game

Removes old sprites from years ago and replaces them with up to date sprites that are more in line with current marine armor.
Removed old sprites not in use, all sprites were owned by me and not in use.

Testing Photographs and Procedure

VCNNiQYucAAAAASUVORK5CYII

Changelog

🆑
code: Updated donator items
imageadd: Added new donator sprites
imagedel: Removed old unused sprites
/:cl:

@github-actions github-actions bot added Sprites Remove the soul from the game. Code Improvement Make the code longer labels Aug 6, 2024
@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Aug 6, 2024
@Kaga-404
Copy link
Contributor

Kaga-404 commented Aug 7, 2024

Based on the Github account I'm guessing these are yours, not sure what the codebase's policy on touching those old items is but I'm all for a more immersive name and description.

Not M5 though, please. M3 or M3-Something is preferable by making it into a variant of the standard armor, if you really want a non-standard label like Pyro armor (M35), 6 or higher is fine too.

M5 just overlaps too much with the RPG, gas mask, and also possibly a new camera item that might be getting added soon.

@SASoperative
Copy link
Contributor Author

Yeah, I can do that once I change it, I have to update it for the merge conflict. I am just waiting to hear back from Forest on what they want/need before I make changes.

@SASoperative SASoperative reopened this Aug 10, 2024
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Aug 10, 2024
@cm13-github
Copy link
Contributor

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

@SASoperative
Copy link
Contributor Author

As per request, armor name has been changed, and old sprites, and unused sprites have been deleted per Forest2001
Fixed merge conflict

@frozentsbgg
Copy link
Contributor

Approved for donator sprite changes

@Blundir Blundir added the Sprites Approved confirmed no stray pixels label Aug 15, 2024
@cm13-github
Copy link
Contributor

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

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

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

@Zonespace27 Zonespace27 added this pull request to the merge queue Aug 21, 2024
Merged via the queue into cmss13-devs:master with commit eb675ff Aug 21, 2024
27 checks passed
cm13-github added a commit that referenced this pull request Aug 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code Improvement Make the code longer 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.

7 participants