diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm
index 1d7c5cfdd24..a0c581966a8 100644
--- a/code/__HELPERS/game.dm
+++ b/code/__HELPERS/game.dm
@@ -290,7 +290,7 @@
// Will return a list of active candidates. It increases the buffer 5 times until it finds a candidate which is active within the buffer.
-/proc/get_candidates(be_special_flag=0, afk_bracket=3000)
+/proc/get_candidates(be_special_flag=0,afk_bracket=3000, var/jobbanType)
var/list/candidates = list()
// Keep looping until we find a non-afk candidate within the time bracket (we limit the bracket to 10 minutes (6000))
while(!candidates.len && afk_bracket < 6000)
@@ -298,7 +298,11 @@
if(G.client != null)
if(!(G.mind && G.mind.current && G.mind.current.stat != DEAD))
if(!G.client.is_afk(afk_bracket) && (G.client.prefs.be_special & be_special_flag))
- candidates += G.client
+ if (jobbanType)
+ if(!(jobban_isbanned(G, jobbanType) || jobban_isbanned(G, "Syndicate")))
+ candidates += G.client
+ else
+ candidates += G.client
afk_bracket += 600 // Add a minute to the bracket, for every attempt
return candidates
diff --git a/code/game/gamemodes/antag_spawner.dm b/code/game/gamemodes/antag_spawner.dm
index 835898e450d..1ab4ecdc166 100644
--- a/code/game/gamemodes/antag_spawner.dm
+++ b/code/game/gamemodes/antag_spawner.dm
@@ -138,7 +138,7 @@
borg_to_spawn = input("What type?", "Cyborg Type", type) as null|anything in possible_types
if(!borg_to_spawn)
return
- var/list/borg_candicates = get_candidates(BE_OPERATIVE)
+ var/list/borg_candicates = get_candidates(BE_OPERATIVE, 3000, "operative")
if(borg_candicates.len > 0)
used = 1
var/client/C = pick(borg_candicates)
diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index ec1b2cb906b..2d5b1be7fdc 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -303,6 +303,7 @@
if(BE_CULTIST) roletext="cultist"
if(BE_MONKEY) roletext="monkey"
if(BE_ABDUCTOR) roletext="abductor"
+ if(BE_SHADOWLING) roletext="shadowling"
// Ultimate randomizing code right here
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 49a46309629..fdb2ccfac82 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -771,20 +771,26 @@
else
jobs += "| [replacetext("Revolutionary", " ", " ")] | "
- jobs += "" //Breaking it up so it fits nicer on the screen every 5 entries
-
//Gangster
if(jobban_isbanned(M, "gangster") || isbanned_dept)
jobs += "| [replacetext("Gangster", " ", " ")] | "
else
jobs += "[replacetext("Gangster", " ", " ")] | "
+ jobs += "
" //Breaking it up so it fits nicer on the screen every 5 entries
+
//Cultist
if(jobban_isbanned(M, "cultist") || isbanned_dept)
jobs += "| [replacetext("Cultist", " ", " ")] | "
else
jobs += "[replacetext("Cultist", " ", " ")] | "
+ //Shadowling
+ if(jobban_isbanned(M, "shadowling") || isbanned_dept)
+ jobs += "[replacetext("Shadowling", " ", " ")] | "
+ else
+ jobs += "[replacetext("Shadowling", " ", " ")] | "
+
//Wizard
if(jobban_isbanned(M, "wizard") || isbanned_dept)
jobs += "[replacetext("Wizard", " ", " ")] | "
@@ -797,24 +803,12 @@
else
jobs += "[replacetext("Abductor", " ", " ")] | "
-/* //Malfunctioning AI //Removed Malf-bans because they're a pain to impliment
- if(jobban_isbanned(M, "malf AI") || isbanned_dept)
- jobs += "[replacetext("Malf AI", " ", " ")] | "
- else
- jobs += "[replacetext("Malf AI", " ", " ")] | "
-
//Alien
if(jobban_isbanned(M, "alien candidate") || isbanned_dept)
jobs += "[replacetext("Alien", " ", " ")] | "
else
jobs += "[replacetext("Alien", " ", " ")] | "
- //Infested Monkey
- if(jobban_isbanned(M, "infested monkey") || isbanned_dept)
- jobs += "[replacetext("Infested Monkey", " ", " ")] | "
- else
- jobs += "[replacetext("Infested Monkey", " ", " ")] | "
-*/
jobs += "
"
body = "[jobs]"
diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm
index 198dbff5c2e..ff607a2c1f6 100644
--- a/code/modules/admin/verbs/one_click_antag.dm
+++ b/code/modules/admin/verbs/one_click_antag.dm
@@ -412,7 +412,7 @@
/datum/admins/proc/makeOfficial()
var/mission = input("Assign a task for the official", "Assign Task", "Conduct a routine preformance review of [station_name()] and its Captain.")
- var/list/mob/dead/observer/candidates = pollCandidates("Do you wish to be considered to be a Centcom Official?", "pAI")
+ var/list/mob/dead/observer/candidates = pollCandidates("Do you wish to be considered to be a Centcom Official?", "deathsquad")
if(candidates.len)
var/mob/dead/observer/chosen_candidate = pick(candidates)
@@ -575,6 +575,7 @@
else
return
+//Shadowling
/datum/admins/proc/makeShadowling()
var/datum/game_mode/shadowling/temp = new
if(config.protect_roles_from_antagonist)
@@ -588,10 +589,11 @@
if(!applicant.stat)
if(applicant.mind)
if(!applicant.mind.special_role)
- if(temp.age_check(applicant.client))
- if(!(applicant.job in temp.restricted_jobs))
- if(!(is_shadow_or_thrall(applicant)))
- candidates += applicant
+ if(!jobban_isbanned(applicant, "shadowling") && !jobban_isbanned(applicant, "Syndicate"))
+ if(temp.age_check(applicant.client))
+ if(!(applicant.job in temp.restricted_jobs))
+ if(!(is_shadow_or_thrall(applicant)))
+ candidates += applicant
if(candidates.len)
H = pick(candidates)
diff --git a/code/modules/events/abductor.dm b/code/modules/events/abductor.dm
index 3a4aacbb116..92828d70c72 100644
--- a/code/modules/events/abductor.dm
+++ b/code/modules/events/abductor.dm
@@ -18,7 +18,7 @@
makeAbductorTeam()
/datum/round_event/abductor/proc/makeAbductorTeam()
- var/list/mob/dead/observer/candidates = pollCandidates("Do you wish to be considered for an Abductor Team?", "abductor", null)
+ var/list/mob/dead/observer/candidates = pollCandidates("Do you wish to be considered for an Abductor Team?", "abductor", null, BE_ABDUCTOR )
if(candidates.len >= 2)
//Oh god why we can't have static functions
diff --git a/code/modules/events/alien_infestation.dm b/code/modules/events/alien_infestation.dm
index a461a546282..14f28d48213 100644
--- a/code/modules/events/alien_infestation.dm
+++ b/code/modules/events/alien_infestation.dm
@@ -26,6 +26,9 @@
/datum/round_event/alien_infestation/start()
+ get_alien()
+
+/datum/round_event/alien_infestation/proc/get_alien(end_if_fail = 0)
var/list/vents = list()
for(var/obj/machinery/atmospherics/components/unary/vent_pump/temp_vent in machines)
if(qdeleted(temp_vent))
@@ -35,8 +38,15 @@
if(temp_vent_parent.other_atmosmch.len > 20) //Stops Aliens getting stuck in small networks. See: Security, Virology
vents += temp_vent
- var/list/candidates = get_candidates(BE_ALIEN, ALIEN_AFK_BRACKET)
+ if(!vents.len)
+ message_admins("An event attempted to spawn an alien but no suitable vents were found. Shutting down.")
+ return kill()
+ var/list/candidates = get_candidates(BE_ALIEN, ALIEN_AFK_BRACKET, "alien candidate")
+ if(!candidates.len)
+ if(end_if_fail)
+ return 0
+ return find_alien()
while(spawncount > 0 && vents.len && candidates.len)
var/obj/vent = pick_n_take(vents)
var/client/C = pick_n_take(candidates)
@@ -45,4 +55,17 @@
new_xeno.key = C.key
spawncount--
- successSpawn = 1
\ No newline at end of file
+ successSpawn = 1
+ message_admins("[new_xeno.key] has been made into an alien by an event.")
+ log_game("[new_xeno.key] was spawned as an alien by an event.")
+ if(successSpawn)
+ return 1
+
+/datum/round_event/alien_infestation/proc/find_alien()
+ message_admins("Event attempted to spawn an alien but no candidates were available. Will try again momentarily...")
+ spawn(50)
+ if(get_alien(1))
+ message_admins("Situation has been resolved")
+ return 0
+ message_admins("Unfortunately, no candidates were available for becoming an alien. Shutting down.")
+ return kill()
\ No newline at end of file
diff --git a/code/modules/events/operative.dm b/code/modules/events/operative.dm
index f11961388b7..cb185d01dec 100644
--- a/code/modules/events/operative.dm
+++ b/code/modules/events/operative.dm
@@ -10,7 +10,7 @@
/datum/round_event/operative/proc/get_operative(end_if_fail = 0)
key_of_operative = null
if(!key_of_operative)
- var/list/candidates = get_candidates(BE_OPERATIVE)
+ var/list/candidates = get_candidates(BE_OPERATIVE, 3000, "operative")
if(!candidates.len)
if(end_if_fail)
return 0
diff --git a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
index d3022d2f010..b0a7954a461 100644
--- a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
+++ b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
@@ -67,7 +67,7 @@ var/const/ALIEN_AFK_BRACKET = 450 // 45 seconds
/obj/item/organ/internal/body_egg/alien_embryo/proc/AttemptGrow(gib_on_success = 1)
if(!owner) return
- var/list/candidates = get_candidates(BE_ALIEN, ALIEN_AFK_BRACKET)
+ var/list/candidates = get_candidates(BE_ALIEN, ALIEN_AFK_BRACKET, "alien candidate")
var/client/C = null
// To stop clientless larva, we will check that our host has a client
@@ -77,7 +77,7 @@ var/const/ALIEN_AFK_BRACKET = 450 // 45 seconds
if(candidates.len)
C = pick(candidates)
- else if(owner.client)
+ else if(owner.client && !(jobban_isbanned(owner, "alien candidate") || jobban_isbanned(owner, "Syndicate")))
C = owner.client
else
stage = 4 // Let's try again later.