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

Update ticker.dm

Browse Source
This commit is contained in:
Aronai Sieyes
2020-05-24 19:23:06 -04:00
committed by GitHub
parent 2514f55320
commit ad925b5a48
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/controllers/subsystems/ticker.dm
View File

@@ -171,11 +171,7 @@ var/global/datum/controller/subsystem/ticker/ticker
create_characters() //Create player characters and transfer them. create_characters() //Create player characters and transfer them.
collect_minds() collect_minds()
equip_characters() equip_characters()
<<<<<<< HEAD
//data_core.manifest() //VOREStation Removal
=======
// data_core.manifest() // data_core.manifest()
>>>>>>> 15a1747... Ports manifest duplication fix from Virgo (#7230)
callHook("roundstart") callHook("roundstart")