From 729a7a3ec9940b33fe4d047ea9bf7d8e7f39cc85 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Sat, 16 May 2015 10:59:45 +0200 Subject: [PATCH] Gamestart cleanup. * setup_economy() was called twice. * Game state is set to playing just before creating characters, this ensures equipment such as headsets initialize properly(). * Removes the sleep in manifest creation. Prevents duplicate manifest entries from occurring if one joins within 4 seconds of round start. --- code/controllers/master_controller.dm | 1 - code/datums/datacore.dm | 4 +--- code/game/gamemodes/gameticker.dm | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/code/controllers/master_controller.dm b/code/controllers/master_controller.dm index d698454cab..0152af8b13 100644 --- a/code/controllers/master_controller.dm +++ b/code/controllers/master_controller.dm @@ -39,7 +39,6 @@ datum/controller/game_controller/proc/setup() setup_objects() setupgenetics() - setup_economy() SetupXenoarch() transfer_controller = new diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index 97e1f59582..8bc6cc0580 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -2,10 +2,8 @@ data_core = new /obj/effect/datacore() return 1 -/obj/effect/datacore/proc/manifest(var/nosleep = 0) +/obj/effect/datacore/proc/manifest() spawn() - if(!nosleep) - sleep(40) for(var/mob/living/carbon/human/H in player_list) manifest_inject(H) return diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index 08ad7e7253..2d9a4b5f80 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -110,11 +110,11 @@ var/global/datum/controller/gameticker/ticker else src.mode.announce() + current_state = GAME_STATE_PLAYING create_characters() //Create player characters and transfer them collect_minds() equip_characters() data_core.manifest() - current_state = GAME_STATE_PLAYING callHook("roundstart")