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 annoying bug where window isn't refocusing after closing TGUI #4143

Merged
merged 1 commit into from
Jun 30, 2024

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Nova: NovaSector/NovaSector#3399
Original PR: tgstation/tgstation#84448

About The Pull Request

Fix annoying bug where window isn't refocusing after closing TGUI caused by https://github.com/tgstation/tgstation/pull/82569/files#diff-4803ac36597c090dd92f3be66038bc14f9bcdf9c0b8c9422001636acfc38b333R52-R53

Fixes: #84446

Why It's Good For The Game

Fixes annoying bug

Changelog

🆑 thegrb93
fix: Game not refocusing after closing a TGUI
/:cl:

… TGUI [MDB IGNORE] (#3399)

* Fix annoying bug where window isn't refocusing after closing TGUI (#84448)

## About The Pull Request
Fix annoying bug where window isn't refocusing after closing TGUI caused
by
https://github.com/tgstation/tgstation/pull/82569/files#diff-4803ac36597c090dd92f3be66038bc14f9bcdf9c0b8c9422001636acfc38b333R52-R53

Fixes: #84446
## Why It's Good For The Game
Fixes annoying bug
## Changelog
:cl:
fix: Game not refocusing after closing a TGUI
/:cl:

* Fix annoying bug where window isn't refocusing after closing TGUI

---------

Co-authored-by: thegrb93 <[email protected]>
Co-authored-by: NovaBot13 <[email protected]>
@Iajret Iajret merged commit e3d20e4 into master Jun 30, 2024
28 checks passed
@Iajret Iajret deleted the upstream-mirror-3399 branch June 30, 2024 13:27
AnywayFarus added a commit that referenced this pull request Jun 30, 2024
Iajret pushed a commit that referenced this pull request Aug 1, 2024
…4143)

* Spies can now set their own custom objectives (#85438)

## About The Pull Request

Spies can now pick a custom objective to override their auto-generated
ones.


![image](https://github.com/user-attachments/assets/71556d71-e2e2-4b32-b628-d057df974f02)

Here's how it looks at roundend:


![image](https://github.com/user-attachments/assets/d6e029af-2cdc-4246-b8e5-48863cfee40b)

By default, the custom objective is set to "Rob the station blind."

Honestly I'm surprised they couldn't do this already.
## Why It's Good For The Game

Spies are a very low-stakes antag, they can lend themselves to letting
people pull low-stakes shenanigans. They should have the freedom to
declare their intent, so people reading the roundend report can
understand why they painted the entire station orange or slaughtered
that farm of innocent orphan mothroaches.

I am, of course, doing this all under the assumption that the
administration team (of which I am a part of) will not let people
setting their objective to "kill people for fun" fly when murderbone
otherwise wouldn't. It feels like that detail is a given but it warrants
addressing regardless -- I have to say it here or else someone will in
the comments.
## Changelog
:cl: Rhials
add: Spies can now pick their own custom objectives, if they so choose.
/:cl:

* Spies can now set their own custom objectives

---------

Co-authored-by: Rhials <[email protected]>
Co-authored-by: NovaBot13 <[email protected]>
FeenieRU pushed a commit that referenced this pull request Aug 1, 2024
* [MIRROR] Spies can now set their own custom objectives [MDB IGNORE] (#4143)

* Spies can now set their own custom objectives (#85438)

## About The Pull Request

Spies can now pick a custom objective to override their auto-generated
ones.


![image](https://github.com/user-attachments/assets/71556d71-e2e2-4b32-b628-d057df974f02)

Here's how it looks at roundend:


![image](https://github.com/user-attachments/assets/d6e029af-2cdc-4246-b8e5-48863cfee40b)

By default, the custom objective is set to "Rob the station blind."

Honestly I'm surprised they couldn't do this already.
## Why It's Good For The Game

Spies are a very low-stakes antag, they can lend themselves to letting
people pull low-stakes shenanigans. They should have the freedom to
declare their intent, so people reading the roundend report can
understand why they painted the entire station orange or slaughtered
that farm of innocent orphan mothroaches.

I am, of course, doing this all under the assumption that the
administration team (of which I am a part of) will not let people
setting their objective to "kill people for fun" fly when murderbone
otherwise wouldn't. It feels like that detail is a given but it warrants
addressing regardless -- I have to say it here or else someone will in
the comments.
## Changelog
:cl: Rhials
add: Spies can now pick their own custom objectives, if they so choose.
/:cl:

* Spies can now set their own custom objectives

---------

Co-authored-by: Rhials <[email protected]>
Co-authored-by: NovaBot13 <[email protected]>

* [MIRROR] Spies can now set their own custom objectives

---------

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