From fb7f2d0ab89f2361c92d40e865ffb37f5fc7c7e4 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Wed, 20 Sep 2017 16:03:56 -0400 Subject: [PATCH] fixes all the roundstart related issues --- code/controllers/subsystem/ticker.dm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index cee83cb3b8..94d4d90d23 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -211,11 +211,6 @@ SUBSYSTEM_DEF(ticker) GLOB.start_landmarks_list = shuffle(GLOB.start_landmarks_list) //Shuffle the order of spawn points so they dont always predictably spawn bottom-up and right-to-left create_characters() //Create player characters collect_minds() - if(config.allow_extended_miscreants && GLOB.master_mode == "extended") - GLOB.miscreants_allowed = TRUE - if(config.allow_miscreants && GLOB.master_mode != "extended") - GLOB.miscreants_allowed = TRUE - generate_crew_objectives() equip_characters() SSoverlays.Flush() //Flush the majority of the shit @@ -258,6 +253,13 @@ SUBSYSTEM_DEF(ticker) //Deleting Startpoints but we need the ai point to AI-ize people later if(S.name != "AI") qdel(S) + + //assign crew objectives and generate miscreants + if(config.allow_extended_miscreants && GLOB.master_mode == "extended") + GLOB.miscreants_allowed = TRUE + if(config.allow_miscreants && GLOB.master_mode != "extended") + GLOB.miscreants_allowed = TRUE + generate_crew_objectives() var/list/adm = get_admin_counts() var/list/allmins = adm["present"]