cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 13:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Recovered Crew | Medical+Cargo Respawns (#87072)

Browse Source 
Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: _0Steven <42909981+00-Steven@users.noreply.github.com>
Co-authored-by: SmArtKar <44720187+SmArtKar@users.noreply.github.com>
This commit is contained in:
Time-Green
2024-10-26 09:36:57 +02:00
committed by GitHub
co-authored by MrMelbert _0Steven SmArtKar
parent 95cc258845
commit d170a410d4
45 changed files with 950 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/dynamic/dynamic_rulesets_midround.dm
+3 -3
View File
@@ -261,7 +261,7 @@
candidates -= player
else if(is_centcom_level(player.z))
candidates -= player // We don't autotator people in CentCom
else if(player.mind && (player.mind.special_role || player.mind.antag_datums?.len > 0))
else if(player.mind && (player.mind.special_role || player.mind.can_roll_midround()))
candidates -= player // We don't autotator people with roles already
/datum/dynamic_ruleset/midround/from_living/autotraitor/execute()
@@ -310,7 +310,7 @@
continue
if(isnull(player.mind))
continue
if(player.mind.special_role || length(player.mind.antag_datums))
if(player.mind.special_role || player.mind.can_roll_midround())
continue
candidates += player
@@ -479,7 +479,7 @@
candidates -= player
continue
if(player.mind && (player.mind.special_role || length(player.mind.antag_datums) > 0))
if(player.mind && (player.mind.special_role || player.mind.can_roll_midround()))
candidates -= player
/datum/dynamic_ruleset/midround/from_living/blob_infection/execute()