cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 12:41:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Quick-Create-Antagonist tweaks (#4466)

Browse Source 
* Quick-Create-Antagonist tweaks

* aaaaaa

Co-authored-by: bloons3 <bloons3@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
This commit is contained in:
SkyratBot
2021-03-28 14:33:50 +01:00
committed by GitHub
co-authored by bloons3 Gandalf
parent dd7aaa96b2
commit 6239419a49
3 changed files with 50 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/topic.dm
+36 -30
View File
@@ -55,33 +55,37 @@
return
switch(href_list["makeAntag"])
if("traitors")
if(src.makeTraitors())
message_admins("[key_name_admin(usr)] created traitors.")
log_admin("[key_name(usr)] created traitors.")
var/maxCount = input("Set number of Traitors","Set Traitor Count (max)",1) as num|null
if(src.makeTraitors(maxCount))
message_admins("[key_name_admin(usr)] created [maxCount] traitor(s).")
log_admin("[key_name(usr)] created [maxCount] traitor(s).")
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.")
message_admins("[key_name_admin(usr)] tried to create [maxCount] traitor(s). Unfortunately, there were no candidates available.")
log_admin("[key_name(usr)] failed to create [maxCount] traitor(s).")
if("changelings")
if(src.makeChangelings())
message_admins("[key_name(usr)] created changelings.")
log_admin("[key_name(usr)] created changelings.")
var/maxCount = input("Set number of Changelings","Set Changeling Count (max)",1) as num|null
if(src.makeChangelings(maxCount))
message_admins("[key_name(usr)] created [maxCount] changelings.")
log_admin("[key_name(usr)] created [maxCount] 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.")
message_admins("[key_name_admin(usr)] tried to create [maxCount] changelings. Unfortunately, there were no candidates available.")
log_admin("[key_name(usr)] failed to create [maxCount] changelings.")
if("revs")
if(src.makeRevs())
message_admins("[key_name(usr)] started a revolution.")
log_admin("[key_name(usr)] started a revolution.")
var/maxCount = input("Set number of Revolutionaries","Set Revolutionaries Count (max)",1) as num|null
if(src.makeRevs(maxCount))
message_admins("[key_name(usr)] started a revolution with [maxCount] freedom fighters.")
log_admin("[key_name(usr)] started a [maxCount] freedom fighters.")
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.")
message_admins("[key_name_admin(usr)] tried to start a revolution with [maxCount] freedom fighters. Unfortunately, there were no candidates available.")
log_admin("[key_name(usr)] failed to start a revolution with [maxCount] freedom fighters.")
if("cult")
if(src.makeCult())
message_admins("[key_name(usr)] started a cult.")
log_admin("[key_name(usr)] started a cult.")
var/maxCount = input("Set number of Cultists","Set Cultist Count (max)",1) as num|null
if(src.makeCult(maxCount))
message_admins("[key_name(usr)] started a cult with [maxCount] cultists.")
log_admin("[key_name(usr)] started a cult with [maxCount] cultists.")
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.")
message_admins("[key_name_admin(usr)] tried to start a cult with [maxCount] cultists. Unfortunately, there were no candidates available.")
log_admin("[key_name(usr)] failed to start a cult with [maxCount] cultists.")
if("wizard")
message_admins("[key_name(usr)] is creating a wizard...")
if(src.makeWizard())
@@ -92,21 +96,23 @@
log_admin("[key_name(usr)] failed to create a wizard.")
if("nukeops")
message_admins("[key_name(usr)] is creating a nuke team...")
if(src.makeNukeTeam())
message_admins("[key_name(usr)] created a nuke team.")
log_admin("[key_name(usr)] created a nuke team.")
var/maxCount = input("Set number of Nuke OPs","Set Nuke OP Count (max)",5) as num|null
if(src.makeNukeTeam(maxCount))
message_admins("[key_name(usr)] created a nuke team with [maxCount] operatives")
log_admin("[key_name(usr)] created a nuke team with [maxCount] operatives")
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.")
message_admins("[key_name_admin(usr)] tried to create a nuke team with [maxCount] operatives Unfortunately, there were not enough candidates available.")
log_admin("[key_name(usr)] failed to create a nuke team with [maxCount] operatives.")
//SKYRAT EDIT ADDITION BEGIN - ASSAULT OPS
if("assaultops")
message_admins("[key_name(usr)] is creating an assault team...")
if(src.makeAssaultTeam())
message_admins("[key_name(usr)] created an assault team.")
log_admin("[key_name(usr)] created an assault team.")
var/maxCount = input("Set number of Ass OPs","Set Ass OP Count (max)",5) as num|null
if(src.makeAssaultTeam(maxCount))
message_admins("[key_name(usr)] created an assault team with [maxCount] operatives.")
log_admin("[key_name(usr)] created an assault team with [maxCount] operatives")
else
message_admins("[key_name_admin(usr)] tried to create an assault team. Unfortunately, there were not enough candidates available.")
log_admin("[key_name(usr)] failed to create an assault team.")
message_admins("[key_name_admin(usr)] tried to create an assault team with [maxCount] operatves. Unfortunately, there were not enough candidates available.")
log_admin("[key_name(usr)] failed to create an assault team with [maxCount] operatives.")
//SKYRAT EDIT END
if("ninja")
message_admins("[key_name(usr)] spawned a ninja.")
code/modules/admin/verbs/one_click_antag.dm
+10 -10
View File
@@ -47,7 +47,7 @@
return !is_banned_from(applicant.ckey, list(targetrole, ROLE_SYNDICATE))
/datum/admins/proc/makeTraitors()
/datum/admins/proc/makeTraitors(maxCount = 3)
var/datum/game_mode/traitor/temp = new
if(CONFIG_GET(flag/protect_roles_from_antagonist))
@@ -66,7 +66,7 @@
candidates += applicant
if(candidates.len)
var/numTraitors = min(candidates.len, 3)
var/numTraitors = min(candidates.len, maxCount)
for(var/i = 0, i<numTraitors, i++)
H = pick(candidates)
@@ -79,7 +79,7 @@
return FALSE
/datum/admins/proc/makeChangelings()
/datum/admins/proc/makeChangelings(maxCount = 3)
var/datum/game_mode/changeling/temp = new
if(CONFIG_GET(flag/protect_roles_from_antagonist))
@@ -98,7 +98,7 @@
candidates += applicant
if(candidates.len)
var/numChangelings = min(candidates.len, 3)
var/numChangelings = min(candidates.len, maxCount)
for(var/i = 0, i<numChangelings, i++)
H = pick(candidates)
@@ -109,7 +109,7 @@
return FALSE
/datum/admins/proc/makeRevs()
/datum/admins/proc/makeRevs(maxCount = 3)
var/datum/game_mode/revolution/temp = new
if(CONFIG_GET(flag/protect_roles_from_antagonist))
@@ -128,7 +128,7 @@
candidates += applicant
if(candidates.len)
var/numRevs = min(candidates.len, 3)
var/numRevs = min(candidates.len, maxCount)
for(var/i = 0, i<numRevs, i++)
H = pick(candidates)
@@ -149,7 +149,7 @@
return TRUE
/datum/admins/proc/makeCult()
/datum/admins/proc/makeCult(maxCount = 4)
var/datum/game_mode/cult/temp = new
if(CONFIG_GET(flag/protect_roles_from_antagonist))
temp.restricted_jobs += temp.protected_jobs
@@ -167,7 +167,7 @@
candidates += applicant
if(candidates.len)
var/numCultists = min(candidates.len, 4)
var/numCultists = min(candidates.len, maxCount)
for(var/i = 0, i<numCultists, i++)
H = pick(candidates)
@@ -180,14 +180,14 @@
/datum/admins/proc/makeNukeTeam()
/datum/admins/proc/makeNukeTeam(maxCount = 5)
var/datum/game_mode/nuclear/temp = new
var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you wish to be considered for a nuke team being sent in?", ROLE_OPERATIVE, temp)
var/list/mob/dead/observer/chosen = list()
var/mob/dead/observer/theghost = null
if(candidates.len)
var/numagents = 5
var/numagents = maxCount
var/agentcount = 0
for(var/i = 0, i<numagents,i++)