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

[MIRROR] Fix ammo counter HUD not updating properly, and some hard dels #1640

Merged
merged 1 commit into from
Jan 24, 2024

Conversation

Steals-The-PRs
Copy link
Collaborator

Original PR: NovaSector/NovaSector#555

About The Pull Request

What it says on the tin. Just fixes self-recharging energy weapons (like ebows, kinetic accelerators, etc) not updating their ammo huds, as well as a hard del.

Changelog

🆑 vinylspiders
fix: fixed ammo counter hud not updating for self-recharging energy weapons
/:cl:

* Fix for flavortext

* changelog fix

* Revert "changelog fix"

This reverts commit 16fc8a3501f041d592fd94575c406312ec4f7715.

* Testing ammo counter harddel

* Update gun_hud_component.dm

* Update gun_hud_component.dm

* Update gun_hud_component.dm

* Update gun_hud_component.dm

* Update gun_hud_component.dm

* Can't rely on that.

* Fixes ammo hud not updating for self-reloading energy weapons

* Revert "Fix for flavortext"

This reverts commit fcbe257ebacbaaf750b3d78037afb30b6217bcfc.

* Whoops

* Update gun_hud_component.dm

* Update gun_hud_component.dm
@Iajret Iajret merged commit df16e0e into master Jan 24, 2024
23 checks passed
@Iajret Iajret deleted the upstream-mirror-555 branch January 24, 2024 11:41
AnywayFarus added a commit that referenced this pull request Jan 24, 2024
Iajret pushed a commit that referenced this pull request Mar 26, 2024
* Removes extra light switch from tram janitor (#82233)

## About The Pull Request

as title

![image](https://github.com/tgstation/tgstation/assets/10399117/58778b7b-bddd-4f5b-a0b0-ef51a77df0f7)


## Why It's Good For The Game

it looks bad on the map, duplicate

## Changelog
:cl:
fix: Removed erroneous light switch in janitor office
/:cl:

* Removes extra light switch from tram janitor

---------

Co-authored-by: YakumoChen <[email protected]>
ReezeBL pushed a commit that referenced this pull request Mar 26, 2024
* Removes extra light switch from tram janitor (#82233)

## About The Pull Request

as title

![image](https://github.com/tgstation/tgstation/assets/10399117/58778b7b-bddd-4f5b-a0b0-ef51a77df0f7)


## Why It's Good For The Game

it looks bad on the map, duplicate

## Changelog
:cl:
fix: Removed erroneous light switch in janitor office
/:cl:

* Removes extra light switch from tram janitor

---------

Co-authored-by: NovaBot <[email protected]>
Co-authored-by: YakumoChen <[email protected]>
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.

3 participants