-
-
Notifications
You must be signed in to change notification settings - Fork 539
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
Makes the Cobra not just a better Mongrel (and fixes a typo) #3437
Merged
FalloutFalcon
merged 3 commits into
shiptest-ss13:master
from
Apogee-dev:cobra-mag-tweak
Oct 18, 2024
Merged
Makes the Cobra not just a better Mongrel (and fixes a typo) #3437
FalloutFalcon
merged 3 commits into
shiptest-ss13:master
from
Apogee-dev:cobra-mag-tweak
Oct 18, 2024
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
github-actions
bot
added
Sprites
A bikeshed full of soulless bikes.
Code change
Watch something violently break.
labels
Sep 26, 2024
Missing icon_state for /obj/item/ammo_box/magazine/m45_cobra in 'icons/obj/ammo.dmi'. |
rye-rice
previously requested changes
Oct 4, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
apoggeersss, missing icon test faillllllllll
apogeeeeeeeeeeeeeeeeeeeeeeeee |
FalloutFalcon
approved these changes
Oct 18, 2024
shiptest-server
pushed a commit
that referenced
this pull request
Oct 18, 2024
zimon9
pushed a commit
to zimon9/Shiptest-PR-testing
that referenced
this pull request
Oct 29, 2024
…t-ss13#3437) <!-- 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. --> ## About The Pull Request Reduces the size of the C-20r and Cobra-20's magazines to 24 rounds, identical to the Mongrel. This also means you get two clean reloads out of a box of .45 ammunition instead of having one mag and _almost_ a second mag. Also, fixed the "civillian" typo in the cargo listings for scarborough guns. ## Why It's Good For The Game not getting two reloads out of a box is just plain irritating and also the cobra shouldn't just be a mongrel but better ## Changelog :cl: balance: Reduced Cobra-20 magazine size to 24 rounds fix: removed a typo from Scarborough cargo catalog entries /: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. --> --------- Co-authored-by: FalloutFalcon <[email protected]>
zimon9
pushed a commit
to zimon9/Shiptest-PR-testing
that referenced
this pull request
Oct 29, 2024
MrCat15352
pushed a commit
to MrCat15352/MrCat
that referenced
this pull request
Dec 27, 2024
…t-ss13#3437) <!-- 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. --> ## About The Pull Request Reduces the size of the C-20r and Cobra-20's magazines to 24 rounds, identical to the Mongrel. This also means you get two clean reloads out of a box of .45 ammunition instead of having one mag and _almost_ a second mag. Also, fixed the "civillian" typo in the cargo listings for scarborough guns. ## Why It's Good For The Game not getting two reloads out of a box is just plain irritating and also the cobra shouldn't just be a mongrel but better ## Changelog :cl: balance: Reduced Cobra-20 magazine size to 24 rounds fix: removed a typo from Scarborough cargo catalog entries /: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. --> --------- Co-authored-by: FalloutFalcon <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
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
Reduces the size of the C-20r and Cobra-20's magazines to 24 rounds, identical to the Mongrel. This also means you get two clean reloads out of a box of .45 ammunition instead of having one mag and almost a second mag. Also, fixed the "civillian" typo in the cargo listings for scarborough guns.
Why It's Good For The Game
not getting two reloads out of a box is just plain irritating and also the cobra shouldn't just be a mongrel but better
Changelog
🆑
balance: Reduced Cobra-20 magazine size to 24 rounds
fix: removed a typo from Scarborough cargo catalog entries
/:cl: