diff --git a/__DEFINES/subsystem.dm b/__DEFINES/subsystem.dm index dc563599d7b..f7c16e2addf 100644 --- a/__DEFINES/subsystem.dm +++ b/__DEFINES/subsystem.dm @@ -24,7 +24,7 @@ #define SS_INIT_TICKER -21 #define SS_INIT_FINISH -22 #define SS_INIT_MINIMAP -23 -#define SS_INIT_PERSISTENCE -99 +#define SS_INIT_PERSISTENCE_MISC -99 #define SS_PRIORITY_TICKER 200 diff --git a/code/controllers/subsystem/init/persistence.dm b/code/controllers/subsystem/init/persistence_misc.dm similarity index 51% rename from code/controllers/subsystem/init/persistence.dm rename to code/controllers/subsystem/init/persistence_misc.dm index 14afce8392f..003adbdfdd6 100644 --- a/code/controllers/subsystem/init/persistence.dm +++ b/code/controllers/subsystem/init/persistence_misc.dm @@ -1,42 +1,42 @@ -var/datum/subsystem/persistence/SSpersistence +var/datum/subsystem/persistence_misc/SSpersistence_misc -/datum/subsystem/persistence - name = "Persistence" - init_order = SS_INIT_PERSISTENCE +/datum/subsystem/persistence_misc + name = "Persistence - Misc" + init_order = SS_INIT_PERSISTENCE_MISC flags = SS_NO_FIRE var/const/round_count_file = "data/persistence/round_counts_per_year.json" var/list/round_count_list = list() -/datum/subsystem/persistence/New() - NEW_SS_GLOBAL(SSpersistence) +/datum/subsystem/persistence_misc/New() + NEW_SS_GLOBAL(SSpersistence_misc) -/datum/subsystem/persistence/Recover() - round_count_list = SSpersistence.round_count_list +/datum/subsystem/persistence_misc/Recover() + round_count_list = SSpersistence_misc.round_count_list ..() -/datum/subsystem/persistence/Initialize(timeofday) +/datum/subsystem/persistence_misc/Initialize(timeofday) read_round_count() ..() -/datum/subsystem/persistence/Shutdown() +/datum/subsystem/persistence_misc/Shutdown() bump_round_count() write_round_count() ..() -/datum/subsystem/persistence/proc/read_round_count() +/datum/subsystem/persistence_misc/proc/read_round_count() if(fexists(round_count_file)) round_count_list = json_decode(file2text(round_count_file)) -/datum/subsystem/persistence/proc/bump_round_count() +/datum/subsystem/persistence_misc/proc/bump_round_count() var/itsthecurrentyear = time2text(world.realtime,"YY") if(!(itsthecurrentyear in round_count_list)) round_count_list[itsthecurrentyear] = "0" round_count_list[itsthecurrentyear] = num2text(text2num(round_count_list[itsthecurrentyear]) + 1) -/datum/subsystem/persistence/proc/write_round_count() +/datum/subsystem/persistence_misc/proc/write_round_count() var/writing = file(round_count_file) fdel(writing) writing << json_encode(round_count_list) diff --git a/code/modules/credits/credits.dm b/code/modules/credits/credits.dm index 2d658255e5f..04fb5691632 100644 --- a/code/modules/credits/credits.dm +++ b/code/modules/credits/credits.dm @@ -195,7 +195,7 @@ var/global/datum/credits/end_credits = new /datum/credits/proc/finalize_episodestring() var/season = time2text(world.realtime,"YY") - var/episodenum = SSpersistence.round_count_list[season] + var/episodenum = SSpersistence_misc.round_count_list[season] episode_string = "

SEASON [season] EPISODE [episodenum]
[episode_name]


" log_game("So ends [is_rerun() ? "another rerun of " : ""]SEASON [season] EPISODE [episodenum] - [episode_name]") diff --git a/data/persistence/round_counts_per_year.json b/data/persistence/round_counts_per_year.json deleted file mode 100644 index 0da237c9e45..00000000000 --- a/data/persistence/round_counts_per_year.json +++ /dev/null @@ -1 +0,0 @@ -{"19":"409"} diff --git a/vgstation13.dme b/vgstation13.dme index b55b7c0ed7c..184507e8f5f 100644 --- a/vgstation13.dme +++ b/vgstation13.dme @@ -217,7 +217,7 @@ #include "code\controllers\subsystem\init\map.dm" #include "code\controllers\subsystem\init\minimaps.dm" #include "code\controllers\subsystem\init\more_init_stuff.dm" -#include "code\controllers\subsystem\init\persistence.dm" +#include "code\controllers\subsystem\init\persistence_misc.dm" #include "code\controllers\subsystem\init\rust.dm" #include "code\controllers\subsystem\init\spawn_ticker.dm" #include "code\controllers\subsystem\init\xenoarch.dm"