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] Fix captive xeno roundend report runtime #2764

Merged
merged 1 commit into from
Apr 7, 2024

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Nova: NovaSector/NovaSector#1844
Original PR: tgstation/tgstation#82490

About The Pull Request

check_captivity accepts a mob, not a mind

image

Which leads me to believe this always returned null and always failed.

But checking further and this proc does not return a truthy or falsy value at all, meaning even if this runtime didn't happen, it still wouldn't function correctly. So I made it check for CAPTIVE_XENO_PASS.

Changelog

🆑 Melbert
fix: Captive Xeno end round report should make a tad more sense
/:cl:

* Fix captive xeno roundend report runtime (#82490)

## About The Pull Request

`check_captivity` accepts a mob, not a mind


![image](https://github.com/tgstation/tgstation/assets/51863163/77952d56-8142-4bbc-8042-028dcb39a989)

Which leads me to believe this always returned `null` and always failed.

But checking further and this proc does not return a truthy or falsy
value at all, meaning even if this runtime didn't happen, it still
wouldn't function correctly. So I made it check for `CAPTIVE_XENO_PASS`.

## Changelog

:cl: Melbert
fix: Captive Xeno end round report should make a tad more sense
/:cl:

* Fix captive xeno roundend report runtime

---------

Co-authored-by: MrMelbert <[email protected]>
@mogeoko mogeoko merged commit 4795f00 into master Apr 7, 2024
26 checks passed
@mogeoko mogeoko deleted the upstream-mirror-1844 branch April 7, 2024 08:04
AnywayFarus added a commit that referenced this pull request Apr 7, 2024
Iajret pushed a commit that referenced this pull request Jun 1, 2024
* Gives the Lawyer a pet goldfish (#83461)

## About The Pull Request

The law office now has a pet, a goldfish named McGill.

## Why It's Good For The Game

I've wanted to integrate aquariums and fishes in general into more
roundstart, since it currently either requires being built and/or
ordered, and thought giving it as a pet to the Law Office would be
pretty cool since the law office doesn't have one and deserves one, and
also just a silly reference.

## Changelog

:cl:
add: The Law office now has a pet goldfish.
/:cl:

* Gives the Lawyer a pet goldfish

* Adds to our maps

---------

Co-authored-by: John Willard <[email protected]>
Co-authored-by: NovaBot13 <[email protected]>
Co-authored-by: Mal <[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