Serene Sporting #3604
Serene Sporting #3604
Conversation
github-actions
bot
added
Map Change
|
Would you mind putting an image of the sprites in the PR body? just a screenshot of the project file if need be, it's just that the resolution on the video isn't perfect and factors like lighting can make things hard to see. |
|
done |
code/modules/projectiles/guns/manufacturer/serene_sporting/ballistics.dm
Outdated
Show resolved
Hide resolved
code/modules/projectiles/guns/manufacturer/serene_sporting/ballistics.dm
Outdated
Show resolved
Hide resolved
code/modules/projectiles/guns/manufacturer/serene_sporting/ballistics.dm
Outdated
Show resolved
Hide resolved
|
One major |
Isn't this already the case with other semi-automatic weapons? I thought gunslinger also applied penalties to other self-loaders like the Candor too. |
Huh. I misremembered gunslinger's subtype penalties, then (I thought it was every weapon typed under automatic). The machine pistols being unaffected seems like a bit of an oversight though :P |
tbh I'm of the opinion that we should remove gunslinger. It's too far into the side of gameplay altering quirk |
I think it could probably stay but it should be a positive quirk that adds the few cool tricks like fanning and minor visuals like spin-cocking. Remove all the number tweaking cause its only really for powergaming |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Signed-off-by: Erika Fox <94164348+Erikafox@users.noreply.github.com>
|
nothing it just edits ships okay anyways - They're going to be in my next code PR - im gonna make a new category for magazines and check that you can purchase like - all of them |
|
Super sporters medium sized. Not sure thats intended since its a rifle |
|
The M17 is bulky, too |
|
m17 should be fixed in latest. im fine with the m12/m15 being medium atm |
|
I unno. I just noticed the M12 being bulky while the M15 was normal. Seemed mixed up |
|
Ah. actual weights instead of 'weapon' weights |
|
All these but the pistol should be unable to fit in a bag, probably. |
|
weapon weight and actual item weight are two different systems. either way fixed |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Signed-off-by: Erika Fox <94164348+Erikafox@users.noreply.github.com>
…into serene_sporting
| /obj/item/gun/ballistic/shotgun/automatic/m11/Initialize() | ||
| . = ..() | ||
| if(prob(1)) | ||
| name = "Model 11 \"Cuckmaster\"" |
<!-- 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 Adds new guns sprited by @rye-rice M17 pistol - .22lr - 10rd mag M12 rifle - .22lr - 25rd mag m13 rifle - .22lr - 25rd mag - 3rd burst m15 rifle - 5.56 clip - 20rd mag m11 shotgun - 12g - 8rd tube  [Watch the video here](https://youtu.be/O1TrkZ_FHFU?si=-dAk-dlTSsug8X0R) <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game project content into the world <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: Apogeesys, Ryerice, Erikafox add: Serene Outdoors has begun a new production run of its classics - the Model 17, Model 12, Model 15, and Model 11 del: old combat shotgun /: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: Erika Fox <94164348+Erikafox@users.noreply.github.com> Co-authored-by: Erika Fox <94164348+Bjarl@users.noreply.github.com>
<!-- 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 Adds new guns sprited by @rye-rice M17 pistol - .22lr - 10rd mag M12 rifle - .22lr - 25rd mag m13 rifle - .22lr - 25rd mag - 3rd burst m15 rifle - 5.56 clip - 20rd mag m11 shotgun - 12g - 8rd tube  [Watch the video here](https://youtu.be/O1TrkZ_FHFU?si=-dAk-dlTSsug8X0R) <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game project content into the world <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: Apogeesys, Ryerice, Erikafox add: Serene Outdoors has begun a new production run of its classics - the Model 17, Model 12, Model 15, and Model 11 del: old combat shotgun /: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: Erika Fox <94164348+Erikafox@users.noreply.github.com> Co-authored-by: Erika Fox <94164348+Bjarl@users.noreply.github.com>
<!-- 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 new guns sprited by @rye-rice M17 pistol - .22lr - 10rd mag M12 rifle - .22lr - 25rd mag m13 rifle - .22lr - 25rd mag - 3rd burst m15 rifle - 5.56 clip - 20rd mag m11 shotgun - 12g - 8rd tube  [Watch the video here](https://youtu.be/O1TrkZ_FHFU?si=-dAk-dlTSsug8X0R) <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> project content into the world <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> :cl: Apogeesys, Ryerice, Erikafox add: Serene Outdoors has begun a new production run of its classics - the Model 17, Model 12, Model 15, and Model 11 del: old combat shotgun /: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: Erika Fox <94164348+Erikafox@users.noreply.github.com> Co-authored-by: Erika Fox <94164348+Bjarl@users.noreply.github.com>
About The Pull Request
Adds new guns sprited by @rye-rice
M17 pistol - .22lr - 10rd mag
M12 rifle - .22lr - 25rd mag
m13 rifle - .22lr - 25rd mag - 3rd burst
m15 rifle - 5.56 clip - 20rd mag
m11 shotgun - 12g - 8rd tube
Watch the video here
Why It's Good For The Game
project content into the world
Changelog
🆑 Apogeesys, Ryerice, Erikafox
add: Serene Outdoors has begun a new production run of its classics - the Model 17, Model 12, Model 15, and Model 11
del: old combat shotgun
/:cl: