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

Update character_setup.dm

Browse Source
This commit is contained in:
Novacat
2019-05-13 22:43:00 -04:00
committed by GitHub
parent 842f3a63ae
commit 69d1e97d2e
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/controllers/subsystems/character_setup.dm
View File

@@ -29,14 +29,10 @@ SUBSYSTEM_DEF(character_setup)
save_queue.len-- save_queue.len--
if(!QDELETED(prefs)) if(!QDELETED(prefs))
<<<<<<< HEAD
prefs.save_preferences() prefs.save_preferences()
=======
SScharacter_setup.queue_preferences_save(prefs)
>>>>>>> 59c8446... Merge pull request #6164 from Novacat/nova-runtimes
if(MC_TICK_CHECK) if(MC_TICK_CHECK)
return return
/datum/controller/subsystem/character_setup/proc/queue_preferences_save(var/datum/preferences/prefs) /datum/controller/subsystem/character_setup/proc/queue_preferences_save(var/datum/preferences/prefs)
save_queue |= prefs save_queue |= prefs