diff --git a/code/ZAS/Variable Settings.dm b/code/ZAS/Variable Settings.dm index c152159b..7da5aa01 100644 --- a/code/ZAS/Variable Settings.dm +++ b/code/ZAS/Variable Settings.dm @@ -348,7 +348,7 @@ var/global/vs_control/vsc = new var/txt = vars["[V]_RANDOM"] if(findtextEx(txt,"PROB")) txt = text2list(txt,"/") - txt[1] = replacetext(txt[1],"PROB","") + txt[1] = bayreplacetext(txt[1],"PROB","") var/p = text2num(txt[1]) var/r = txt[2] if(prob(p)) @@ -356,7 +356,7 @@ var/global/vs_control/vsc = new else newvalue = vars[V] else if(findtextEx(txt,"PICK")) - txt = replacetext(txt,"PICK","") + txt = bayreplacetext(txt,"PICK","") txt = text2list(txt,",") newvalue = pick(txt) else diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm index 1dbd4ea2..9917c523 100644 --- a/code/__HELPERS/text.dm +++ b/code/__HELPERS/text.dm @@ -36,7 +36,7 @@ //Removes a few problematic characters /proc/sanitize_simple(var/t,var/list/repl_chars = list("\n"="#","\t"="#")) for(var/char in repl_chars) - t = replacetext(t, char, repl_chars[char]) + t = bayreplacetext(t, char, repl_chars[char]) return t /proc/readd_quotes(var/t) @@ -203,10 +203,11 @@ proc/checkhtml(var/t) /* * Text modification */ -/proc/replacetext(text, find, replacement) + +/proc/bayreplacetext(text, find, replacement) return list2text(text2list(text, find), replacement) -/proc/replacetextEx(text, find, replacement) +/proc/bayreplacetextEx(text, find, replacement) return list2text(text2listEx(text, find), replacement) //Adds 'u' number of zeros ahead of the text 't' diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index eae4ff32..ba838348 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -875,7 +875,7 @@ proc/anim(turf/location as turf,target as mob|obj,a_icon,a_icon_state as text,fl corner.density = 1 corner.anchored = 1 corner.icon = X.icon - corner.icon_state = replacetext(X.icon_state, "_s", "_f") + corner.icon_state = bayreplacetext(X.icon_state, "_s", "_f") corner.tag = "delete me" corner.name = "wall" @@ -895,7 +895,7 @@ proc/anim(turf/location as turf,target as mob|obj,a_icon,a_icon_state as text,fl // Reset the shuttle corners if(O.tag == "delete me") X.icon = 'icons/turf/shuttle.dmi' - X.icon_state = replacetext(O.icon_state, "_f", "_s") // revert the turf to the old icon_state + X.icon_state = bayreplacetext(O.icon_state, "_f", "_s") // revert the turf to the old icon_state X.name = "wall" del(O) // prevents multiple shuttle corners from stacking continue @@ -1348,7 +1348,7 @@ var/list/WALLITEMS = list( return 0 /proc/format_text(text) - return replacetext(replacetext(text,"\proper ",""),"\improper ","") + return bayreplacetext(bayreplacetext(text,"\proper ",""),"\improper ","") /proc/topic_link(var/datum/D, var/arglist, var/content) if(istype(arglist,/list)) diff --git a/code/datums/spell.dm b/code/datums/spell.dm index 8530c916..28b8a5b5 100644 --- a/code/datums/spell.dm +++ b/code/datums/spell.dm @@ -101,7 +101,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin if(prob(50))//Auto-mute? Fuck that noise usr.say(invocation) else - usr.say(replacetext(invocation," ","`")) + usr.say(bayreplacetext(invocation," ","`")) if(usr.gender==MALE) playsound(usr.loc, pick('sound/misc/null.ogg','sound/misc/null.ogg'), 100, 1) else @@ -110,7 +110,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin if(prob(50)) usr.whisper(invocation) else - usr.whisper(replacetext(invocation," ","`")) + usr.whisper(bayreplacetext(invocation," ","`")) /obj/effect/proc_holder/spell/New() ..() diff --git a/code/defines/obj.dm b/code/defines/obj.dm index 0de9f70d..2e5f840b 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -160,8 +160,8 @@ even = !even dat += "" - dat = replacetext(dat, "\n", "") // so it can be placed on paper correctly - dat = replacetext(dat, "\t", "") + dat = bayreplacetext(dat, "\n", "") // so it can be placed on paper correctly + dat = bayreplacetext(dat, "\t", "") return dat diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 0fd87b74..175580bd 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -52,7 +52,7 @@ name_part1 = pick("the Automatic ", "Farmer ", "Lord ", "Professor ", "the Cuban ", "the Evil ", "the Dread King ", "the Space ", "Lord ", "the Great ", "Duke ", "General ") name_part2 = pick("Melonoid", "Murdertron", "Sorcerer", "Ruin", "Jeff", "Ectoplasm", "Crushulon", "Uhangoid", "Vhakoid", "Peteoid", "slime", "Griefer", "ERPer", "Lizard Man", "Unicorn") - src.enemy_name = replacetext((name_part1 + name_part2), "the ", "") + src.enemy_name = bayreplacetext((name_part1 + name_part2), "the ", "") src.name = (name_action + name_part1 + name_part2) diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index be5a73d9..43a5ef3c 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -24,7 +24,7 @@ var/list/formatted = list() for(var/job in jobs) formatted.Add(list(list( - "display_name" = replacetext(job, " ", " "), + "display_name" = bayreplacetext(job, " ", " "), "target_rank" = get_target_rank(), "job" = job))) @@ -108,7 +108,7 @@ var/list/all_centcom_access = list() for(var/access in get_all_centcom_access()) all_centcom_access.Add(list(list( - "desc" = replacetext(get_centcom_access_desc(access), " ", " "), + "desc" = bayreplacetext(get_centcom_access_desc(access), " ", " "), "ref" = access, "allowed" = (access in modify.access) ? 1 : 0))) @@ -120,7 +120,7 @@ for(var/access in get_region_accesses(i)) if (get_access_desc(access)) accesses.Add(list(list( - "desc" = replacetext(get_access_desc(access), " ", " "), + "desc" = bayreplacetext(get_access_desc(access), " ", " "), "ref" = access, "allowed" = (access in modify.access) ? 1 : 0))) diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index 0711678e..c89ef005 100644 --- a/code/game/machinery/computer/computer.dm +++ b/code/game/machinery/computer/computer.dm @@ -100,7 +100,7 @@ /obj/machinery/computer/proc/decode(text) // Adds line breaks - text = replacetext(text, "\n", "
") + text = bayreplacetext(text, "\n", "
") return text diff --git a/code/game/machinery/computer/supply.dm b/code/game/machinery/computer/supply.dm index e27813cc..93234308 100644 --- a/code/game/machinery/computer/supply.dm +++ b/code/game/machinery/computer/supply.dm @@ -107,7 +107,7 @@ reqform.info += "RANK: [idrank]
" reqform.info += "REASON: [reason]
" reqform.info += "SUPPLY CRATE TYPE: [P.name]
" - reqform.info += "ACCESS RESTRICTION: [replacetext(get_access_desc(P.access))]
" + reqform.info += "ACCESS RESTRICTION: [bayreplacetext(get_access_desc(P.access))]
" reqform.info += "CONTENTS:
" reqform.info += P.manifest reqform.info += "
" @@ -311,7 +311,7 @@ reqform.info += "RANK: [idrank]
" reqform.info += "REASON: [reason]
" reqform.info += "SUPPLY CRATE TYPE: [P.name]
" - reqform.info += "ACCESS RESTRICTION: [replacetext(get_access_desc(P.access))]
" + reqform.info += "ACCESS RESTRICTION: [bayreplacetext(get_access_desc(P.access))]
" reqform.info += "CONTENTS:
" reqform.info += P.manifest reqform.info += "
" diff --git a/code/game/machinery/computer3/computers/arcade.dm b/code/game/machinery/computer3/computers/arcade.dm index 74655107..59bd4346 100644 --- a/code/game/machinery/computer3/computers/arcade.dm +++ b/code/game/machinery/computer3/computers/arcade.dm @@ -63,7 +63,7 @@ name_part1 = pick("the Automatic ", "Farmer ", "Lord ", "Professor ", "the Cuban ", "the Evil ", "the Dread King ", "the Space ", "Lord ", "the Great ", "Duke ", "General ") name_part2 = pick("Melonoid", "Murdertron", "Sorcerer", "Ruin", "Jeff", "Ectoplasm", "Crushulon", "Uhangoid", "Vhakoid", "Peteoid", "slime", "Griefer", "ERPer", "Lizard Man", "Unicorn") - enemy_name = replacetext(name_part1, "the ", "") + name_part2 + enemy_name = bayreplacetext(name_part1, "the ", "") + name_part2 name = (name_action + name_part1 + name_part2) diff --git a/code/game/machinery/computer3/computers/card.dm b/code/game/machinery/computer3/computers/card.dm index 963b1f4d..ad4c3417 100644 --- a/code/game/machinery/computer3/computers/card.dm +++ b/code/game/machinery/computer3/computers/card.dm @@ -46,7 +46,7 @@ if(counter >= 6) jobs_all += "" counter = 0 - jobs_all += "[replacetext(job, " ", " ")]" + jobs_all += "[bayreplacetext(job, " ", " ")]" counter = 0 jobs_all += "Engineering"//Orange @@ -55,7 +55,7 @@ if(counter >= 6) jobs_all += "" counter = 0 - jobs_all += "[replacetext(job, " ", " ")]" + jobs_all += "[bayreplacetext(job, " ", " ")]" counter = 0 jobs_all += "Medical"//Green @@ -64,7 +64,7 @@ if(counter >= 6) jobs_all += "" counter = 0 - jobs_all += "[replacetext(job, " ", " ")]" + jobs_all += "[bayreplacetext(job, " ", " ")]" counter = 0 jobs_all += "Science"//Purple @@ -73,7 +73,7 @@ if(counter >= 6) jobs_all += "" counter = 0 - jobs_all += "[replacetext(job, " ", " ")]" + jobs_all += "[bayreplacetext(job, " ", " ")]" counter = 0 jobs_all += "Civilian"//Grey @@ -82,7 +82,7 @@ if(counter >= 6) jobs_all += "" counter = 0 - jobs_all += "[replacetext(job, " ", " ")]" + jobs_all += "[bayreplacetext(job, " ", " ")]" dat = {"