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

[MIRROR] subsystem antag (#12599)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2026-03-26 22:40:03 -04:00
committed by GitHub
co-authored by Kashargul Cameron Lennox
parent 9d7e5e7cf7
commit 092c641c3c
48 changed files with 234 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/disease_outbreak.dm
+1 -1
View File
@@ -34,7 +34,7 @@ GLOBAL_LIST_EMPTY(current_pending_diseases)
var/list/candidates = list()
for(var/mob/living/carbon/human/G in GLOB.human_mob_list)
if(G.mind && G.stat != DEAD && G.is_client_active(5) && !player_is_antag(G.mind))
if(G.mind && G.stat != DEAD && G.is_client_active(5) && !SSantag_job.player_is_antag(G.mind))
var/area/A = get_area(G)
if(!A)
continue
code/modules/events/ion_storm.dm
+1 -1
View File
@@ -27,7 +27,7 @@
/datum/event/ionstorm/start()
for (var/mob/living/carbon/human/player in GLOB.player_list)
if( !player.mind || player_is_antag(player.mind, only_offstation_roles = 1) || player.client.inactivity > 10 MINUTES)
if( !player.mind || SSantag_job.player_is_antag(player.mind, only_offstation_roles = 1) || player.client.inactivity > 10 MINUTES)
continue
players += player.real_name
code/modules/events/random_antagonist.dm
+2 -2
View File
@@ -4,8 +4,8 @@
/datum/event/random_antag/start()
var/list/valid_types = list()
for(var/antag_type in GLOB.all_antag_types)
var/datum/antagonist/antag = GLOB.all_antag_types[antag_type]
for(var/antag_type in SSantag_job.all_antag_types)
var/datum/antagonist/antag = SSantag_job.all_antag_types[antag_type]
if(antag.flags & ANTAG_RANDSPAWN)
valid_types |= antag
if(valid_types.len)