cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some debug for one_click_antag (#20749)

Browse Source 
* Some debug for one_click_antag

Hard to test local, so some debug on main should help

* Switches it from log_admin to message_admins
This commit is contained in:
MadmanMartian
2018-11-18 04:15:54 +00:00
committed by GitHub
parent 43d7adfc05
commit c98719f3b6
2 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
code/modules/admin/topic.dm
View File

@@ -16,47 +16,47 @@
return return
switch(href_list["makeAntag"]) switch(href_list["makeAntag"])
if("1") if("1")
log_admin("[key_name(usr)] has attempted to spawn [count] traitors.") message_admins("[key_name(usr)] has attempted to spawn [count] traitors.")
var/success = makeAntag(/datum/role/traitor, null, count, FROM_PLAYERS) var/success = makeAntag(/datum/role/traitor, null, count, FROM_PLAYERS)
log_admin("[success] number of traitors made.") message_admins("[success] number of traitors made.")
to_chat(usr, "<span class='notice'>[success] number of traitors made.</span>") to_chat(usr, "<span class='notice'>[success] number of traitors made.</span>")
if("2") if("2")
log_admin("[key_name(usr)] has attempted to spawn [count] changelings.") message_admins("[key_name(usr)] has attempted to spawn [count] changelings.")
var/success = makeAntag(/datum/role/changeling, null, count, FROM_PLAYERS) var/success = makeAntag(/datum/role/changeling, null, count, FROM_PLAYERS)
log_admin("[success] number of changelings made.") message_admins("[success] number of changelings made.")
to_chat(usr, "<span class='notice'>[success] number of changelings made.</span>") to_chat(usr, "<span class='notice'>[success] number of changelings made.</span>")
if("3") if("3")
log_admin("[key_name(usr)] has attempted to spawn [count] revolutionaries.") message_admins("[key_name(usr)] has attempted to spawn [count] revolutionaries.")
var/success = makeAntag(null, /datum/faction/revolution, count, FROM_PLAYERS) var/success = makeAntag(null, /datum/faction/revolution, count, FROM_PLAYERS)
log_admin("[success] number of revolutionaries made.") message_admins("[success] number of revolutionaries made.")
to_chat(usr, "<span class='notice'>[success] number of revolutionaries made.</span>") to_chat(usr, "<span class='notice'>[success] number of revolutionaries made.</span>")
if("4") if("4")
log_admin("[key_name(usr)] has attempted to spawn [count] cultists.") message_admins("[key_name(usr)] has attempted to spawn [count] cultists.")
var/success = makeAntag(null, /datum/faction/cult, count , FROM_PLAYERS) var/success = makeAntag(null, /datum/faction/cult, count , FROM_PLAYERS)
log_admin("[success] number of cultists made.") message_admins("[success] number of cultists made.")
to_chat(usr, "<span class='notice'>[success] number of cultists made..</span>") to_chat(usr, "<span class='notice'>[success] number of cultists made..</span>")
if("5") if("5")
log_admin("[key_name(usr)] has attempted to spawn [count] malfunctioning AI.") message_admins("[key_name(usr)] has attempted to spawn [count] malfunctioning AI.")
var/success = makeAntag(null, /datum/faction/malf, count, FROM_PLAYERS) var/success = makeAntag(null, /datum/faction/malf, count, FROM_PLAYERS)
log_admin("[success] number of angry computer screens made.") message_admins("[success] number of angry computer screens made.")
to_chat(usr, "<span class='notice'>[success] number of malf AIs made.</span>") to_chat(usr, "<span class='notice'>[success] number of malf AIs made.</span>")
if("6") if("6")
log_admin("[key_name(usr)] has attempted to spawn [count] wizards.") message_admins("[key_name(usr)] has attempted to spawn [count] wizards.")
var/success = makeAntag(null, /datum/faction/wizard, count, FROM_GHOSTS) var/success = makeAntag(null, /datum/faction/wizard, count, FROM_GHOSTS)
log_admin("[success] number of wizards made.") message_admins("[success] number of wizards made.")
to_chat(usr, "<span class='notice'>[success] number of wizards made.</span>") to_chat(usr, "<span class='notice'>[success] number of wizards made.</span>")
if("7") if("7")
log_admin("[key_name(usr)] has spawned a nuke team.") message_admins("[key_name(usr)] has spawned a nuke team.")
var/success = makeAntag(null, /datum/faction/syndicate/nuke_op, count, FROM_GHOSTS) var/success = makeAntag(null, /datum/faction/syndicate/nuke_op, count, FROM_GHOSTS)
log_admin("[success] number of nuclear operatives made.") message_admins("[success] number of nuclear operatives made.")
to_chat(usr, "<span class='notice'>[success] number of nuclear operatives made.</span>") to_chat(usr, "<span class='notice'>[success] number of nuclear operatives made.</span>")
if("8") if("8")
log_admin("[key_name(usr)] has attempted to spawn [count] vampires.") message_admins("[key_name(usr)] has attempted to spawn [count] vampires.")
var/success = makeAntag(/datum/role/vampire, null, count, FROM_PLAYERS) var/success = makeAntag(/datum/role/vampire, null, count, FROM_PLAYERS)
log_admin("[success] number of vampires made.") message_admins("[success] number of vampires made.")
to_chat(usr, "<span class='notice'>[success] number of vampires made.</span>") to_chat(usr, "<span class='notice'>[success] number of vampires made.</span>")
if("9") if("9")
log_admin("[key_name(usr)] has spawned aliens.") message_admins("[key_name(usr)] has spawned aliens.")
if(!src.makeAliens()) if(!src.makeAliens())
to_chat(usr, "<span class='warning'>Unfortunately, there were no candidates available.</span>") to_chat(usr, "<span class='warning'>Unfortunately, there were no candidates available.</span>")

11
code/modules/admin/verbs/one_click_antag.dm
View File

@@ -60,7 +60,6 @@ client/proc/one_click_antag()
var/list/candidates = get_candidates(role_req, recruitment_source, role_name) var/list/candidates = get_candidates(role_req, recruitment_source, role_name)
var/recruit_count = 0 var/recruit_count = 0
if(!candidates.len) if(!candidates.len)
to_chat(usr, "No candidates")
return 0 return 0
candidates = shuffle(candidates) candidates = shuffle(candidates)
@@ -79,7 +78,7 @@ client/proc/one_click_antag()
if(FF.HandleNewMind(M)) if(FF.HandleNewMind(M))
var/datum/role/RR = FF.get_member_by_mind(M) var/datum/role/RR = FF.get_member_by_mind(M)
RR.ForgeObjectives() RR.ForgeObjectives()
log_admin("[key_name(H)] has been recruited as leader of [F.name] via create antagonist verb.") message_admins("[key_name(H)] has been recruited as leader of [F.name] via create antagonist verb.")
recruit_count++ recruit_count++
count-- count--
@@ -90,10 +89,11 @@ client/proc/one_click_antag()
if(isobserver(H)) if(isobserver(H))
H = makeBody(H) H = makeBody(H)
var/datum/mind/M = H.mind var/datum/mind/M = H.mind
message_admins("polling if [key_name(H)] wants to become a member of [FF.name]")
if(FF.HandleRecruitedMind(M)) if(FF.HandleRecruitedMind(M))
var/datum/role/RR = FF.get_member_by_mind(M) var/datum/role/RR = FF.get_member_by_mind(M)
RR.ForgeObjectives() RR.ForgeObjectives()
log_admin("[key_name(H)] has been recruited as recruit of [F.name] via create antagonist verb.") message_admins("[key_name(H)] has been recruited as recruit of [F.name] via create antagonist verb.")
recruit_count++ recruit_count++
FF.OnPostSetup() FF.OnPostSetup()
@@ -110,7 +110,7 @@ client/proc/one_click_antag()
var/datum/mind/M = H.mind var/datum/mind/M = H.mind
var/datum/role/newRole = new R var/datum/role/newRole = new R
message_admins("polling if [key_name(H)] wants to become a [newRole.name]")
if(!newRole) if(!newRole)
continue continue
@@ -119,7 +119,7 @@ client/proc/one_click_antag()
continue continue
newRole.OnPostSetup() newRole.OnPostSetup()
newRole.ForgeObjectives() newRole.ForgeObjectives()
log_admin("[key_name(H)] has been made into a [newRole.name] via create antagonist verb.") message_admins("[key_name(H)] has been made into a [newRole.name] via create antagonist verb.")
recruit_count++ recruit_count++
return recruit_count return recruit_count
@@ -141,6 +141,7 @@ client/proc/one_click_antag()
candidates.Remove(M) candidates.Remove(M)
if(!M.client.desires_role(role) || jobban_isbanned(M, role)) if(!M.client.desires_role(role) || jobban_isbanned(M, role))
candidates.Remove(M) candidates.Remove(M)
message_admins("[candidates.len] potential candidates.")
return candidates return candidates