diff --git a/code/__HELPERS/bygex/bygex.dm b/code/__HELPERS/bygex/bygex.dm index a59f3cecd6b..c5c4999ccca 100644 --- a/code/__HELPERS/bygex/bygex.dm +++ b/code/__HELPERS/bygex/bygex.dm @@ -48,13 +48,11 @@ regex_replaceall(str, exp, fmt) return call(LIBREGEX_LIBRARY, "regex_replaceall")(str, exp, fmt) -#if DM_VERSION < 510 replacetextEx(str, exp, fmt) return call(LIBREGEX_LIBRARY, "regEx_replaceallliteral")(str, exp, fmt) replacetext(str, exp, fmt) return call(LIBREGEX_LIBRARY, "regex_replaceallliteral")(str, exp, fmt) -#endif regEx_replace(str, exp, fmt) return call(LIBREGEX_LIBRARY, "regEx_replace")(str, exp, fmt) diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm index 288af19c4a3..fc00a9dcf3b 100644 --- a/code/__HELPERS/text.dm +++ b/code/__HELPERS/text.dm @@ -204,15 +204,12 @@ proc/checkhtml(var/t) */ // See bygex.dm #ifndef USE_BYGEX -#if DM_VERSION < 510 /proc/replacetext(text, find, replacement) return list2text(text2list(text, find), replacement) /proc/replacetextEx(text, find, replacement) return list2text(text2listEx(text, find), replacement) #endif -#endif - /proc/replace_characters(var/t,var/list/repl_chars) for(var/char in repl_chars) t = replacetext(t, char, repl_chars[char]) diff --git a/code/modules/scripting/Implementations/Telecomms.dm b/code/modules/scripting/Implementations/Telecomms.dm index eafe0c94bd3..eadc1d398c4 100644 --- a/code/modules/scripting/Implementations/Telecomms.dm +++ b/code/modules/scripting/Implementations/Telecomms.dm @@ -138,7 +138,7 @@ @param replacestring: the string to replace the substring with */ - interpreter.SetProc("replace", /proc/n_replacetext) + interpreter.SetProc("replace", /proc/replacetext) /* -> Locates an element/substring inside of a list or string @@ -194,7 +194,7 @@ interpreter.SetProc("reverse", /proc/reverse_text) interpreter.SetProc("tonum", /proc/n_str2num) interpreter.SetProc("capitalize", /proc/capitalize) - interpreter.SetProc("replacetextEx",/proc/n_replacetextEx) + interpreter.SetProc("replacetextEx",/proc/replacetextEx) // Numbers interpreter.SetProc("tostring", /proc/n_num2str) diff --git a/code/modules/scripting/Implementations/_Logic.dm b/code/modules/scripting/Implementations/_Logic.dm index eb27ecce04d..c71839eaad9 100644 --- a/code/modules/scripting/Implementations/_Logic.dm +++ b/code/modules/scripting/Implementations/_Logic.dm @@ -260,10 +260,4 @@ proc/n_round(var/num) /proc/n_log(var/num) if(isnum(num) && 0 < num) - return log(num) - -/proc/n_replacetext(text, r, with) - return replacetext(text, r, with) - -/proc/n_replacetextEx(text, r, with) - return replacetextEx(text, r, with) \ No newline at end of file + return log(num) \ No newline at end of file