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

Fixes light attachments setting and add pref for ammo counter #6251

Merged
merged 18 commits into from
May 19, 2024

Conversation

vero5123
Copy link
Contributor

@vero5123 vero5123 commented May 6, 2024

About the pull request

Closes #6238, also made the ammo display less spammy.

🆑
qol: Toggleable ammo counter, can now cycle between displaying every fifth or single bullet.
fix: Light attachments will no longer automatically turn on when the weapon is equipped from suit storage
/:cl:

@github-actions github-actions bot added Quality of Life Make the game harder to play Fix Fix one bug, make ten more labels May 6, 2024
@ihatethisengine
Copy link
Contributor

I don't think ammo counter change is needed unless you make it a setting.

@vero5123
Copy link
Contributor Author

vero5123 commented May 6, 2024

I don't think ammo counter change is needed unless you make it a setting.

Sure thing.

@vero5123
Copy link
Contributor Author

vero5123 commented May 6, 2024

You can toggle it now.

Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

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

In the future fill out the PR template; don't just omit it.

code/modules/projectiles/gun.dm Outdated Show resolved Hide resolved
@Drulikar Drulikar marked this pull request as draft May 13, 2024 03:04
@Drulikar Drulikar changed the title Fixes light attachments automatically turning on after being disabled Fixes light attachments setting and add pref for ammo counter May 15, 2024
Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

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

As mentioned on discord:

  • This would be better as a player preference rather than something you need to set per weapon IMO
  • I have no idea where verb desc even gets displayed for us, so conveying the < 15 bullet information needs to also be somewhere else; or just make it a different option for the pref (e.g. every bullet, every 5 bullets unless low, every 5 bullets)
  • Additionally, you should mention this only applies to semi fire (e.g. make the preference called semi-auto ammo counter - because of note this doesn't work for automatic but I think that's fine)

@vero5123 vero5123 marked this pull request as ready for review May 15, 2024 14:21
code/modules/client/preferences_toggles.dm Outdated Show resolved Hide resolved
code/modules/projectiles/gun.dm Outdated Show resolved Hide resolved
@Drulikar Drulikar marked this pull request as draft May 17, 2024 03:40
@vero5123 vero5123 marked this pull request as ready for review May 19, 2024 16:00
code/modules/client/preferences.dm Outdated Show resolved Hide resolved
code/modules/client/preferences.dm Outdated Show resolved Hide resolved
vero5123 and others added 2 commits May 19, 2024 17:28
Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com>
Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com>
@Drulikar Drulikar enabled auto-merge May 19, 2024 21:29
@Drulikar Drulikar added this pull request to the merge queue May 19, 2024
Merged via the queue into cmss13-devs:master with commit 274e7c1 May 19, 2024
27 checks passed
cm13-github added a commit that referenced this pull request May 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix Fix one bug, make ten more Quality of Life Make the game harder to play
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Light attachments turning itself back on after being disabled.
3 participants