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] Fixes character screen #1082

Merged
merged 2 commits into from
Dec 12, 2023
Merged

[MIRROR] Fixes character screen #1082

merged 2 commits into from
Dec 12, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#25565
Original PR: tgstation/tgstation#80259

About The Pull Request

TrackOutsideClicks would register extra clicks and immediately close

proof

IlRIDpzoIG

Why It's Good For The Game

Bug fix
Fixes #80239

Changelog

🆑 jlsnow301
fix: You should be able to edit your character using the feature buttons again.
/:cl:

* Fixes character screen [NO GBP] (#80259)

## About The Pull Request
TrackOutsideClicks would register extra clicks and immediately close

<details>
<summary>proof</summary>

![IlRIDpzoIG](https://github.com/tgstation/tgstation/assets/42397676/caf1d8fd-a8c5-4978-af0b-c12601c61df1)

</details>

## Why It's Good For The Game
Bug fix
Fixes #80239
## Changelog
:cl:
fix: You should be able to edit your character using the feature buttons
again.
/:cl:

* Fixes character screen [NO GBP]

---------

Co-authored-by: Jeremiah <[email protected]>
@Iajret Iajret merged commit 67f7a28 into master Dec 12, 2023
22 checks passed
@Iajret Iajret deleted the upstream-mirror-25565 branch December 12, 2023 09:06
AnywayFarus added a commit that referenced this pull request Dec 12, 2023
Iajret pushed a commit that referenced this pull request Feb 21, 2024
* Half fixes organ blood dna not updating (#81584)

## About The Pull Request

Organs have this mechanic where they store the first mob who owned it's
DNA

Anyways it was broken from the organ nullspace refactor because they
intended a block of code that shouldn't have been indented

But this only *half* fixes the issue, you see a problem here?


![image](https://github.com/tgstation/tgstation/assets/51863163/886dd926-3242-4305-825b-a715d6848281)

Yeah there's an order of operation thing going on here because you get
your organs before you get your species bloodtype
This only affects species with weird blood types (like lizards)
I'm not fixing it in this PR because it was certainly broken before and
needs a bit more unwinding somewhere

## Changelog

:cl: Melbert
fix: Organs have the blood DNA of their owns on them again
/:cl:

* Half fixes organ blood dna not updating

---------

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