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 Gun Cases. For guns. #2998

Merged
merged 33 commits into from
Jun 24, 2024
Merged

Adds Gun Cases. For guns. #2998

merged 33 commits into from
Jun 24, 2024

Conversation

Martinpachu
Copy link
Contributor

About The Pull Request

Adds in gun cases that can hold a variety of guns and magazines, intended for use in cargo and certain ships and ruins. Sprites by retlaw are a work in progress.

Why It's Good For The Game

Adds in a cool way to store firearms safely, and also its realistic i think. Also requested by apogee.

Changelog

🆑
add: Cargo guns and certain guns in ships now come inside cases alongside some magazines, the ammo now comes separately for safety reasons.
/:cl:

@github-actions github-actions bot added the Code change Watch something violently break. label May 17, 2024
@Martinpachu Martinpachu marked this pull request as draft May 17, 2024 23:10
@github-actions github-actions bot added Map Change Tile placing is hard. Thank you for your service. DME Edit Sprites A bikeshed full of soulless bikes. labels May 18, 2024
@Martinpachu Martinpachu marked this pull request as ready for review May 18, 2024 20:43
@Martinpachu Martinpachu requested review from a team as code owners May 18, 2024 20:43
@Martinpachu
Copy link
Contributor Author

Should be ready. A test-merge would be good.

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label May 20, 2024
Copy link
Contributor

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

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Jun 18, 2024
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Jun 19, 2024
@Imaginos16 Imaginos16 added this pull request to the merge queue Jun 19, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 19, 2024
@rye-rice rye-rice added this pull request to the merge queue Jun 20, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 20, 2024
@rye-rice rye-rice added this pull request to the merge queue Jun 20, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to a conflict with the base branch Jun 20, 2024
Copy link
Contributor

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

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Jun 20, 2024
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Jun 21, 2024
@rye-rice rye-rice added this pull request to the merge queue Jun 24, 2024
Merged via the queue into shiptest-ss13:master with commit 138309c Jun 24, 2024
14 checks passed
Mirag1993 pushed a commit to Mirag1993/Shiptest-voyko that referenced this pull request Jun 28, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

Adds in gun cases that can hold a variety of guns and magazines,
intended for use in cargo and certain ships and ruins. Sprites by retlaw
are a work in progress.

Adds in a cool way to store firearms safely, and also its realistic i
think. Also requested by apogee.

:cl:
add: Cargo guns and certain guns in ships now come inside cases
alongside some magazines, the ammo now comes separately for safety
reasons.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: Martinpachu <[email protected]>
Co-authored-by: Theos <[email protected]>
MrCat15352 pushed a commit to MrCat15352/MrCat that referenced this pull request Jun 30, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

Adds in gun cases that can hold a variety of guns and magazines,
intended for use in cargo and certain ships and ruins. Sprites by retlaw
are a work in progress.

Adds in a cool way to store firearms safely, and also its realistic i
think. Also requested by apogee.

:cl:
add: Cargo guns and certain guns in ships now come inside cases
alongside some magazines, the ammo now comes separately for safety
reasons.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: Martinpachu <[email protected]>
Co-authored-by: Theos <[email protected]>
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Jun 30, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

Adds in gun cases that can hold a variety of guns and magazines,
intended for use in cargo and certain ships and ruins. Sprites by retlaw
are a work in progress.

Adds in a cool way to store firearms safely, and also its realistic i
think. Also requested by apogee.

:cl:
add: Cargo guns and certain guns in ships now come inside cases
alongside some magazines, the ammo now comes separately for safety
reasons.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: Martinpachu <[email protected]>
Co-authored-by: Theos <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. DME Edit Map Change Tile placing is hard. Thank you for your service. Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants