Skip to content

Commit

Permalink
[NO GBP] Fixes excess xenomorph teams being formed (tgstation#74248)
Browse files Browse the repository at this point in the history
## About The Pull Request

This removes an istype check I left in create_team() on the xeno antag
datum. While the check was intended to stop regular xenomorphs from
receiving captive xenomorph antag datums, it ended up being unnecessary
because:

Captive Xenomorphs got their own create_team() at a certain point,
making this irrelevant

and

The check would always fail (Since, to get to this point in the code,
new_team would have to be null) and lead to every xeno receiving their
own team.


![image](https://user-images.githubusercontent.com/28870487/227735216-d4da7c17-4ef6-48e0-a80a-94015ec04ccd.png)

Whoops.
## Why It's Good For The Game

Makes the roundend report less UGLY. Cleans up an oopsie I made.
## Changelog
:cl:
fix: Xenomorphs will now be properly teamed together again, and will
show up together on the roundend report.
/:cl:
  • Loading branch information
Rhials authored Mar 26, 2023
1 parent 800213b commit f588c94
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 @@ -31,7 +31,7 @@
/datum/antagonist/xeno/create_team(datum/team/xeno/new_team)
if(!new_team)
for(var/datum/antagonist/xeno/X in GLOB.antagonists)
if(!X.owner || !X.xeno_team || !istype(X.xeno_team, new_team)) //Make sure we don't add them to the wrong team
if(!X.owner || !X.xeno_team)
continue
xeno_team = X.xeno_team
return
Expand Down

0 comments on commit f588c94

Please sign in to comment.