diff --git a/code/game/gamemodes/mutiny/mutiny_admin.dm b/code/game/gamemodes/mutiny/mutiny_admin.dm index 2ba08def2d9..e4b2cca1c63 100644 --- a/code/game/gamemodes/mutiny/mutiny_admin.dm +++ b/code/game/gamemodes/mutiny/mutiny_admin.dm @@ -1,4 +1,4 @@ -/datum/game_mode/mutiny/proc/check_antagonists_ui(admins) +/datum/game_mode/mutiny/proc/check_antagonists_ui(datum/admins/admins) var/turf/captains_key_loc = captains_key ? captains_key.get_loc_turf() : "Lost or Destroyed" var/turf/secondary_key_loc = secondary_key ? secondary_key.get_loc_turf() : "Lost or Destroyed" var/remaining_objectives = current_directive.get_remaining_orders() @@ -29,22 +29,22 @@ txt += "Reassign Head Loyalist
" if(head_loyalist) - txt += check_role_table("Head Loyalist", list(head_loyalist), admins, 0) + txt += admins.check_role_table("Head Loyalist", list(head_loyalist), 0) var/list/loyal_crew = loyalists - head_loyalist if(loyal_crew.len) - txt += check_role_table("Loyalists", loyal_crew, admins, 0) + txt += admins.check_role_table("Loyalists", loyal_crew, 0) txt += "Reassign Head Mutineer
" if(head_mutineer) - txt += check_role_table("Head Mutineer", list(head_mutineer), admins, 0) + txt += admins.check_role_table("Head Mutineer", list(head_mutineer), 0) var/list/mutiny_crew = mutineers - head_mutineer if(mutiny_crew.len) - txt += check_role_table("Mutineers", mutiny_crew, admins, 0) + txt += admins.check_role_table("Mutineers", mutiny_crew, 0) if(body_count.len) - txt += check_role_table("Casualties", body_count, admins, 0) + txt += admins.check_role_table("Casualties", body_count, 0) return txt diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm index 766cee622a0..3802c7c7432 100644 --- a/code/modules/admin/player_panel.dm +++ b/code/modules/admin/player_panel.dm @@ -394,7 +394,7 @@ -/proc/check_antagonists_line(mob/M, caption = "", close = 1) +/datum/admins/proc/check_antagonists_line(mob/M, caption = "", close = 1) var/logout_status if(istype(M, /mob/living/carbon/human/interactive)) logout_status = " (snpc)" @@ -483,52 +483,52 @@ dat += "" if(ticker.mode.changelings.len) - dat += check_role_table("Changelings", ticker.mode.changelings, src) + dat += check_role_table("Changelings", ticker.mode.changelings) if(ticker.mode.wizards.len) - dat += check_role_table("Wizards", ticker.mode.wizards, src) + dat += check_role_table("Wizards", ticker.mode.wizards) if(ticker.mode.raiders.len) - dat += check_role_table("Raiders", ticker.mode.raiders, src) + dat += check_role_table("Raiders", ticker.mode.raiders) /*if(ticker.mode.ninjas.len) - dat += check_role_table("Ninjas", ticker.mode.ninjas, src)*/ + dat += check_role_table("Ninjas", ticker.mode.ninjas)*/ if(ticker.mode.cult.len) - dat += check_role_table("Cultists", ticker.mode.cult, src, 0) + dat += check_role_table("Cultists", ticker.mode.cult, 0) if(ticker.mode.traitors.len) - dat += check_role_table("Traitors", ticker.mode.traitors, src) + dat += check_role_table("Traitors", ticker.mode.traitors) if(ticker.mode.shadows.len) - dat += check_role_table("Shadowlings", ticker.mode.shadows, src) + dat += check_role_table("Shadowlings", ticker.mode.shadows) if(ticker.mode.shadowling_thralls.len) - dat += check_role_table("Shadowling Thralls", ticker.mode.shadowling_thralls, src) + dat += check_role_table("Shadowling Thralls", ticker.mode.shadowling_thralls) if(ticker.mode.abductors.len) - dat += check_role_table("Abductors", ticker.mode.abductors, src) + dat += check_role_table("Abductors", ticker.mode.abductors) if(ticker.mode.abductees.len) - dat += check_role_table("Abductees", ticker.mode.abductees, src) + dat += check_role_table("Abductees", ticker.mode.abductees) if(ticker.mode.vampires.len) - dat += check_role_table("Vampires", ticker.mode.vampires, src) + dat += check_role_table("Vampires", ticker.mode.vampires) if(ticker.mode.vampire_enthralled.len) - dat += check_role_table("Vampire Thralls", ticker.mode.vampire_enthralled, src) + dat += check_role_table("Vampire Thralls", ticker.mode.vampire_enthralled) if(ticker.mode.xenos.len) - dat += check_role_table("Xenos", ticker.mode.xenos, src) + dat += check_role_table("Xenos", ticker.mode.xenos) if(ticker.mode.superheroes.len) - dat += check_role_table("Superheroes", ticker.mode.superheroes, src) + dat += check_role_table("Superheroes", ticker.mode.superheroes) if(ticker.mode.supervillains.len) - dat += check_role_table("Supervillains", ticker.mode.supervillains, src) + dat += check_role_table("Supervillains", ticker.mode.supervillains) if(ticker.mode.greyshirts.len) - dat += check_role_table("Greyshirts", ticker.mode.greyshirts, src) + dat += check_role_table("Greyshirts", ticker.mode.greyshirts) var/datum/game_mode/mutiny/mutiny = get_mutiny_mode() if(mutiny) @@ -539,14 +539,14 @@ else alert("The game hasn't started yet!") -/proc/check_role_table(name, list/members, admins, show_objectives=1) +/datum/admins/proc/check_role_table(name, list/members, show_objectives=1) var/txt = "
" for(var/datum/mind/M in members) - txt += check_role_table_row(M.current, admins, show_objectives) + txt += check_role_table_row(M.current, show_objectives) txt += "
[name]
" return txt -/proc/check_role_table_row(mob/M, admins=src, show_objectives) +/datum/admins/proc/check_role_table_row(mob/M, show_objectives) if (!istype(M)) return "Not found!" @@ -555,7 +555,7 @@ if (show_objectives) txt += {" - Show Objective + Show Objective "}