diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm index a8cf2ec3fd..b62ae4d9eb 100644 --- a/code/__HELPERS/type2type.dm +++ b/code/__HELPERS/type2type.dm @@ -69,11 +69,11 @@ else . = "0" + . i++ - return . +names.dmnames.dm //Splits the text of a file at seperator and returns them in a list. -/proc/file2list(filename, seperator="\n") - return splittext(file2text(filename),seperator) +/world/proc/file2list(filename, seperator="\n") + return splittext(file2text(filename),seperator) //Turns a direction into text diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 9d3345b18a..f701c051da 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -62,7 +62,7 @@ SUBSYSTEM_DEF(ticker) var/modevoted = FALSE //Have we sent a vote for the gamemode? /datum/controller/subsystem/ticker/Initialize(timeofday) - var/list/music = file2list(ROUND_START_MUSIC_LIST, "\n") + var/list/music = world.file2list(ROUND_START_MUSIC_LIST, "\n") login_music = pick(music) if(!GLOB.syndicate_code_phrase) diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm index a9f1e8f6a0..f1b5d3a973 100644 --- a/code/datums/helper_datums/getrev.dm +++ b/code/datums/helper_datums/getrev.dm @@ -6,9 +6,9 @@ var/date /datum/getrev/New() - var/head_file = file2text(".git/logs/HEAD") + var/head_file = file2text(".git/logs/HEAD") if(SERVERTOOLS && fexists("..\\prtestjob.lk")) - var/list/tmp = file2list("..\\prtestjob.lk") + var/list/tmp = world.file2list("..\\prtestjob.lk") for(var/I in tmp) if(I) testmerge |= I