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] [Non-Modular] [TM First!] Adds Special Rules and Metaprotections to Antagonist Objective Panels #504

Merged
merged 2 commits into from
Nov 23, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Original PR: Skyrat-SS13/Skyrat-tg#24040

About The Pull Request

This PR adds a section containing a hyperlink to any special rules and metaprotections listed in antagonist policy to the "You Are The 'X'" traitor window that opens up upon being given an antag role.

Note that I've not been able to test all of the antags available, particularly the "obsessed" and "pirate" roles. This PR should be TM'd for a short while to make sure those blindspots function as intended.

How This Contributes To The Skyrat Roleplay Experience

Clear and active communication means less work for admins, less confusion for players, and a lower barrier to entry for playing antags on Skyrat. The idea is cut out the middleman of "go look for your rules in the wiki" when being given an antag role. This should have the effect of players having an easier time navigating antag policy, meaning fewer bwoinks for rules they didn't know about.

Proof of Testing

Screenshots/Videos

AntagInfo_V3

Changelog

🆑 LovliestPlant
add: Adds links to any special rules or metaprotections to antag's objective panels.
/:cl:

…ntagonist Objective Panels (#24040)

* The Goods

* Turned 'Prettier' back on

* Fixing SKYRAT EDIT tag formatting

* Grammar fixes

* Update tgui/packages/tgui/interfaces/AntagInfoClock.tsx

Co-authored-by: GoldenAlpharex <[email protected]>

* Update tgui/packages/tgui/interfaces/AntagInfoBlob.tsx

Co-authored-by: GoldenAlpharex <[email protected]>

* Update tgui/packages/tgui/interfaces/AntagInfoClock.tsx

Co-authored-by: GoldenAlpharex <[email protected]>

* Update tgui/packages/tgui/interfaces/AntagInfoAssaultops.tsx

Co-authored-by: GoldenAlpharex <[email protected]>

* Update tgui/packages/tgui/interfaces/AntagInfoGeneric.tsx

Co-authored-by: GoldenAlpharex <[email protected]>

* Update tgui/packages/tgui/interfaces/AntagInfoGeneric.tsx

Co-authored-by: GoldenAlpharex <[email protected]>

* Update tgui/packages/tgui/interfaces/AntagInfoGeneric.tsx

Co-authored-by: GoldenAlpharex <[email protected]>

* Update tgui/packages/tgui/interfaces/AntagInfoGeneric.tsx

Co-authored-by: GoldenAlpharex <[email protected]>

* Update tgui/packages/tgui/interfaces/AntagInfoMalf.tsx

Co-authored-by: GoldenAlpharex <[email protected]>

* Update tgui/packages/tgui/interfaces/AntagInfoMalf.tsx

Co-authored-by: GoldenAlpharex <[email protected]>

* Apply suggestions from code review

Co-authored-by: GoldenAlpharex <[email protected]>

* Overhauls to use hyperlinks

* Consolidates Changes into one file (mostly)

- Stack sections with hyperlinks have been condensed into a single file.
- They are now imported where needed.

---------

Co-authored-by: Giz <[email protected]>
Co-authored-by: GoldenAlpharex <[email protected]>
@AnywayFarus
Copy link
Contributor

ну кажется тут надо немного вмешаться

Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself.

@github-actions github-actions bot added the Stale label Nov 16, 2023
@Iajret Iajret removed the Stale label Nov 16, 2023
@ReezeBL
Copy link
Contributor

ReezeBL commented Nov 23, 2023

настало время..

@ReezeBL ReezeBL enabled auto-merge (squash) November 23, 2023 19:11
@ReezeBL ReezeBL disabled auto-merge November 23, 2023 19:11
@ReezeBL ReezeBL enabled auto-merge (squash) November 23, 2023 19:11
@ReezeBL ReezeBL merged commit fbdd283 into master Nov 23, 2023
23 checks passed
AnywayFarus added a commit that referenced this pull request Nov 23, 2023
@Iajret Iajret deleted the upstream-mirror-24040 branch November 24, 2023 09:47
Iajret pushed a commit that referenced this pull request Jan 17, 2024
…emoval lines instead. (#504)

* Revert "Makes immerse use weakrefs", prioritizing some ref removal lines instead. (#80707)

## About The Pull Request
For a moment, I had forgot about saying I'd take a look into it, but it
seems the new fix to hard dels is causing some runtimes with empty
weakrefs. Beside, WEAKREF() doesn't work well with qdeleting atoms (so
you'd have to access the weak_reference var directly).
How immersion works is quite confusing even for me who coded it, trying
to work around some of the hefty limitations of the engine truly blows.
I could even ask MrMelbert to make a proc-chain chart for it.

But yeah, long story short, I only have a bare idea where the uncleared
refs would be. I suspect it could be `immersed_movables`. It's totally
possible since the proc can early return in a few cases, thus skipping
the ref removal, hence the title.

## Why It's Good For The Game
I didn't like the PR that implemented weakref usage into the element,
but I let it pass because "hard dels = bad". However, the runtimes
aren't that much more pleasant either.

## Changelog
N/A

* Revert "Makes immerse use weakrefs", prioritizing some ref removal lines instead.

---------

Co-authored-by: Ghom <[email protected]>
Co-authored-by: NovaBot <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants