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

UPP shotgun shell boxes #7640

Merged
merged 5 commits into from
Dec 2, 2024
Merged

Conversation

Blundir
Copy link
Contributor

@Blundir Blundir commented Nov 20, 2024

About the pull request

Title

dreamseeker_ToPfIKDe3m

Explain why it's good for the game

More hvh and black market things = good

Changelog

🆑
add: type 23 shotgun shell boxes and crafting of them
add: type 23 shotgun rounds to black market
/:cl:

@cmss13-ci cmss13-ci bot added Sprites Remove the soul from the game. Feature Feature coder badge labels Nov 20, 2024
@Blundir Blundir marked this pull request as draft November 21, 2024 11:18
@Blundir Blundir marked this pull request as ready for review November 22, 2024 15:37
cm13-github added a commit that referenced this pull request Nov 23, 2024
@FransFeiffer FransFeiffer added the Sprites Approved confirmed no stray pixels label Nov 29, 2024
cm13-github added a commit that referenced this pull request Nov 29, 2024
cm13-github added a commit that referenced this pull request Nov 29, 2024
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Nov 29, 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 removed the Merge Conflict PR can't be merged because it touched too much code label Dec 2, 2024
@cm13-github
Copy link
Contributor

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

@harryob harryob enabled auto-merge December 2, 2024 13:32
@harryob harryob added this pull request to the merge queue Dec 2, 2024
Merged via the queue into cmss13-devs:master with commit 5684a19 Dec 2, 2024
27 checks passed
cmss13-ci bot added a commit that referenced this pull request Dec 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge 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.

4 participants