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 Spontaneous Harddel with Boned Fish Revive Ability #2397

Merged
merged 1 commit into from
Mar 14, 2024

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Nova: NovaSector/NovaSector#1426
Original PR: tgstation/tgstation#81959

About The Pull Request

You can find an example of the failing stack trace here: https://github.com/tgstation/tgstation/actions/runs/8242191499/job/22540786029?pr=81937#step:10:1323

Here's a screenshot:

image

Explanation: The boned fish's revive ability added a timer that would randomly fire in the next one-to-two minutes. Due to this inherent randomness, create-and-destroy would locate the fact that we were hanging refs to this fish since the timer may not have processed by the time the fish was deleted (probably if the timer was considerably more than one minute), so in order to fix this let's just add the TIMER_DELETE_ME flag to the revive ability so that the timer get's qdel'd on the fish's Destroy(). simple

i probably cocked up some detail of the above explanation but the timer flag was literally created to prevent stuff like this from happening so let's use it

Changelog

don't matter

)

* Fixes Spontaneous Harddel with Boned Fish Revive Ability (#81959)

## About The Pull Request

You can find an example of the failing stack trace here:
https://github.com/tgstation/tgstation/actions/runs/8242191499/job/22540786029?pr=81937#step:10:1323

Here's a screenshot:


![image](https://github.com/tgstation/tgstation/assets/34697715/2a7c1c70-c82e-4790-b8e5-e05187a77f1a)

Explanation: The boned fish's revive ability added a timer that would
randomly fire in the next one-to-two minutes. Due to this inherent
randomness, create-and-destroy would locate the fact that we were
hanging refs to this fish since the timer may not have processed by the
time the fish was deleted (probably if the timer was considerably more
than one minute), so in order to fix this let's just add the
`TIMER_DELETE_ME` flag to the revive ability so that the timer get's
`qdel`'d on the fish's `Destroy()`. simple

i probably cocked up some detail of the above explanation but the timer
flag was literally created to prevent stuff like this from happening so
let's use it

## Changelog

don't matter

* Fixes Spontaneous Harddel with Boned Fish Revive Ability

---------

Co-authored-by: san7890 <[email protected]>
@ReezeBL ReezeBL merged commit 95c9313 into master Mar 14, 2024
24 checks passed
@ReezeBL ReezeBL deleted the upstream-mirror-1426 branch March 14, 2024 08:12
Iajret pushed a commit that referenced this pull request May 9, 2024
* Fix conveyor switches not working for cyborgs (#83121)

## About The Pull Request
Makes conveyor switches work for cyborgs again

## Why It's Good For The Game
The left/right click update broke it. Fixes #83078 

## Changelog
:cl:
fix: conveyor switches work for cyborgs again
/:cl:

* Fix conveyor switches not working for cyborgs

---------

Co-authored-by: Echriser <[email protected]>
ReezeBL pushed a commit that referenced this pull request May 9, 2024
* Fix conveyor switches not working for cyborgs (#83121)

## About The Pull Request
Makes conveyor switches work for cyborgs again

## Why It's Good For The Game
The left/right click update broke it. Fixes #83078 

## Changelog
:cl:
fix: conveyor switches work for cyborgs again
/:cl:

* Fix conveyor switches not working for cyborgs

---------

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