cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Gamestart cleanup.

Browse Source 
* 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.
This commit is contained in:
PsiOmega
2015-05-16 10:59:45 +02:00
parent 7e14930209
commit 729a7a3ec9
3 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/controllers/master_controller.dm
View File

@@ -39,7 +39,6 @@ datum/controller/game_controller/proc/setup()
setup_objects() setup_objects()
setupgenetics() setupgenetics()
setup_economy()
SetupXenoarch() SetupXenoarch()
transfer_controller = new transfer_controller = new

4
code/datums/datacore.dm
View File

@@ -2,10 +2,8 @@
data_core = new /obj/effect/datacore() data_core = new /obj/effect/datacore()
return 1 return 1
/obj/effect/datacore/proc/manifest(var/nosleep = 0) /obj/effect/datacore/proc/manifest()
spawn() spawn()
if(!nosleep)
sleep(40)
for(var/mob/living/carbon/human/H in player_list) for(var/mob/living/carbon/human/H in player_list)
manifest_inject(H) manifest_inject(H)
return return

2
code/game/gamemodes/gameticker.dm
View File

@@ -110,11 +110,11 @@ var/global/datum/controller/gameticker/ticker
else else
src.mode.announce() src.mode.announce()
current_state = GAME_STATE_PLAYING
create_characters() //Create player characters and transfer them create_characters() //Create player characters and transfer them
collect_minds() collect_minds()
equip_characters() equip_characters()
data_core.manifest() data_core.manifest()
current_state = GAME_STATE_PLAYING
callHook("roundstart") callHook("roundstart")