Skip to content

Ports tg#84247: Fixes magazine overflow and russian roulette starting with 6(7) bullets #1047

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

Merged
merged 1 commit into from
Aug 15, 2024

Conversation

francinum
Copy link
Member

@francinum francinum commented Aug 3, 2024

tgstation/tgstation#84247

About The Pull Request

Box magazine code started from .len instead of .len + 1 when refilling mags which would be fine if BYOND's to didn't include the last number. Unfortunately, it does, and if the mag has bullets when its refilled it will have one over the limit.

Russian revolver code had a type typo where ammo was added in nonexistent /obj/item/ammo_box/magazine/internal/rus357's Initialize instead of /obj/item/ammo_box/magazine/internal/cylinder/rus357. It was pretty clearly was meant to start with a single bullet instead of 6, but neither removing existing ammo nor adding new was implemented properly. I stuff it with 5 blanks instead of making it empty because this will at least allow it to click with current guncode instead of bashing yourself over the head without any feedback, until I rework it.

Changelog

🆑 SmArtKar
fix: Guns no longer can be overfilled by 1 bullet
fix: Russian revolvers now spawn with only 1 live round as originally intended, and click when firing a blank.
/:cl:

@francinum francinum changed the title Ports tg#84247 Ports tg#84247: Fixes magazine overflow and russian roulette starting with 6(7) bullets Aug 3, 2024
@Kapu1178 Kapu1178 merged commit 9ea2fb5 into DaedalusDock:master Aug 15, 2024
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants