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

Ammo Antics #3694

Merged
merged 30 commits into from
Nov 21, 2024
Merged

Ammo Antics #3694

merged 30 commits into from
Nov 21, 2024

Conversation

Erikafox
Copy link
Contributor

@Erikafox Erikafox commented Nov 2, 2024

About The Pull Request

Subtypes AP/HP/Rubber ammo for several calibres that didn't have it. adds it to the market in relevant cases.
adds tracker rounds to a few places. makes them work differently.
removes incendiary ammo from everything except shotguns

  • I tested my pr

Why It's Good For The Game

makes the ammo gameplay stuff available to more weapons. entertainment value

Changelog

🆑
add: rifle calibre and pdw calibre rubbershot/armor piercing/hollow point. check da outpost
add: tracker rounds for a few guns. check the black market :3
del: most forms of incendiary ammo
del: A bunch of clown and mime stuff tangentially related to guns

/:cl:

@github-actions github-actions bot added the Code change Watch something violently break. label Nov 2, 2024
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Nov 2, 2024
Copy link
Contributor

github-actions bot commented Nov 2, 2024

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

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Nov 2, 2024
Copy link
Contributor

github-actions bot commented Nov 3, 2024

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 Nov 3, 2024
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Nov 3, 2024
@Apogee-dev
Copy link
Contributor

Apogee-dev commented Nov 3, 2024

I wonder how viable it would be to make the speed values you defined here modifiers on the cartridge’s base speed value rather than fixed values? I was looking over the code and noticed a few weird things here and there like match revolver bullets being faster than standard DMR bullets. it’d be nice if we could make certain guns in general have slightly faster or slower bullets than others while still having the cleaner, lower-maintenance code you made here for the cartridges

@Erikafox
Copy link
Contributor Author

Erikafox commented Nov 3, 2024

I wonder how viable it would be to make the speed values you defined here modifiers on the cartridge’s base speed value rather than fixed values? I was looking over the code and noticed a few weird things here and there like match revolver bullets being faster than standard DMR bullets. it’d be nice if we could make certain guns in general have slightly faster or slower bullets than others.

we'd have to tie it to a modifier like how bullet skins work. not opposed to doing it like such, though.

@generalthrax
Copy link
Contributor

A few select bullet types like .22lr hollow / rubber and .300 are half and half normal. Probably a quick fix but something you might wanna look at before We Become Real

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

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

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Nov 10, 2024
@Erikafox Erikafox requested a review from a team as a code owner November 10, 2024 21:09
@github-actions github-actions bot added the Sprites A bikeshed full of soulless bikes. label Nov 10, 2024
@generalthrax
Copy link
Contributor

6.5x57mm only has half the ammo and its the wrong ammo type for both normal and trackers.

…acks/premade_sniper_stacks.dm

Signed-off-by: Erika Fox <[email protected]>
Copy link
Member

@Sun-Soaked Sun-Soaked left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

document cruft removals in changelog

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 Nov 20, 2024
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Nov 20, 2024
Copy link
Member

@Sun-Soaked Sun-Soaked left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good

@Erikafox
Copy link
Contributor Author

yaaaaay

@Sun-Soaked Sun-Soaked added this pull request to the merge queue Nov 21, 2024
Merged via the queue into shiptest-ss13:master with commit cde5eca Nov 21, 2024
16 checks passed
@Erikafox Erikafox deleted the ammo_checking branch November 27, 2024 06:21
MrCat15352 pushed a commit to MrCat15352/MrCat that referenced this pull request Dec 27, 2024
Subtypes AP/HP/Rubber ammo for several calibres that didn't have it.
adds it to the market in relevant cases.
adds tracker rounds to a few places. makes them work differently.
removes incendiary ammo from everything except shotguns

- [ ] I tested my pr

makes the ammo gameplay stuff available to more weapons. entertainment
value

:cl:
add: rifle calibre and pdw calibre rubbershot/armor piercing/hollow
point. check da outpost
add: tracker rounds for a few guns. check the black market :3
del: most forms of incendiary ammo
del: A bunch of clown and mime stuff tangentially related to guns

/:cl:

---------

Signed-off-by: Erika Fox <[email protected]>
Co-authored-by: Bjarl <[email protected]>
Co-authored-by: Sun-Soaked <[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 Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants