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] [MODULAR] Re-Replaces Demonic Watcher Trophy #210

Merged
merged 1 commit into from
Oct 22, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

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

About The Pull Request

Hi! In #24188, ice demons (the demonic watcher things we all used to hate) were reworked and given a unique trophy.

demon.mp4

Look how cool that is. However, it was being overridden by the 'demon core' one we coded in back when Ashwalkers were still prowling the ice wastes. I feel this one is a lot more unique, and generally just cooler. So the demon core is now no more. Long live the demon cube.

How This Contributes To The Skyrat Roleplay Experience

Muh summoner build.

Proof of Testing

Screenshots/Videos :3

Changelog

🆑 Nerev4r
fix: Demonic Watchers now drop the proper trophy.
/:cl:

* wew

* whoops lol

---------

Co-authored-by: Snakebittenn <[email protected]>
@Iajret Iajret merged commit 023681a into master Oct 22, 2023
23 checks passed
@Iajret Iajret deleted the upstream-mirror-24472 branch October 22, 2023 13:12
AnywayFarus added a commit that referenced this pull request Oct 22, 2023
Iajret pushed a commit that referenced this pull request Jan 3, 2024
* Rewrites dropdown and popper components as FCs (#80556)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Completely rewrites the popper and dropdown component as functional
components

`Popper` component now has built in `onClickOutside` and `placement`
props

![Biyq8wSTKI](https://github.com/tgstation/tgstation/assets/42397676/653636cc-6b41-421f-b116-558287d336ee)

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
Fixes some weirdness with dropdowns due to the recent react conversion +
code maintenance
<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
fix: Dropdowns and pop-up menus have been rewritten. This should fix an
issue where dropdown text was accidentally scrolling if hovered. Please
report any issues on the repo
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

* Rewrites dropdown and popper components as FCs

---------

Co-authored-by: Jeremiah <[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.

3 participants