Skip to content

Commit

Permalink
[PORT] Fix some bugs related to the xenomorph roundend report (#2423)
Browse files Browse the repository at this point in the history
* Science Xenos no longer turn the roundend report all bold (#81311)

## About The Pull Request

Fixes the 2% xeno's roundend report from turning the rest of the report
into bold letters.

## Why It's Good For The Game

look it's not all bold anymore

![image](https://github.com/tgstation/tgstation/assets/53777086/5b46dc02-5fb5-4d16-aedf-fc1c11aad045)

## Changelog

:cl:
fix: Science Xenos no longer turn the entire roundend report into bold
letters.
/: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:

---------

Co-authored-by: John Willard <[email protected]>
Co-authored-by: MrMelbert <[email protected]>
  • Loading branch information
3 people authored Jul 21, 2024
1 parent 2196c22 commit 3eee741
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions 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 All @@ -138,7 +138,7 @@
else
thank_you_message = "xenofauna combat effectiveness"

parts += "<span class='neutraltext'>Nanotrasen thanks the crew of [station_name()] for providing much needed research data on <b>[thank_you_message]<b>.</span>"
parts += "<span class='neutraltext'>Nanotrasen thanks the crew of [station_name()] for providing much needed research data on <b>[thank_you_message]</b>.</span>"

return "<div class='panel redborder'>[parts.Join("<br>")]</div> <br>"

Expand Down

0 comments on commit 3eee741

Please sign in to comment.