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

fix having inapropriate ammo in CL lockbox. #4071

Merged

Conversation

Huffie56
Copy link
Contributor

@Huffie56 Huffie56 commented Jul 31, 2023

About the pull request

fixes: #3976

Explain why it's good for the game

removing the improper ammo in the lock box because it's obsolete considering the new gun CL as.
adding a way to buy more ammo so that CL as a way to refill is weapon.
didn't wanted to give it for free in the lockbox.

Testing Photographs and Procedure

Screenshots & Videos

image

image

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
balance: adding the possibility to buy "ES-4 stun magazine" for 10 point in the portable vendor.
fix: remove a bunch of ammo that where improper for ES-4 gun that are in the lockbox.
/:cl:

as in is lock box but
can't use with the gun he as in is safe.
adding the possibility to buy extra
ammo as CL
@github-actions github-actions bot added Balance You need to be a professional veteran game maintainer to comprehend what is being done here. Fix Fix one bug, make ten more labels Jul 31, 2023
@Huffie56 Huffie56 marked this pull request as ready for review July 31, 2023 21:16
Copy link
Contributor

@Zonespace27 Zonespace27 left a comment

Choose a reason for hiding this comment

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

Your PR doesn't explain why the CL should lose their roundstart ammo

@MusselMain
Copy link

MusselMain commented Aug 1, 2023

Your PR doesn't explain why the CL should lose their roundstart ammo

as i mentioned in my bug report: the CL no longer spawns with the 88 Mod4 in their safe, instead spawning with the ES-4 electrostatic pistol, despite this the CL still receives a lockbox full of 88Mod4 rubber and AP ammo, when I asked a mentor where the CL could find a 88 mod4 to use this ammo, they responded that i should ask a marine to vend me one from a marine prep room, based on this I assume it's an oversight for the CL to have ammo for a weapon they aren't issued, and that they'd have to ask others to acquire said weapon. The new sidearm the CL is issued only gets 3 magazines and it seems like there is no other place to find more, this PR not only solves the confusing question of "why would WY issue a nonlethal weapon to the CL, yet give them lethal ammo for a weapon they aren't issued", but also helps to solve the problem of ES-4 ammo being extremely rare.

@Zonespace27
Copy link
Contributor

Zonespace27 commented Aug 1, 2023

<snip>

No, i'm looking for justification for nuking the lockbox ammo entirely, as this PR does

@Huffie56
Copy link
Contributor Author

Huffie56 commented Aug 1, 2023

No, i'm looking for justification for nuking the lockbox ammo entirely, as this PR does

i removed /obj/item/storage/lockbox/loyalty/fill_preset_inventory() thinking it would work without it.
just fixed it i added screenshoot in testing if you want to see.
sorry for the confusion i forgot github doesn't test everything...

@Zonespace27
Copy link
Contributor

<snip>

This still fails to address the issue I raised of a pack of justification.

@Huffie56
Copy link
Contributor Author

Huffie56 commented Aug 1, 2023

This still fails to address the issue I raised of a pack of justification.

? i am confused i am not removing the lock-box just the ammo in it because it's obsolete considering the new gun CL as.
i don't see any reason to keep random magazine including lethal ammo in a lock-box for the CL.
Because if CL need them he could just get gun and ammo at requisition.
For me the 88 ammo is clearly something that got miss when they change the gun.....

@MusselMain
Copy link

No, i'm looking for justification for nuking the lockbox ammo entirely, as this PR does

actually. fair point, having an empty lockbox seems a bit silly.

@Huffie56 Huffie56 marked this pull request as draft August 1, 2023 14:57
@Huffie56 Huffie56 marked this pull request as ready for review August 1, 2023 15:49
@Zonespace27 Zonespace27 added Balance You need to be a professional veteran game maintainer to comprehend what is being done here. and removed Balance You need to be a professional veteran game maintainer to comprehend what is being done here. labels Aug 1, 2023
@morrowwolf morrowwolf added this pull request to the merge queue Aug 2, 2023
Merged via the queue into cmss13-devs:master with commit 859ec23 Aug 2, 2023
26 checks passed
cm13-github added a commit that referenced this pull request Aug 2, 2023
@Huffie56 Huffie56 deleted the fix_cl_starting_wrong_magazine branch August 4, 2023 14:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Balance You need to be a professional veteran game maintainer to comprehend what is being done here. Fix Fix one bug, make ten more
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CL lockbox contains wrong ammo [this should probably be labeled a oversight not bug]
5 participants