Merge pull request #40365 from AnturK/team-panel

Admin team panel
This commit is contained in:
oranges
2018-09-28 09:27:15 +12:00
committed by GitHub
9 changed files with 285 additions and 34 deletions
+2 -1
View File
@@ -164,7 +164,8 @@
dat += "Living crew limit: <a href='?_src_=holder;[HrefToken()];alter_midround_life_limit=1'>[CONFIG_GET(number/midround_antag_life_check) * 100]% of crew alive</a><BR>"
dat += "If limits past: <a href='?_src_=holder;[HrefToken()];toggle_noncontinuous_behavior=1'>[SSticker.mode.round_ends_with_antag_death ? "End The Round" : "Continue As Extended"]</a><BR>"
dat += "<a href='?_src_=holder;[HrefToken()];end_round=[REF(usr)]'>End Round Now</a><br>"
dat += "<a href='?_src_=holder;[HrefToken()];delay_round_end=1'>[SSticker.delay_end ? "End Round Normally" : "Delay Round End"]</a>"
dat += "<a href='?_src_=holder;[HrefToken()];delay_round_end=1'>[SSticker.delay_end ? "End Round Normally" : "Delay Round End"]</a><br>"
dat += "<a href='?_src_=holder;[HrefToken()];check_teams=1'>Check Teams</a>"
var/connected_players = GLOB.clients.len
var/lobby_players = 0
var/observers = 0
+183
View File
@@ -0,0 +1,183 @@
//Split into Team List -> Team Details ?
/datum/admins/proc/team_listing()
var/list/content = list()
for(var/datum/team/T in GLOB.antagonist_teams)
content += "<h3>[T.name] - [T.type]</h3>"
content += "<a href='?_src_=holder;[HrefToken()];team_command=rename_team;team=[REF(T)]'>Rename</a>"
content += "<a href='?_src_=holder;[HrefToken()];team_command=delete_team;team=[REF(T)]'>Delete</a>"
content += "<a href='?_src_=holder;[HrefToken()];team_command=communicate;team=[REF(T)]'>Communicate</a>"
for(var/command in T.get_admin_commands())
content += "<a href='?src=[REF(T)];command=[command]'>[command]</a>"
content += "<br>"
content += "Objectives:<br><ol>"
for(var/datum/objective/O in T.objectives)
content += "<li>[O.explanation_text] - <a href='?_src_=holder;[HrefToken()];team_command=remove_objective;team=[REF(T)];tobjective=[REF(O)]'>Remove</a></li>"
content += "</ol><a href='?_src_=holder;[HrefToken()];team_command=add_objective;team=[REF(T)]'>Add Objective</a><br>"
content += "Members: <br><ul>"
for(var/datum/mind/M in T.members)
content += "<li>[M.name] - <a href='?_src_=holder;[HrefToken()];team_command=remove_member;team=[REF(T)];tmember=[REF(M)]'>Remove Member</a></li>"
content += "</ul><a href='?_src_=holder;[HrefToken()];team_command=add_member;team=[REF(T)]'>Add Member</a>"
content += "<hr>"
content += "<a href='?_src_=holder;[HrefToken()];team_command=create_team'>Create Team</a><br>"
return content.Join()
/datum/admins/proc/check_teams()
if(!SSticker.HasRoundStarted())
alert("The game hasn't started yet!")
return
var/datum/browser/popup = new(usr, "teams", "Team Listing", 500, 500)
popup.set_content(team_listing())
popup.open()
/datum/admins/proc/admin_create_team(mob/user)
var/team_name = stripped_input(user,"Team name ?")
if(!team_name)
return
var/datum/team/custom/T = new()
T.name = team_name
message_admins("[key_name_admin(usr)] created new [name] antagonist team.")
log_admin("[key_name(usr)] created new [name] antagonist team.")
/datum/team/proc/admin_rename(mob/user)
var/old_name = name
var/team_name = stripped_input(user,"new team name ?","Team rename",old_name)
if(!team_name)
return
name = team_name
message_admins("[key_name_admin(usr)] renamed [old_name] team to [name]")
log_admin("[key_name(usr)] renamed [old_name] team to [name]")
/datum/team/proc/admin_communicate(mob/user)
var/message = input(user,"Message for the team ?","Team Message") as text|null
if(!message)
return
for(var/datum/mind/M in members)
to_chat(M.current,message)
message_admins("[key_name_admin(usr)] messaged [name] team with : [message]")
log_admin("Team Message: [key_name(usr)] -> [name] team : [message]")
/datum/team/proc/admin_add_objective(mob/user)
//any antag with get_team == src => add objective to that antag
//otherwise create new custom antag
if(!GLOB.admin_objective_list)
generate_admin_objective_list()
var/selected_type = input("Select objective type:", "Objective type") as null|anything in GLOB.admin_objective_list
selected_type = GLOB.admin_objective_list[selected_type]
if (!selected_type)
return
var/datum/objective/O = new selected_type
O.team = src
O.admin_edit(user)
objectives |= O
var/custom_antag_name
for(var/datum/mind/M in members)
var/datum/antagonist/team_antag
for(var/datum/antagonist/A in M.antag_datums)
if(A.get_team() == src)
team_antag = A
if(!team_antag)
team_antag = new /datum/antagonist/custom
if(!custom_antag_name)
custom_antag_name = stripped_input(user, "Custom team antagonist name:", "Custom antag", "Antagonist")
if(!custom_antag_name)
custom_antag_name = "Team Member"
team_antag.name = custom_antag_name
M.add_antag_datum(team_antag,src)
team_antag.objectives |= O
message_admins("[key_name_admin(usr)] added objective \"[O.explanation_text]\" to [name]")
log_admin("[key_name(usr)] added objective \"[O.explanation_text]\" to [name]")
/datum/team/proc/admin_remove_objective(mob/user,datum/objective/O)
for(var/datum/mind/M in members)
for(var/datum/antagonist/A in M.antag_datums)
A.objectives -= O
objectives -= O
message_admins("[key_name_admin(usr)] removed objective \"[O.explanation_text]\" from [name]")
log_admin("[key_name(usr)] removed objective \"[O.explanation_text]\" from [name]")
//qdel maybe
/datum/team/proc/admin_add_member(mob/user)
var/list/minds = list()
for(var/mob/M in GLOB.mob_list)
if(M.mind)
minds |= M.mind
var/datum/mind/value = input("Select new member:", "New team member", null) as null|anything in minds
if (!value)
return
message_admins("[key_name_admin(usr)] added [value.name] as a member of [name] team")
log_admin("[key_name(usr)] added [value.name] as a member of [name] team")
add_member(value)
/datum/team/proc/admin_remove_member(mob/user,datum/mind/M)
message_admins("[key_name_admin(usr)] removed [M.name] from [name] team")
log_admin("[key_name(usr)] removed [M.name] from [name] team")
remove_member(M)
//After a bit of consideration i block team deletion if there's any members left until unified objective handling is in.
/datum/team/proc/admin_delete(mob/user)
if(members.len > 0)
to_chat(user,"Team has members left, remove them first and make sure you know what you're doing.")
return
qdel(src)
/datum/team/Topic(href, href_list)
if(!check_rights(R_ADMIN))
return
var/commands = get_admin_commands()
for(var/admin_command in commands)
if(href_list["command"] == admin_command)
var/datum/callback/C = commands[admin_command]
C.Invoke(usr)
return
/datum/team/proc/get_admin_commands()
return list()
//Custom team subtype created by the panel, allow forcing hud for the team for now
/datum/team/custom
var/datum/atom_hud/antag/custom_hud
var/custom_hud_state = "traitor"
/datum/team/custom/add_member(datum/mind/new_member)
. = ..()
if(custom_hud)
custom_hud.join_hud(new_member.current)
set_antag_hud(new_member.current,custom_hud_state)
/datum/team/custom/remove_member(datum/mind/member)
. = ..()
if(custom_hud)
custom_hud.leave_hud(member.current)
/datum/team/custom/get_admin_commands()
. = ..()
.["Force HUD"] = CALLBACK(src,.proc/admin_force_hud)
//This is here if you want admin created teams to tell each other apart easily.
/datum/team/custom/proc/admin_force_hud(mob/user)
var/list/possible_icons = icon_states('icons/mob/hud.dmi')
var/new_hud_state = input(user,"Choose hud icon state","Custom HUD","traitor") as null|anything in possible_icons
if(!new_hud_state)
return
//suppose could ask for color too
custom_hud_state = new_hud_state
custom_hud = new
custom_hud.self_visible = TRUE
GLOB.huds += custom_hud //Make it show in admin hud
for(var/datum/mind/M in members)
custom_hud.join_hud(M.current)
set_antag_hud(M.current,custom_hud_state)
+48
View File
@@ -2514,6 +2514,54 @@
else if(answer == "no")
log_query_debug("[usr.key] | Reported no server hang")
else if(href_list["check_teams"])
if(!check_rights(R_ADMIN))
return
check_teams()
else if(href_list["team_command"])
if(!check_rights(R_ADMIN))
return
switch(href_list["team_command"])
if("create_team")
admin_create_team(usr)
if("rename_team")
var/datum/team/T = locate(href_list["team"]) in GLOB.antagonist_teams
if(T)
T.admin_rename(usr)
if("communicate")
var/datum/team/T = locate(href_list["team"]) in GLOB.antagonist_teams
if(T)
T.admin_communicate(usr)
if("delete_team")
var/datum/team/T = locate(href_list["team"]) in GLOB.antagonist_teams
if(T)
T.admin_delete(usr)
if("add_objective")
var/datum/team/T = locate(href_list["team"]) in GLOB.antagonist_teams
if(T)
T.admin_add_objective(usr)
if("remove_objective")
var/datum/team/T = locate(href_list["team"]) in GLOB.antagonist_teams
if(!T)
return
var/datum/objective/O = locate(href_list["tobjective"]) in T.objectives
if(O)
T.admin_remove_objective(usr,O)
if("add_member")
var/datum/team/T = locate(href_list["team"]) in GLOB.antagonist_teams
if(T)
T.admin_add_member(usr)
if("remove_member")
var/datum/team/T = locate(href_list["team"]) in GLOB.antagonist_teams
if(!T)
return
var/datum/mind/M = locate(href_list["tmember"]) in T.members
if(M)
T.admin_remove_member(usr,M)
check_teams()
/datum/admins/proc/HandleCMode()
if(!check_rights(R_ADMIN))
return