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.

Sign up for GitHub

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

Jump to bottom

New munitions descriptions #34284

Open
wants to merge 57 commits into
base: master
Choose a base branch
from
Open

New munitions descriptions #34284

wants to merge 57 commits into from

Conversation

Nox38
Copy link
Contributor

@Nox38 Nox38 commented Jan 8, 2025 •
edited
Loading

About the PR

Added descriptions to every cartridge, magazine, ammo box, and firearm. These new descriptions should help scratch that realism itch some of us feel while also making them more descriptive for non-gun nerds. The names of the calibers themselves have also been tweaked for realism and to help differentiate them.

Why / Balance

The why is pretty obvious: more details is always nice! The balance is completely unchanged; this just changes cartridge names and adds descriptions. We plan to make a second PR with adjustments to the gun balance after this is merged.

Technical details

Renamed the following calibers: .25 caseless -> .20 caseless, .35 auto -> .38 auto, .45 magnum -> .44 magnum, .25 rifle > .223 rifle, .30 rifle -> .308 rifle, .50 shell -> 12 gauge, grenade -> 1.57 grenade.

The Kardashev-Mosin now has its own caliber: 7.62x54mm. It uses the previously unused rifle_heavy scripts, and can be crafted at a emagged lathe. Once this PR is merged I will begin work on a Mosin rework to make use of this new caliber, which will also be useful if a medium machine gun is added to the game.

Media

image
image
image
image

Requirements

Breaking changes

Mosin speedloader is now in the script "heavy_rifle" in speedloaders.

Changelog
🆑 Nox38, lorahart2

  • add: Added descriptions for all of the cartridges, ammo boxes, magazines, and the like. Replaced or modified descriptions for all (currently used) firearms.
  • add: Added a new caliber for the Mosin and any future full-power rifles: 7.62x54mm rifle.
  • tweak: Renamed most calibers to be slightly more realistic and descriptive.
    -->

@github-actions github-actions bot added S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. size/M Denotes a PR that changes 100-999 lines. Changes: No C# Changes: Requires no C# knowledge to review or fix this item. Changes: Map Changes: Might require knowledge of mapping. labels Jan 8, 2025
@Nox38 Nox38 marked this pull request as ready for review January 8, 2025 01:32
@Nox38
Copy link
Contributor Author

Nox38 commented Jan 8, 2025

Please ignore the changes:map tag, I think it added that automatically because I had to edit the salvage maps when I changed the ID of the Mosin speedloader.

@beck-thompson beck-thompson added P2: Raised Priority: Item has a raised priority, indicating it might get increased maintainer attention. T: New Feature Type: New feature or content, or extending existing content S: Needs Review Status: Requires additional reviews before being fully accepted DB: Beginner Friendly Difficulty: Great for beginners. Unambiguous in scope, and explains how to achieve the result. A: General Interactions Area: General in-game interactions that don't relate to another area. and removed S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. labels Jan 8, 2025
@K-Dynamic
Copy link
Contributor

Does anyone know where .50 shell comes from? Because I'd just rename it to 12G.

@Nox38
Copy link
Contributor Author

Nox38 commented Jan 8, 2025

@K-Dynamic All of the calibers use inches. 12 gauge would actually be .725, so I might as well change it to that.

@K-Dynamic K-Dynamic mentioned this pull request Jan 8, 2025
Open
2 tasks
@ArtisticRoomba
Copy link
Contributor

12 gauge as .725 is unfathomably cursed, I would just have it be named 12G shells or something similar.

@K-Dynamic
Copy link
Contributor

K-Dynamic commented Jan 8, 2025 •
edited
Loading

@K-Dynamic All of the calibers use inches. 12 gauge would actually be .725, so I might as well change it to that.

I thought people refer to shotgun shells as gauges more than calibers though

Also if you change it and it gets merged we'll end up with a merge conflict; I can rename them on your behalf instead.

@K-Dynamic
Copy link
Contributor

Looking back at this, can I ask why we're not using real-world names for bullets (such as 9x19mm parabellum or 7.62x51mm NATO)

@lorahart2
Copy link

We are it's just the metric system was phased so everything is in inches 223 is 5.56 and.308 is 7.62
The only weird thing is the pistols using essentially 380 instead of 9mil or 45

@Nox38
Copy link
Contributor Author

Nox38 commented Jan 24, 2025

Looking back at this, can I ask why we're not using real-world names for bullets (such as 9x19mm parabellum or 7.62x51mm NATO)

I just followed the convention of all the calibers using inches rather than mm, though it could be interesting to make the syndicate only calibers in millimeters

@FloatingFeeling
Copy link

The shotgun doesn't miss.
Love the new descs and the vibe they give off, good PR

@github-actions GitHub Actions
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 S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Jan 31, 2025
@github-actions github-actions bot removed the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Jan 31, 2025
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Feb 4, 2025

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

@github-actions github-actions bot added the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Feb 4, 2025
Nox38 added 2 commits February 4, 2025 10:55
@Nox38
Merge remote-tracking branch 'origin/master' into munitions-descriptions
c9522c9 
# Conflicts:
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
@Nox38
Fixed new merge conflicts, updated gun descriptions, reverted mosin c…
a13544c 
…aliber to .325
@github-actions github-actions bot removed the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Feb 4, 2025
@github-actions github-actions bot added the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Feb 5, 2025
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Feb 5, 2025

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

@Nox38
Merge remote-tracking branch 'origin/master' into munitions-descriptions
f69a70a 
# Conflicts:
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
@github-actions github-actions bot removed the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Feb 5, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ArtisticRoomba ArtisticRoomba ArtisticRoomba requested changes

@beck-thompson beck-thompson beck-thompson approved these changes

Assignees
No one assigned
Labels
A: General Interactions Area: General in-game interactions that don't relate to another area. Changes: No C# Changes: Requires no C# knowledge to review or fix this item. DB: Beginner Friendly Difficulty: Great for beginners. Unambiguous in scope, and explains how to achieve the result. P2: Raised Priority: Item has a raised priority, indicating it might get increased maintainer attention. S: Needs Review Status: Requires additional reviews before being fully accepted size/M Denotes a PR that changes 100-999 lines. T: New Feature Type: New feature or content, or extending existing content
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@Nox38 @K-Dynamic @ArtisticRoomba @lorahart2 @lapatison @Carolyn3114 @southbridge-fur @FloatingFeeling @beck-thompson @Emisse