Fixes some init order shit (#2378)

To alleviate shenaniganry during game startup with character creation.
This commit is contained in:
skull132
2017-05-21 20:29:13 +03:00
committed by GitHub
parent c230dc0f5e
commit 50842b640b
2 changed files with 11 additions and 7 deletions
@@ -22,7 +22,7 @@
global_hud.meson,
global_hud.science
)
// This is kinda important. Set up details of what the hell things are made of.
populate_material_list()
@@ -40,6 +40,12 @@
job_master.SetupOccupations()
job_master.LoadJobs("config/jobs.txt")
// Set up antags.
populate_antag_type_list()
// Populate spawnpoints for char creation.
populate_spawn_points()
lobby_image = new/obj/effect/lobby_image()
..()
@@ -9,13 +9,13 @@
/datum/controller/subsystem/misc_late/Initialize(timeofday)
// Sort the area list.
sortTim(all_areas, /proc/cmp_name_asc)
var/turf/picked
// Setup the teleport locs.
for (var/thing in all_areas)
var/area/AR = thing
picked = null
if(!(istype(AR, /area/shuttle) || istype(AR, /area/syndicate_station) || istype(AR, /area/wizard_station)))
if(!(istype(AR, /area/shuttle) || istype(AR, /area/syndicate_station) || istype(AR, /area/wizard_station)))
picked = pick_area_turf(AR.type, list(/proc/is_station_turf))
if (picked)
teleportlocs += AR.name
@@ -32,9 +32,7 @@
sortTim(teleportlocs, /proc/cmp_text_asc)
sortTim(ghostteleportlocs, /proc/cmp_text_asc)
populate_antag_type_list()
populate_spawn_points()
setupgenetics()
shuttle_controller.setup_shuttle_docks()