Antag Panel / Check antagonists Refactor

This commit is contained in:
AnturK
2018-01-19 08:43:49 -06:00
committed by CitadelStationBot
parent c6f227fc18
commit 3dc89ba058
63 changed files with 1224 additions and 1427 deletions
+8 -10
View File
@@ -4,7 +4,7 @@
weight = 10
max_occurrences = 1
min_players = 20
gamemode_blacklist = list("nuclear","wizard","revolution","abduction")
gamemode_blacklist = list("nuclear","wizard","revolution")
/datum/round_event/ghost_role/abductor
minimum_required = 2
@@ -17,20 +17,18 @@
if(candidates.len < 2)
return NOT_ENOUGH_PLAYERS
var/datum/game_mode/abduction/GM
if(SSticker.mode.config_tag == "abduction")
GM = SSticker.mode
else
GM = new
var/mob/living/carbon/human/agent = makeBody(pick_n_take(candidates))
var/mob/living/carbon/human/scientist = makeBody(pick_n_take(candidates))
var/team = GM.make_abductor_team(agent.mind, scientist.mind)
if(!team)
var/datum/team/abductor_team/T = new
if(T.team_number > ABDUCTOR_MAX_TEAMS)
return MAP_ERROR
log_game("[scientist.mind.key] (ckey) has been selected as [T.name] abductor scientist.")
log_game("[agent.mind.key] (ckey) has been selected as [T.name] abductor agent.")
GM.post_setup_team(team)
scientist.mind.add_antag_datum(ANTAG_DATUM_ABDUCTOR_SCIENTIST, T)
agent.mind.add_antag_datum(ANTAG_DATUM_ABDUCTOR_AGENT, T)
spawned_mobs += list(agent, scientist)
return SUCCESSFUL_SPAWN