cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 11:38:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ports character setup subsystem from Bay.

Browse Source
This commit is contained in:
Neerti
2019-05-13 22:39:52 -04:00
committed by VirgoBot
parent 84d3652869
commit 318a2f3d09
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystems/character_setup.dm
+4
View File
@@ -29,7 +29,11 @@ SUBSYSTEM_DEF(character_setup)
save_queue.len--
if(!QDELETED(prefs))
<<<<<<< HEAD
prefs.save_preferences()
=======
SScharacter_setup.queue_preferences_save(prefs)
>>>>>>> 59c8446... Merge pull request #6164 from Novacat/nova-runtimes
if(MC_TICK_CHECK)
return
vorestation.dme
+3
View File
@@ -218,7 +218,10 @@
#include "code\controllers\subsystems\air.dm"
#include "code\controllers\subsystems\airflow.dm"
#include "code\controllers\subsystems\atoms.dm"
<<<<<<< HEAD:vorestation.dme
#include "code\controllers\subsystems\bellies_vr.dm"
=======
>>>>>>> 59c8446... Merge pull request #6164 from Novacat/nova-runtimes:polaris.dme
#include "code\controllers\subsystems\character_setup.dm"
#include "code\controllers\subsystems\circuits.dm"
#include "code\controllers\subsystems\events.dm"