Allows species to be blocked from ever being roundstart, can now choose your Halloween species

This commit is contained in:
KorPhaeron
2017-10-20 10:10:54 -05:00
committed by CitadelStationBot
parent 655478e014
commit e4f76a79a5
18 changed files with 62 additions and 49 deletions
+1
View File
@@ -18,6 +18,7 @@ SUBSYSTEM_DEF(job)
SetupOccupations()
if(CONFIG_GET(flag/load_jobs_from_txt))
LoadJobs()
generate_selectable_species()
..()
+3 -2
View File
@@ -12,7 +12,7 @@ SUBSYSTEM_DEF(ticker)
var/force_ending = 0 //Round was ended by admin intervention
// If true, there is no lobby phase, the game starts immediately.
var/start_immediately = FALSE
var/setup_done = FALSE //All game setup done including mode post setup and
var/setup_done = FALSE //All game setup done including mode post setup and
var/hide_mode = 0
var/datum/game_mode/mode = null
@@ -127,7 +127,7 @@ SUBSYSTEM_DEF(ticker)
login_music = pick(music)
else
login_music = "config/title_music/sounds/[pick(music)]"
crewobjlist = typesof(/datum/objective/crew)
miscreantobjlist = (typesof(/datum/objective/miscreant) - /datum/objective/miscreant)
@@ -141,6 +141,7 @@ SUBSYSTEM_DEF(ticker)
GLOB.syndicate_code_phrase = generate_code_phrase()
if(!GLOB.syndicate_code_response)
GLOB.syndicate_code_response = generate_code_phrase()
..()
start_at = world.time + (CONFIG_GET(number/lobby_countdown) * 10)