Adds jobban support to syndicate borg

Adds jobban and pref checking to various events
Adds support for alien jobbans
Adds feedback to alien infestation event.
This commit is contained in:
Shadowlight213
2015-10-18 15:25:14 -07:00
parent a14ddb8ce2
commit 35ca96331e
8 changed files with 45 additions and 14 deletions
+2 -2
View File
@@ -18,8 +18,8 @@
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
var/number = ticker.mode.abductor_teams + 1
+31 -2
View File
@@ -26,6 +26,13 @@
/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,7 +42,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)
@@ -45,4 +60,18 @@
new_xeno.key = C.key
spawncount--
successSpawn = 1
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()
+3 -3
View File
@@ -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
@@ -29,7 +29,7 @@
spawn_locs += L.loc
if(!spawn_locs.len)
return kill()
var/mob/living/carbon/human/operative = new(pick(spawn_locs))
var/datum/preferences/A = new
A.copy_to(operative)
@@ -45,7 +45,7 @@
var/obj/machinery/nuclearbomb/selfdestruct/nuke = locate() in machines
if(nuke)
var/nuke_code
var/nuke_code
if(!nuke.r_code || nuke.r_code == "ADMIN")
nuke_code = "[rand(10000, 99999)]"
nuke.r_code = nuke_code