diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm index 85f7d63b971..54d29950951 100644 --- a/code/game/gamemodes/changeling/changeling.dm +++ b/code/game/gamemodes/changeling/changeling.dm @@ -1,11 +1,7 @@ - // This list is basically a copy of GLOB.greek_letters, but it also removes letters when a changeling spawns in with that ID GLOBAL_LIST_INIT(possible_changeling_IDs, list("Alpha","Beta","Gamma","Delta","Epsilon","Zeta","Eta","Theta","Iota","Kappa","Lambda","Mu","Nu","Xi","Omicron","Pi","Rho","Sigma","Tau","Upsilon","Phi","Chi","Psi","Omega")) -/datum/game_mode - var/list/datum/mind/changelings = list() - /datum/game_mode/changeling name = "changeling" config_tag = "changeling" diff --git a/code/game/gamemodes/cult/cult_mode.dm b/code/game/gamemodes/cult/cult_mode.dm index 3e5c5145c37..44bb458dc1d 100644 --- a/code/game/gamemodes/cult/cult_mode.dm +++ b/code/game/gamemodes/cult/cult_mode.dm @@ -1,6 +1,3 @@ -/datum/game_mode - var/datum/team/cult/cult_team - /datum/game_mode/proc/get_cult_team() if(!cult_team) new /datum/team/cult() // assignment happens in create_team() diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 67eb21a8aae..e2a0d9a18a1 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -45,6 +45,51 @@ /// Each item in this list can only be rolled once on average. var/list/single_antag_positions = list("Head of Personnel", "Chief Engineer", "Research Director", "Chief Medical Officer", "Quartermaster") + /// A list of all minds which have the traitor antag datum. + var/list/datum/mind/traitors = list() + /// An associative list with mindslave minds as keys and their master's minds as values. + var/list/datum/mind/implanted = list() + /// A list of all minds which have the changeling antag datum + var/list/datum/mind/changelings = list() + /// A list of all minds which have the vampire antag datum + var/list/datum/mind/vampires = list() + /// A list of all minds which are thralled by a vampire + var/list/datum/mind/vampire_enthralled = list() + /// A list of all minds which have the wizard special role + var/list/datum/mind/wizards = list() + /// A list of all minds that are wizard apprentices + var/list/datum/mind/apprentices = list() + + /// The cult team datum + var/datum/team/cult/cult_team + + /// How many abductor teams do we have + var/abductor_teams = 0 + /// A list which contains the minds of all abductors + var/list/datum/mind/abductors = list() + /// A list which contains the minds of all abductees + var/list/datum/mind/abductees = list() + + /// A list of all the nuclear operatives' minds + var/list/datum/mind/syndicates = list() + + /// A list of all the minds of head revolutionaries + var/list/datum/mind/head_revolutionaries = list() + /// A list of all the minds of revolutionaries + var/list/datum/mind/revolutionaries = list() + /// The revololution team datum + var/datum/team/revolution/rev_team + + /// A list of all the minds with the superhero special role + var/list/datum/mind/superheroes = list() + /// A list of all the minds with the supervillain special role + var/list/datum/mind/supervillains = list() + /// A list of all the greyshirt minds + var/list/datum/mind/greyshirts = list() + + /// A list of all the minds that have the ERT special role + var/list/datum/mind/ert = list() + /datum/game_mode/proc/announce() //to be calles when round starts to_chat(world, "Notice: [src] did not define announce()") diff --git a/code/game/gamemodes/miniantags/abduction/abduction.dm b/code/game/gamemodes/miniantags/abduction/abduction.dm index f5a56423451..70cdf2edc9f 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction.dm @@ -1,8 +1,3 @@ -/datum/game_mode - var/abductor_teams = 0 - var/list/datum/mind/abductors = list() - var/list/datum/mind/abductees = list() - /datum/game_mode/abduction name = "abduction" config_tag = "abduction" diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 791be28f86c..79f2f7bcbf4 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -1,8 +1,5 @@ #define NUKESCALINGMODIFIER 6 -/datum/game_mode - var/list/datum/mind/syndicates = list() - /proc/issyndicate(mob/living/M as mob) return istype(M) && M.mind && SSticker && SSticker.mode && (M.mind in SSticker.mode.syndicates) diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index 9583e0e849f..1f0f048cc64 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -4,11 +4,6 @@ #define REV_VICTORY 1 #define STATION_VICTORY 2 -/datum/game_mode - var/list/datum/mind/head_revolutionaries = list() - var/list/datum/mind/revolutionaries = list() - var/datum/team/revolution/rev_team - /datum/game_mode/revolution name = "revolution" config_tag = "revolution" diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index fe0fb08a784..e8c2249efdd 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -1,9 +1,3 @@ -/datum/game_mode - /// A list of all minds which have the traitor antag datum. - var/list/datum/mind/traitors = list() - /// An associative list with mindslave minds as keys and their master's minds as values. - var/list/datum/mind/implanted = list() - /datum/game_mode/traitor name = "traitor" config_tag = "traitor" diff --git a/code/game/gamemodes/vampire/vampire_gamemode.dm b/code/game/gamemodes/vampire/vampire_gamemode.dm index 306ef74cb9a..6e274c5b3a8 100644 --- a/code/game/gamemodes/vampire/vampire_gamemode.dm +++ b/code/game/gamemodes/vampire/vampire_gamemode.dm @@ -1,7 +1,3 @@ -/datum/game_mode - var/list/datum/mind/vampires = list() - var/list/datum/mind/vampire_enthralled = list() //those controlled by a vampire - /datum/game_mode/vampire name = "vampire" config_tag = "vampire" diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index 30c7e40b300..960be8e8375 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -1,7 +1,3 @@ -/datum/game_mode - var/list/datum/mind/wizards = list() - var/list/datum/mind/apprentices = list() - /datum/game_mode/wizard name = "wizard" config_tag = "wizard" diff --git a/code/modules/mob/living/carbon/superheroes.dm b/code/modules/mob/living/carbon/superheroes.dm index b5f2f797b38..3c317c8688e 100644 --- a/code/modules/mob/living/carbon/superheroes.dm +++ b/code/modules/mob/living/carbon/superheroes.dm @@ -1,8 +1,3 @@ -/datum/game_mode - var/list/datum/mind/superheroes = list() - var/list/datum/mind/supervillains = list() - var/list/datum/mind/greyshirts = list() - /datum/superheroes var/name var/desc diff --git a/code/modules/response_team/ert.dm b/code/modules/response_team/ert.dm index 65893025fc1..5830ff8631f 100644 --- a/code/modules/response_team/ert.dm +++ b/code/modules/response_team/ert.dm @@ -4,9 +4,6 @@ #define ERT_TYPE_RED 2 #define ERT_TYPE_GAMMA 3 -/datum/game_mode - var/list/datum/mind/ert = list() - GLOBAL_LIST_EMPTY(response_team_members) GLOBAL_VAR_INIT(responseteam_age, 21) // Minimum account age to play as an ERT member GLOBAL_DATUM(active_team, /datum/response_team)