cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 20:45:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10129 from AnturK/ayy

Browse Source 
Abductors fixes and improvements
This commit is contained in:
Swag McYolosteinen
2015-07-04 16:57:10 +02:00
parent b6813ff0e4 9ea0b103ff
commit a4b60449f8
9 changed files with 255 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/one_click_antag.dm
+5 -11
View File
@@ -562,13 +562,7 @@
if(candidates.len >= 2)
//Oh god why we can't have static functions
var/teams_finished = 0
if(ticker.mode.config_tag == "abduction")
var/datum/game_mode/abduction/A = ticker.mode
teams_finished = A.teams
else
teams_finished = round(ticker.mode.abductors.len / 2)
var/number = teams_finished + 1
var/number = ticker.mode.abductor_teams + 1
var/datum/game_mode/abduction/temp
if(ticker.mode.config_tag == "abduction")
@@ -596,10 +590,10 @@
temp.abductors |= list(agent_mind,scientist_mind)
temp.make_abductor_team(number,preset_scientist=scientist_mind,preset_agent=agent_mind)
temp.post_setup_team(number)
if(ticker.mode.config_tag == "abduction")
var/datum/game_mode/abduction/A = ticker.mode
A.teams += 1
else
ticker.mode.abductor_teams++
if(ticker.mode.config_tag != "abduction")
ticker.mode.abductors |= temp.abductors
return 1