Skip to content

Commit

Permalink
[MIRROR] Fix captive xeno roundend report runtime (#1844)
Browse files Browse the repository at this point in the history
* 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]>
  • Loading branch information
2 people authored and StealsThePRs committed Apr 7, 2024
1 parent 9f6e117 commit 877bac6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion code/modules/antagonists/xeno/xeno.dm
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@

parts += "<span class='header'>The [name] were:</span> <br>"

if(check_captivity(progenitor))
if(check_captivity(progenitor.current) == CAPTIVE_XENO_PASS)
parts += span_greentext("The progenitor of this hive was [progenitor.key], as [progenitor], who successfully escaped captivity!") + "<br>"
else
parts += span_redtext("The progenitor of this hive was [progenitor.key], as [progenitor], who failed to escape captivity") + "<br>"
Expand Down

0 comments on commit 877bac6

Please sign in to comment.