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 a hard del in monkey AI #1194

Merged
merged 1 commit into from
Dec 18, 2023
Merged

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#25713
Original PR: tgstation/tgstation#80425

About The Pull Request

firefox_KI4H4wxvN3

Fixes this hard del, caused by a del-on-death mob being qdeleted after being victim to the monkey's attack. When a mob gets qdeleted, they remove themselves from the blackboard.

Monkey code was then adding it back immediately after, resulting in the hard del. Adds safeties to ensure that won't happen.

Why It's Good For The Game

Less annoying CI failures

Changelog

🆑 vinylspiders
fix: monkeys will no longer cause other monkeys to get angry at the mobs they just poofed by attacking
/:cl:

* Fixes a hard del in monkey AI (#80425)

## About The Pull Request

![firefox_KI4H4wxvN3](https://github.com/tgstation/tgstation/assets/13398309/6e8c18f3-2413-4eaf-8436-15fd7aea9c51)

Fixes this hard del, caused by a del-on-death mob being qdeleted after
being victim to the monkey's attack. When a mob gets qdeleted, they
remove themselves from the blackboard.

Monkey code was then adding it back immediately after, resulting in the
hard del. Adds safeties to ensure that won't happen.

## Why It's Good For The Game

Less annoying CI failures

## Changelog

:cl:
fix: monkeys will no longer cause other monkeys to get angry at the mobs
they just poofed by attacking
/:cl:

* Fixes a hard del in monkey AI

---------

Co-authored-by: Bloop <[email protected]>
@Iajret Iajret merged commit df34db7 into master Dec 18, 2023
23 checks passed
@Iajret Iajret deleted the upstream-mirror-25713 branch December 18, 2023 20:50
AnywayFarus added a commit that referenced this pull request Dec 18, 2023
Iajret pushed a commit that referenced this pull request Feb 28, 2024
* fixes inability to create material airlocks (#81711)

## About The Pull Request

Fixes tgstation/tgstation#81710

runtime due to parent proc not returning the airlock
also added an update_appearance()
## Changelog
:cl:
fix: You can build material airlocks again
/:cl:

* fixes inability to create material airlocks

---------

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