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

9mm ammo types to protolathe #2481

Merged
merged 18 commits into from
Aug 25, 2023
Merged

Conversation

BlueHNT
Copy link
Contributor

@BlueHNT BlueHNT commented Jul 19, 2023

About The Pull Request

There were 2 unused ammo types of 9mm already made, so I scrambled them together and introduced them to proto lathe together with the 2 existing types.

in total there are 8 new designs
4 for all the individual Glock magazines prefilled with ammo
and 4 for all the individual ammo boxes

Why It's Good For The Game

Glock is good, it's the only one we got.

Testing Photographs and Procedure

Screenshots&Videos

I ain't got nothing chief

Changelog

🆑
add: Added Glock AP magazine and ammo box
add: Added Glock I magazine and ammo box
add: Added Glock-related designs to proto-lathe
/:cl:

Copy link
Contributor

@Bokkiewokkie Bokkiewokkie left a comment

Choose a reason for hiding this comment

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

I don't think they should be able to print the ammo boxes (in the protolathe). "Normal" ammo boxes are only acquired from a hacked autolathe and printing magazines in sec is good enough.

nsv13/code/modules/jobs/security/weapons.dm Outdated Show resolved Hide resolved
nsv13/code/modules/jobs/security/weapons.dm Outdated Show resolved Hide resolved
nsv13/code/modules/jobs/security/weapons.dm Outdated Show resolved Hide resolved
nsv13/code/modules/jobs/security/weapons.dm Outdated Show resolved Hide resolved
nsv13/code/modules/jobs/security/weapons.dm Outdated Show resolved Hide resolved
nsv13/code/modules/jobs/security/weapons.dm Outdated Show resolved Hide resolved
@BlueHNT
Copy link
Contributor Author

BlueHNT commented Jul 21, 2023

I don't think they should be able to print the ammo boxes (in the protolathe). "Normal" ammo boxes are only acquired from a hacked autolathe and printing magazines in sec is good enough.

You can just log into the autolathe to print the lethal ammo box, so it makes no actual difference. You would just have to go to cargo is the only real difference, but if you still believe so I can remove it.

(You can also build the autolathe in sec very easily omitting the walking to cargo)

  1. Use ID on autolathe with security access
  2. Deactivate security measures
  3. Print "hacked" items.

@github-actions
Copy link

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

'master' -> https://github.com/BlueHNT/NSV13 into 9mm-depthfix
Bokkiewokkie
Bokkiewokkie previously approved these changes Jul 28, 2023
@github-actions
Copy link

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

@Bokkiewokkie Bokkiewokkie merged commit 8cb1dfe into BeeStation:master Aug 25, 2023
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants