-
-
Notifications
You must be signed in to change notification settings - Fork 544
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
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
waa Co-authored-by: Theos <[email protected]> Signed-off-by: Martinpachu <[email protected]>
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
Should be ready. A test-merge would be good. |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
Jun 19, 2024
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
Jun 20, 2024
github-merge-queue
bot
removed this pull request from the merge queue due to a conflict with the base branch
Jun 20, 2024
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
shiptest-server
pushed a commit
that referenced
this pull request
Jun 24, 2024
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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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: