shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4047 from Citadel-Station-13/upstream-merge-32859

Browse Source 
[MIRROR] Fixes abductor teams getting assigned to same pod
This commit is contained in:
deathride58
2017-11-21 03:24:57 +00:00
committed by GitHub
parent 94046f89da fd4194f613
commit 8bcc9fcb41
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/miniantags/abduction/abduction.dm
+6 -1
View File
@@ -26,6 +26,7 @@
var/max_teams = 4 var/max_teams = 4
var/list/datum/objective_team/abductor_team/abductor_teams = list() var/list/datum/objective_team/abductor_team/abductor_teams = list()
var/finished = FALSE var/finished = FALSE
var/static/team_count = 0
/datum/game_mode/abduction/announce() /datum/game_mode/abduction/announce()
to_chat(world, "<B>The current game mode is - Abduction!</B>") to_chat(world, "<B>The current game mode is - Abduction!</B>")
@@ -44,7 +45,11 @@
return TRUE return TRUE
/datum/game_mode/abduction/proc/make_abductor_team(datum/mind/agent, datum/mind/scientist) /datum/game_mode/abduction/proc/make_abductor_team(datum/mind/agent, datum/mind/scientist)
var/team_number = abductor_teams.len+1 team_count++ //TODO: Fix the edge case of abductor game mode rolling twice+ and failing to setup on first time.
var/team_number = team_count
if(team_number > max_teams)
return //or should it try to stuff them in anway ?
var/datum/objective_team/abductor_team/team = new var/datum/objective_team/abductor_team/team = new
team.team_number = team_number team.team_number = team_number
code/modules/events/abductor.dm
+5 -1
View File
@@ -26,7 +26,11 @@
var/mob/living/carbon/human/agent = makeBody(pick_n_take(candidates)) var/mob/living/carbon/human/agent = makeBody(pick_n_take(candidates))
var/mob/living/carbon/human/scientist = makeBody(pick_n_take(candidates)) var/mob/living/carbon/human/scientist = makeBody(pick_n_take(candidates))
GM.post_setup_team(GM.make_abductor_team(agent.mind, scientist.mind)) var/team = GM.make_abductor_team(agent.mind, scientist.mind)
if(!team)
return MAP_ERROR
GM.post_setup_team(team)
spawned_mobs += list(agent, scientist) spawned_mobs += list(agent, scientist)
return SUCCESSFUL_SPAWN return SUCCESSFUL_SPAWN