Skip to content

Commit

Permalink
Fix roundstart antag rulesets breaking with the Late Arrivals trait (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
Absolucy authored Jun 13, 2024
1 parent c4ac29c commit cee99a1
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion monkestation/code/modules/storytellers/gamemode_subsystem.dm
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,10 @@ SUBSYSTEM_DEF(gamemode)
else if(living_players && isliving(player))
if(!ishuman(player) && !isAI(player))
continue
if(!(player.z in SSmapping.levels_by_trait(ZTRAIT_STATION)))
// I split these checks up to make the code more readable ~Lucy
var/is_on_station = is_station_level(player.z)
var/is_late_arrival = HAS_TRAIT(SSstation, STATION_TRAIT_LATE_ARRIVALS) && istype(get_area(player), /area/shuttle/arrival)
if(!is_on_station && !is_late_arrival)
continue
candidate_candidates += player

Expand Down

0 comments on commit cee99a1

Please sign in to comment.