diff --git a/code/__HELPERS/files.dm b/code/__HELPERS/files.dm index 2a0640a6e1..83a026665e 100644 --- a/code/__HELPERS/files.dm +++ b/code/__HELPERS/files.dm @@ -1,17 +1,3 @@ -//checks if a file exists and contains text -//returns text as a string if these conditions are met -/proc/return_file_text(filename) - if(fexists(filename) == 0) - throw EXCEPTION("return_file_text(): File not found") - return - - var/text = file2text(filename) - if(!text) - throw EXCEPTION("return_file_text(): File empty") - return - - return text - //Sends resource files to client cache /client/proc/getFiles() for(var/file in args) diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm index b030494ed0..a8cf2ec3fd 100644 --- a/code/__HELPERS/type2type.dm +++ b/code/__HELPERS/type2type.dm @@ -73,7 +73,7 @@ //Splits the text of a file at seperator and returns them in a list. /proc/file2list(filename, seperator="\n") - return splittext(return_file_text(filename),seperator) + return splittext(file2text(filename),seperator) //Turns a direction into text diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index 517c72512c..dbfdd160a5 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -448,7 +448,7 @@ SUBSYSTEM_DEF(job) /datum/controller/subsystem/job/proc/LoadJobs() - var/jobstext = return_file_text("config/jobs.txt") + var/jobstext = file2text("config/jobs.txt") for(var/datum/job/J in occupations) var/regex/jobs = new("[J.title]=(-1|\\d+),(-1|\\d+)") jobs.Find(jobstext) diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm index 957a569741..a9f1e8f6a0 100644 --- a/code/datums/helper_datums/getrev.dm +++ b/code/datums/helper_datums/getrev.dm @@ -6,7 +6,7 @@ var/date /datum/getrev/New() - var/head_file = return_file_text(".git/logs/HEAD") + var/head_file = file2text(".git/logs/HEAD") if(SERVERTOOLS && fexists("..\\prtestjob.lk")) var/list/tmp = file2list("..\\prtestjob.lk") for(var/I in tmp)