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] Small bible / bullet catcher component code cleanup #2275

Merged
merged 1 commit into from
Mar 6, 2024

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Nova: NovaSector/NovaSector#1291
Original PR: tgstation/tgstation#81835

About The Pull Request

Saw this weird use of storing a component in a var when it didn't really need to be so I just refactored it a little bit.

* Small bible / bullet catcher component code cleanup (#81835)

## About The Pull Request

Saw this weird use of storing a component in a var when it didn't really
need to be so I just refactored it a little bit.

* Small bible / bullet catcher component code cleanup

---------

Co-authored-by: MrMelbert <[email protected]>
@Iajret Iajret merged commit 2943cf2 into master Mar 6, 2024
24 checks passed
@Iajret Iajret deleted the upstream-mirror-1291 branch March 6, 2024 18:37
Iajret pushed a commit that referenced this pull request May 2, 2024
… and payout of new bounty options (#2275)

* civilian bounty control terminal displays bounty description and payout of new bounty options (#82987)

## About The Pull Request
The green buttons for selecting one of three bounties now also display
the description and payout.


https://github.com/tgstation/tgstation/assets/94711066/53d7fb02-28be-4138-b3d8-9f7a4dd6a356


Fixes #81867
Sorta brings it back to how it used to look, I think? The payout was
still in the code, just not being displayed. But I looked through the
file history and could find NO EVIDENCE of the bounty console displaying
the description in the past so I guess I hallucinated that.
## Why It's Good For The Game
It's nice to be able to see the payout before you're locked into a
bounty for 5 minutes. Also more chances to read the flavortext and it
makes the buttons feel less barren. With some bounties it also gives a
better idea of how to even get the thing before committing to it.
## Changelog
:cl:
fix: the civilian bounty control terminal displays the payout of new
bounty options again
qol: the civilian bounty control terminal displays the description of
new bounty options
/:cl:

* civilian bounty control terminal displays bounty description and payout of new bounty options

---------

Co-authored-by: kawoppi <[email protected]>
ReezeBL pushed a commit that referenced this pull request May 3, 2024
… and payout of new bounty options (#2275) (#3146)

* civilian bounty control terminal displays bounty description and payout of new bounty options (#82987)

## About The Pull Request
The green buttons for selecting one of three bounties now also display
the description and payout.


https://github.com/tgstation/tgstation/assets/94711066/53d7fb02-28be-4138-b3d8-9f7a4dd6a356


Fixes #81867
Sorta brings it back to how it used to look, I think? The payout was
still in the code, just not being displayed. But I looked through the
file history and could find NO EVIDENCE of the bounty console displaying
the description in the past so I guess I hallucinated that.
## Why It's Good For The Game
It's nice to be able to see the payout before you're locked into a
bounty for 5 minutes. Also more chances to read the flavortext and it
makes the buttons feel less barren. With some bounties it also gives a
better idea of how to even get the thing before committing to it.
## Changelog
:cl:
fix: the civilian bounty control terminal displays the payout of new
bounty options again
qol: the civilian bounty control terminal displays the description of
new bounty options
/:cl:

* civilian bounty control terminal displays bounty description and payout of new bounty options

---------

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