From 1eba5951153c10ba3a1d7c5336e01e4499705c00 Mon Sep 17 00:00:00 2001 From: AnturK Date: Wed, 13 Jul 2016 19:16:13 +0200 Subject: [PATCH] Fixes create antagonist for revenants. (#19296) --- code/modules/admin/topic.dm | 30 ++++++++++----------- code/modules/admin/verbs/one_click_antag.dm | 24 ++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index b0007267e23..7a9b147aafe 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -31,35 +31,35 @@ usr << "Not until the round starts!" return switch(href_list["makeAntag"]) - if("1") + if("traitors") if(src.makeTraitors()) message_admins("[key_name_admin(usr)] created traitors.") log_admin("[key_name(usr)] created traitors.") else message_admins("[key_name_admin(usr)] tried to create traitors. Unfortunately, there were no candidates available.") log_admin("[key_name(usr)] failed to create traitors.") - if("2") + if("changelings") if(src.makeChanglings()) message_admins("[key_name(usr)] created changelings.") log_admin("[key_name(usr)] created changelings.") else message_admins("[key_name_admin(usr)] tried to create changelings. Unfortunately, there were no candidates available.") log_admin("[key_name(usr)] failed to create changelings.") - if("3") + if("revs") if(src.makeRevs()) message_admins("[key_name(usr)] started a revolution.") log_admin("[key_name(usr)] started a revolution.") else message_admins("[key_name_admin(usr)] tried to start a revolution. Unfortunately, there were no candidates available.") log_admin("[key_name(usr)] failed to start a revolution.") - if("4") + if("cult") if(src.makeCult()) message_admins("[key_name(usr)] started a cult.") log_admin("[key_name(usr)] started a cult.") else message_admins("[key_name_admin(usr)] tried to start a cult. Unfortunately, there were no candidates available.") log_admin("[key_name(usr)] failed to start a cult.") - if("6") + if("wizard") message_admins("[key_name(usr)] is creating a wizard...") if(src.makeWizard()) message_admins("[key_name(usr)] created a wizard.") @@ -67,7 +67,7 @@ else message_admins("[key_name_admin(usr)] tried to create a wizard. Unfortunately, there were no candidates available.") log_admin("[key_name(usr)] failed to create a wizard.") - if("7") + if("nukeops") message_admins("[key_name(usr)] is creating a nuke team...") if(src.makeNukeTeam()) message_admins("[key_name(usr)] created a nuke team.") @@ -75,15 +75,15 @@ else message_admins("[key_name_admin(usr)] tried to create a nuke team. Unfortunately, there were not enough candidates available.") log_admin("[key_name(usr)] failed to create a nuke team.") - if("8") + if("ninja") message_admins("[key_name(usr)] spawned a ninja.") log_admin("[key_name(usr)] spawned a ninja.") src.makeSpaceNinja() - if("9") + if("aliens") message_admins("[key_name(usr)] started an alien infestation.") log_admin("[key_name(usr)] started an alien infestation.") src.makeAliens() - if("10") + if("deathsquad") message_admins("[key_name(usr)] is creating a death squad...") if(src.makeDeathsquad()) message_admins("[key_name(usr)] created a death squad.") @@ -91,19 +91,19 @@ else message_admins("[key_name_admin(usr)] tried to create a death squad. Unfortunately, there were not enough candidates available.") log_admin("[key_name(usr)] failed to create a death squad.") - if("11") + if("blob") var/strength = input("Set Blob Strength (1=Weak, 2=Strong, 3=Full)","Set Strength",1) as num message_admins("[key_name(usr)] spawned a blob with strength [strength].") log_admin("[key_name(usr)] spawned a blob with strength [strength].") new/datum/round_event/blob(strength) - if("12") + if("gangs") if(src.makeGangsters()) message_admins("[key_name(usr)] created gangs.") log_admin("[key_name(usr)] created gangs.") else message_admins("[key_name(usr)] tried to create gangs. Unfortunately, there were not enough candidates available.") log_admin("[key_name(usr)] failed create gangs.") - if("13") + if("centcom") message_admins("[key_name(usr)] is creating a Centcom response team...") if(src.makeEmergencyresponseteam()) message_admins("[key_name(usr)] created a Centcom response team.") @@ -111,7 +111,7 @@ else message_admins("[key_name_admin(usr)] tried to create a Centcom response team. Unfortunately, there were not enough candidates available.") log_admin("[key_name(usr)] failed to create a Centcom response team.") - if("14") + if("abductors") message_admins("[key_name(usr)] is creating an abductor team...") if(src.makeAbductorTeam()) message_admins("[key_name(usr)] created an abductor team.") @@ -119,14 +119,14 @@ else message_admins("[key_name_admin(usr)] tried to create an abductor team. Unfortunatly there were not enough candidates available.") log_admin("[key_name(usr)] failed to create an abductor team.") - if("15") + if("clockcult") if(src.makeClockCult()) message_admins("[key_name(usr)] started a clockwork cult.") log_admin("[key_name(usr)] started a clockwork cult.") else message_admins("[key_name_admin(usr)] tried to start a clockwork cult. Unfortunately, there were no candidates available.") log_admin("[key_name(usr)] failed to start a clockwork cult.") - if("16") + if("revenant") if(src.makeRevenant()) message_admins("[key_name(usr)] created a revenant.") log_admin("[key_name(usr)] created a revenant.") diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index 5288a2af89f..d5d7a558645 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -11,18 +11,18 @@ /datum/admins/proc/one_click_antag() var/dat = {" - Make Traitors
- Make Changelings
- Make Revs
- Make Cult
- Make Clockwork Cult
- Make Blob
- Make Gangsters
- Make Wizard (Requires Ghosts)
- Make Nuke Team (Requires Ghosts)
- Make Centcom Response Team (Requires Ghosts)
- Make Abductor Team (Requires Ghosts)
- Make Revenant (Requires Ghost)
+ Make Traitors
+ Make Changelings
+ Make Revs
+ Make Cult
+ Make Clockwork Cult
+ Make Blob
+ Make Gangsters
+ Make Wizard (Requires Ghosts)
+ Make Nuke Team (Requires Ghosts)
+ Make Centcom Response Team (Requires Ghosts)
+ Make Abductor Team (Requires Ghosts)
+ Make Revenant (Requires Ghost)
"} var/datum/browser/popup = new(usr, "oneclickantag", "Quick-Create Antagonist", 400, 400)