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.

Sign up for GitHub

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

Jump to bottom

American Spirit Cigarettes #7236

Merged
merged 9 commits into from
Dec 21, 2024
Merged

American Spirit Cigarettes #7236

merged 9 commits into from
Dec 21, 2024

Conversation

AmoryBlaine
Copy link
Contributor

@AmoryBlaine AmoryBlaine commented Sep 29, 2024 •
edited by Drulikar
Loading

For merge after sprite freeze. Adds Crowford's American Spirit cigarettes. Available in Yellow (Mellow) and Turquoise (Full Bodied, stronger)

{CB6FC7B5-8131-4B62-8384-FF2A20051042}
{D6801F71-5103-4E41-85E9-C704A47CEEDB}
{6FAE3AF9-DC9F-4F19-99FF-FD0BBE70B605}

🆑 AmoryBlaine, Crowford
add: American Spirit cigarettes
/:cl:

@cmss13-ci cmss13-ci bot added Sprites Remove the soul from the game. Missing Changelog Maintainers always document their changes. labels Sep 29, 2024
@BeagleGaming1
Copy link
Contributor

You need a changelog

@BeagleGaming1 BeagleGaming1 marked this pull request as draft September 30, 2024 06:35
@Blundir Blundir added the Sprites Frozen Merge this and you will make the spritetainers angry. label Oct 26, 2024
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Dec 10, 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 Dec 17, 2024
@AmoryBlaine AmoryBlaine marked this pull request as ready for review December 17, 2024 19:25
@AmoryBlaine AmoryBlaine changed the title American Spirit (For merge after sprite freeze) American Spirit Cigarettes Dec 17, 2024
@AmoryBlaine
Copy link
Contributor Author

You need a changelog

Done

@cmss13-ci cmss13-ci bot added Feature Feature coder badge and removed Missing Changelog Maintainers always document their changes. labels Dec 20, 2024
Blundir
Blundir requested changes Dec 20, 2024
View reviewed changes
Copy link
Contributor

@Blundir Blundir left a comment •
edited
Loading

Choose a reason for hiding this comment

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

inhands for packets are missing

@Blundir Blundir removed the Sprites Frozen Merge this and you will make the spritetainers angry. label Dec 20, 2024
@Blundir Blundir marked this pull request as draft December 20, 2024 10:14
@AmoryBlaine AmoryBlaine marked this pull request as ready for review December 21, 2024 18:16
@Blundir Blundir added the Sprites Approved confirmed no stray pixels label Dec 21, 2024
@Blundir Blundir added this pull request to the merge queue Dec 21, 2024
Merged via the queue into cmss13-devs:master with commit 522ddac Dec 21, 2024
28 checks passed
cmss13-ci bot added a commit that referenced this pull request Dec 21, 2024
@cmss13-ci
Automatic changelog for PR #7236 [ci skip]
6309def
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Blundir Blundir Blundir approved these changes

Assignees
No one assigned
Labels
Feature Feature coder badge Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game.
Projects
Review Backlog
Status: Merged
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@AmoryBlaine @BeagleGaming1 @cm13-github @Blundir