diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm
index db56e3e9c93..c2cbf3a0f47 100644
--- a/code/__HELPERS/text.dm
+++ b/code/__HELPERS/text.dm
@@ -787,34 +787,34 @@ GLOBAL_LIST_INIT(binary, list("0","1"))
switch(macro)
//prefixes/agnostic
if("the")
- rest = text("\the []", rest)
+ rest = "\the [rest]"
if("a")
- rest = text("\a []", rest)
+ rest = "\a [rest]"
if("an")
- rest = text("\an []", rest)
+ rest = "\an [rest]"
if("proper")
- rest = text("\proper []", rest)
+ rest = "\proper [rest]"
if("improper")
- rest = text("\improper []", rest)
+ rest = "\improper [rest]"
if("roman")
- rest = text("\roman []", rest)
+ rest = "\roman [rest]"
//postfixes
if("th")
- base = text("[]\th", rest)
+ base = "[rest]\th"
if("s")
- base = text("[]\s", rest)
+ base = "[rest]\s"
if("he")
- base = text("[]\he", rest)
+ base = "[rest]\he"
if("she")
- base = text("[]\she", rest)
+ base = "[rest]\she"
if("his")
- base = text("[]\his", rest)
+ base = "[rest]\his"
if("himself")
- base = text("[]\himself", rest)
+ base = "[rest]\himself"
if("herself")
- base = text("[]\herself", rest)
+ base = "[rest]\herself"
if("hers")
- base = text("[]\hers", rest)
+ base = "[rest]\hers"
else // Someone fucked up, if you're not a macro just go home yeah?
// This does technically break parsing, but at least it's better then what it used to do
return base
diff --git a/code/datums/records/record.dm b/code/datums/records/record.dm
index 408d344bb3b..bfbc90c9bd0 100644
--- a/code/datums/records/record.dm
+++ b/code/datums/records/record.dm
@@ -228,20 +228,20 @@
/datum/record/crew/proc/get_rapsheet(alias, header = "Rapsheet", description = "No further details.")
var/print_count = ++GLOB.manifest.print_count
var/obj/item/paper/printed_paper = new
- var/final_paper_text = text("
SR-[print_count]: [header]
")
+ var/final_paper_text = "SR-[print_count]: [header]
"
- final_paper_text += text("Name: []
Gender: []
Age: []
", name, gender, age)
+ final_paper_text += "Name: [name]
Gender: [gender]
Age: [age]
"
if(alias != name)
- final_paper_text += text("Alias: []
", alias)
+ final_paper_text += "Alias: [alias]
"
- final_paper_text += text("Species: []
Fingerprint: []
Wanted Status: []
", species, fingerprint, wanted_status)
+ final_paper_text += "Species: [species]
Fingerprint: [fingerprint]
Wanted Status: [wanted_status]
"
//SKYRAT EDIT ADD - RP RECORDS
if(past_general_records != "")
final_paper_text += "\nGeneral Records:\n[past_general_records]\n"
//SKYRAT EDIT ADD END
-
- final_paper_text += text("Security Data
")
+
+ final_paper_text += "Security Data
"
//SKYRAT EDIT ADDITION START - RP RECORDS
if(past_security_records != "")
@@ -286,13 +286,13 @@
final_paper_text += ""
final_paper_text += "
"
- final_paper_text += text("Important Notes:
")
+ final_paper_text += "Important Notes:
"
if(security_note)
- final_paper_text += text("- [security_note]
")
+ final_paper_text += "- [security_note]
"
if(description)
- final_paper_text += text("- [description]
")
+ final_paper_text += "- [description]
"
- printed_paper.name = text("SR-[] '[]'", print_count, name)
+ printed_paper.name = "SR-[print_count] '[name]'"
printed_paper.add_raw_text(final_paper_text)
printed_paper.update_appearance()
diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
index 8c5cea4338c..dcf889ee342 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -368,7 +368,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/xray, 0)
if (potential_viewer.client?.eye == src)
to_chat(potential_viewer, "[span_name("[user]")] holds \a [itemname] up to one of the cameras ...")
potential_viewer.log_talk(itemname, LOG_VICTIM, tag="Pressed to camera from [key_name(user)]", log_globally=FALSE)
- potential_viewer << browse(text("[][]", itemname, info), text("window=[]", itemname))
+ potential_viewer << browse("[itemname][info]", "window=[itemname]")
return
if(istype(attacking_item, /obj/item/paper))
diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm
index 1228930a7a2..155ed10cdc1 100644
--- a/code/game/machinery/camera/tracking.dm
+++ b/code/game/machinery/camera/tracking.dm
@@ -48,7 +48,7 @@
var/name = L.name
while(name in track.names)
track.namecounts[name]++
- name = text("[] ([])", name, track.namecounts[name])
+ name = "[name] ([track.namecounts[name]])"
track.names.Add(name)
track.namecounts[name] = 1
diff --git a/code/game/machinery/computer/prisoner/management.dm b/code/game/machinery/computer/prisoner/management.dm
index d84b79f0fe1..7acac9b6610 100644
--- a/code/game/machinery/computer/prisoner/management.dm
+++ b/code/game/machinery/computer/prisoner/management.dm
@@ -24,12 +24,12 @@
else if(screen == 1)
dat += "Prisoner ID Management
"
if(contained_id)
- dat += text("[contained_id]
")
- dat += text("Collected Points: [contained_id.points]. Reset.
")
- dat += text("Card goal: [contained_id.goal]. Set
")
- dat += text("Space Law recommends quotas of 100 points per minute they would normally serve in the brig.
")
+ dat += "[contained_id]
"
+ dat += "Collected Points: [contained_id.points]. Reset.
"
+ dat += "Card goal: [contained_id.goal]. Set
"
+ dat += "Space Law recommends quotas of 100 points per minute they would normally serve in the brig.
"
else
- dat += text("Insert Prisoner ID.
")
+ dat += "Insert Prisoner ID.
"
dat += "Prisoner Implant Management
"
dat += "
Chemical Implants
"
var/turf/current_turf = get_turf(src)
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index e1e90877844..d9e7c1a8e2d 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -1408,7 +1408,7 @@
message = "unshocked"
else
message = "temp shocked for [secondsElectrified] seconds"
- LAZYADD(shockedby, text("\[[time_stamp()]\] [key_name(user)] - ([uppertext(message)])"))
+ LAZYADD(shockedby, "\[[time_stamp()]\] [key_name(user)] - ([uppertext(message)])")
log_combat(user, src, message)
add_hiddenprint(user)
diff --git a/code/game/objects/items/pinpointer.dm b/code/game/objects/items/pinpointer.dm
index b4799962064..8659b0e1715 100644
--- a/code/game/objects/items/pinpointer.dm
+++ b/code/game/objects/items/pinpointer.dm
@@ -140,7 +140,7 @@
while(crewmember_name in name_counts)
name_counts[crewmember_name]++
- crewmember_name = text("[] ([])", crewmember_name, name_counts[crewmember_name])
+ crewmember_name = "[crewmember_name] ([name_counts[crewmember_name]])"
names[crewmember_name] = H
name_counts[crewmember_name] = 1
diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm
index 217d4f32571..b67e7086344 100644
--- a/code/game/objects/items/storage/secure.dm
+++ b/code/game/objects/items/storage/secure.dm
@@ -76,14 +76,14 @@
/obj/item/storage/secure/attack_self(mob/user)
var/locked = atom_storage.locked
user.set_machine(src)
- var/dat = text("[]
\n\nLock Status: []",src, (locked ? "LOCKED" : "UNLOCKED"))
+ var/dat = "[src]
\n\nLock Status: [locked ? "LOCKED" : "UNLOCKED"]"
var/message = "Code"
if (!lock_set)
- dat += text("\n5-DIGIT PASSCODE NOT SET.
ENTER NEW PASSCODE.")
- message = text("[]", entered_code)
+ dat += "
\n5-DIGIT PASSCODE NOT SET.
ENTER NEW PASSCODE."
+ message = "[entered_code]"
if (!locked)
message = "*****"
- dat += text("
\n>[]
\n1-2-3
\n4-5-6
\n7-8-9
\nR-0-E
\n", message)
+ dat += "
\n>[message]
\n1-2-3
\n4-5-6
\n7-8-9
\nR-0-E
\n"
user << browse(dat, "window=caselock;size=300x280")
/obj/item/storage/secure/Topic(href, href_list)
@@ -108,7 +108,7 @@
entered_code = null
atom_storage.hide_contents(usr)
else
- entered_code += text("[]", sanitize_text(href_list["type"]))
+ entered_code += sanitize_text(href_list["type"])
if (length(entered_code) > 5)
entered_code = "ERROR"
add_fingerprint(usr)
diff --git a/code/game/say.dm b/code/game/say.dm
index 501f1a2a8df..dfb99be2764 100644
--- a/code/game/say.dm
+++ b/code/game/say.dm
@@ -111,7 +111,7 @@ GLOBAL_LIST_INIT(freqtospan, list(
INVOKE_ASYNC(SStts, TYPE_PROC_REF(/datum/controller/subsystem/tts, queue_tts_message), src, html_decode(tts_message_to_use), message_language, voice, filter.Join(","), listened, message_range = range)
/atom/movable/proc/compose_message(atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, list/message_mods = list(), face_name = FALSE, visible_name = FALSE)
- //This proc uses text() because it is faster than appending strings. Thanks BYOND.
+ //This proc uses [] because it is faster than continually appending strings. Thanks BYOND.
//Basic span
var/spanpart1 = ""
//Start name span.
diff --git a/code/modules/admin/verbs/adminevents.dm b/code/modules/admin/verbs/adminevents.dm
index 1168f1d159b..9859e8041b5 100644
--- a/code/modules/admin/verbs/adminevents.dm
+++ b/code/modules/admin/verbs/adminevents.dm
@@ -10,7 +10,7 @@
return
message_admins("[key_name_admin(src)] has started answering [ADMIN_LOOKUPFLW(M)]'s prayer.")
- var/msg = input("Message:", text("Subtle PM to [M.key]")) as text|null
+ var/msg = input("Message:", "Subtle PM to [M.key]") as text|null
if(!msg)
message_admins("[key_name_admin(src)] decided not to answer [ADMIN_LOOKUPFLW(M)]'s prayer")
@@ -80,7 +80,7 @@
if(!check_rights(R_ADMIN))
return
- var/msg = input("Message:", text("Enter the text you wish to appear to everyone:")) as text|null
+ var/msg = input("Message:", "Enter the text you wish to appear to everyone:") as text|null
if (!msg)
return
@@ -100,7 +100,7 @@
var/range = input("Range:", "Narrate to mobs within how many tiles:", 7) as num|null
if(!range)
return
- var/msg = input("Message:", text("Enter the text you wish to appear to everyone within view:")) as text|null
+ var/msg = input("Message:", "Enter the text you wish to appear to everyone within view:") as text|null
if (!msg)
return
for(var/mob/M in view(range,A))
@@ -123,7 +123,7 @@
if(!M)
return
- var/msg = input("Message:", text("Enter the text you wish to appear to your target:")) as text|null
+ var/msg = input("Message:", "Enter the text you wish to appear to your target:") as text|null
if( !msg )
return
diff --git a/code/modules/admin/verbs/adminfun.dm b/code/modules/admin/verbs/adminfun.dm
index a157bd8f26d..e6e392c1bf9 100644
--- a/code/modules/admin/verbs/adminfun.dm
+++ b/code/modules/admin/verbs/adminfun.dm
@@ -7,19 +7,19 @@
if(!check_rights(R_ADMIN))
return
- var/devastation = input("Range of total devastation. -1 to none", text("Input")) as num|null
+ var/devastation = input("Range of total devastation. -1 to none", "Input") as num|null
if(devastation == null)
return
- var/heavy = input("Range of heavy impact. -1 to none", text("Input")) as num|null
+ var/heavy = input("Range of heavy impact. -1 to none", "Input") as num|null
if(heavy == null)
return
- var/light = input("Range of light impact. -1 to none", text("Input")) as num|null
+ var/light = input("Range of light impact. -1 to none", "Input") as num|null
if(light == null)
return
- var/flash = input("Range of flash. -1 to none", text("Input")) as num|null
+ var/flash = input("Range of flash. -1 to none", "Input") as num|null
if(flash == null)
return
- var/flames = input("Range of flames. -1 to none", text("Input")) as num|null
+ var/flames = input("Range of flames. -1 to none", "Input") as num|null
if(flames == null)
return
@@ -40,10 +40,10 @@
if(!check_rights(R_ADMIN))
return
- var/heavy = input("Range of heavy pulse.", text("Input")) as num|null
+ var/heavy = input("Range of heavy pulse.", "Input") as num|null
if(heavy == null)
return
- var/light = input("Range of light pulse.", text("Input")) as num|null
+ var/light = input("Range of light pulse.", "Input") as num|null
if(light == null)
return
diff --git a/code/modules/admin/verbs/list_exposer.dm b/code/modules/admin/verbs/list_exposer.dm
index 851bd901c1e..92a37a7f609 100644
--- a/code/modules/admin/verbs/list_exposer.dm
+++ b/code/modules/admin/verbs/list_exposer.dm
@@ -6,7 +6,7 @@
return
var/data = "Bombing List
"
for(var/entry in GLOB.bombers)
- data += text("[entry]
")
+ data += "[entry]
"
usr << browse(data, "window=bombers;size=800x500")
/datum/admins/proc/list_signalers()
diff --git a/code/modules/buildmode/submodes/boom.dm b/code/modules/buildmode/submodes/boom.dm
index 229114d024a..2fcb6ed5c0e 100644
--- a/code/modules/buildmode/submodes/boom.dm
+++ b/code/modules/buildmode/submodes/boom.dm
@@ -23,7 +23,7 @@
/datum/buildmode_mode/boom/change_settings(client/c)
for (var/explosion_level in explosions)
- explosions[explosion_level] = input(c, "Range of total [explosion_level]. 0 to none", text("Input")) as num|null
+ explosions[explosion_level] = input(c, "Range of total [explosion_level]. 0 to none", "Input") as num|null
if(explosions[explosion_level] == null || explosions[explosion_level] < 0)
explosions[explosion_level] = 0
diff --git a/code/modules/detectivework/scanner.dm b/code/modules/detectivework/scanner.dm
index 47734b398ab..63bab9afdd9 100644
--- a/code/modules/detectivework/scanner.dm
+++ b/code/modules/detectivework/scanner.dm
@@ -58,8 +58,8 @@
//This could be a global count like sec and med record printouts. See GLOB.manifest.generalPrintCount AKA datacore.dm
var/frNum = ++forensicPrintCount
- report_paper.name = text("FR-[] 'Forensic Record'", frNum)
- var/report_text = text("Forensic Record - (FR-[])
", frNum)
+ report_paper.name = "FR-[frNum] 'Forensic Record'"
+ var/report_text = "Forensic Record - (FR-[frNum])
"
report_text += jointext(log, "
")
report_text += "
Notes:
"
diff --git a/code/modules/instruments/songs/editor.dm b/code/modules/instruments/songs/editor.dm
index 6f4bdc06004..58c0562c9b0 100644
--- a/code/modules/instruments/songs/editor.dm
+++ b/code/modules/instruments/songs/editor.dm
@@ -130,7 +130,7 @@
else if(href_list["import"])
var/t = ""
do
- t = html_encode(input(usr, "Please paste the entire song, formatted:", text("[]", name), t) as message)
+ t = html_encode(input(usr, "Please paste the entire song, formatted:", name, t) as message)
if(!in_range(parent, usr))
return
diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm
index c3bbc842bfb..785daf0ef14 100644
--- a/code/modules/mob/living/simple_animal/bot/mulebot.dm
+++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm
@@ -462,7 +462,7 @@
if(cell)
. += "Charge Left: [cell.charge]/[cell.maxcharge]"
else
- . += text("No Cell Inserted!")
+ . += "No Cell Inserted!"
if(load)
. += "Current Load: [get_load_name()]"
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index d96a8dd7aff..cffaf33ce76 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -880,7 +880,7 @@
*/
/mob/Topic(href, href_list)
if(href_list["mach_close"])
- var/t1 = text("window=[href_list["mach_close"]]")
+ var/t1 = "window=[href_list["mach_close"]]"
unset_machine()
src << browse(null, t1)
diff --git a/code/modules/modular_computers/file_system/programs/crewmanifest.dm b/code/modules/modular_computers/file_system/programs/crewmanifest.dm
index e0f26173001..3215f62eef8 100644
--- a/code/modules/modular_computers/file_system/programs/crewmanifest.dm
+++ b/code/modules/modular_computers/file_system/programs/crewmanifest.dm
@@ -24,7 +24,7 @@
[GLOB.manifest ? GLOB.manifest.get_html(0) : ""]
"}
- if(!computer.print_text(contents,text("crew manifest ([])", station_time_timestamp())))
+ if(!computer.print_text(contents, "crew manifest ([station_time_timestamp()])"))
to_chat(usr, span_notice("Printer is out of paper."))
return
else
diff --git a/code/modules/pai/pai.dm b/code/modules/pai/pai.dm
index 6b886e2d7b6..d8aa59840f3 100644
--- a/code/modules/pai/pai.dm
+++ b/code/modules/pai/pai.dm
@@ -177,9 +177,9 @@
/mob/living/silicon/pai/get_status_tab_items()
. += ..()
if(!stat)
- . += text("Emitter Integrity: [holochassis_health * (100 / HOLOCHASSIS_MAX_HEALTH)].")
+ . += "Emitter Integrity: [holochassis_health * (100 / HOLOCHASSIS_MAX_HEALTH)]."
else
- . += text("Systems nonfunctional.")
+ . += "Systems nonfunctional."
/mob/living/silicon/pai/handle_atom_del(atom/deleting_atom)
if(deleting_atom == hacking_cable)
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 16c4220b714..371f96e0da6 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -298,7 +298,7 @@
if(isnull(n_name) || n_name == "")
return
if(((loc == usr || istype(loc, /obj/item/clipboard)) && usr.stat == CONSCIOUS))
- name = "paper[(n_name ? text("- '[n_name]'") : null)]"
+ name = "paper[(n_name ? "- '[n_name]'" : null)]"
add_fingerprint(usr)
update_static_data()
diff --git a/code/modules/photography/photos/photo.dm b/code/modules/photography/photos/photo.dm
index 43e48b2e3a7..7af4c546cff 100644
--- a/code/modules/photography/photos/photo.dm
+++ b/code/modules/photography/photos/photo.dm
@@ -104,7 +104,7 @@
var/n_name = tgui_input_text(usr, "What would you like to label the photo?", "Photo Labelling", max_length = MAX_NAME_LEN)
//loc.loc check is for making possible renaming photos in clipboards
if(n_name && (loc == usr || loc.loc && loc.loc == usr) && usr.stat == CONSCIOUS && !usr.incapacitated())
- name = "photo[(n_name ? text("- '[n_name]'") : null)]"
+ name = "photo[(n_name ? "- '[n_name]'" : null)]"
add_fingerprint(usr)
/obj/item/photo/old