cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 15:17:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes all uses of text() (#75766)

Browse Source 
## About The Pull Request

Apperantly it's deprecated. Also people misunderstand how to use it,
which leads to silly looking code and redundant wraps.

It is potentially useful to do a sort of format style string embedding,
but we don't have anything that really warrents it IMO.

## Why It's Good For The Game

Maybe byond will break on version upgrade slightly less now.
Also the code's less cluttered, and boomer posting has been excised.


![image](https://github.com/tgstation/tgstation/assets/58055496/c630e522-962c-4344-80f7-36d5df00a8b5)

![image](https://github.com/tgstation/tgstation/assets/58055496/f4cb3eb5-f07f-4489-8813-f59b19406bda)

![image](https://github.com/tgstation/tgstation/assets/58055496/6df7eb62-dae8-43b5-a511-1130ab4a2870)
This commit is contained in:
LemonInTheDark
2023-06-01 16:13:33 -04:00
committed by GitHub
parent 0a273ce37e
commit cb4a836d41
21 changed files with 61 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__HELPERS/text.dm
+14 -14
View File
@@ -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
code/datums/records/record.dm
+9 -9
View File
@@ -214,15 +214,15 @@
/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("<center><b>SR-[print_count]: [header]</b></center><br>")
var/final_paper_text = "<center><b>SR-[print_count]: [header]</b></center><br>"
final_paper_text += text("Name: []<br>Gender: []<br>Age: []<br>", name, gender, age)
final_paper_text += "Name: [name]<br>Gender: [gender]<br>Age: [age]<br>"
if(alias != name)
final_paper_text += text("Alias: []<br>", alias)
final_paper_text += "Alias: [alias]<br>"
final_paper_text += text("Species: []<br>Fingerprint: []<br>Wanted Status: []<br><br>", species, fingerprint, wanted_status)
final_paper_text += "Species: [species]<br>Fingerprint: [fingerprint]<br>Wanted Status: [wanted_status]<br><br>"
final_paper_text += text("<center><B>Security Data</B></center><br><br>")
final_paper_text += "<center><B>Security Data</B></center><br><br>"
final_paper_text += "Crimes:<br>"
final_paper_text += {"<table style="text-align:center;" border="1" cellspacing="0" width="100%">
@@ -262,13 +262,13 @@
final_paper_text += "</tr>"
final_paper_text += "</table><br><br>"
final_paper_text += text("<center>Important Notes:</center><br>")
final_paper_text += "<center>Important Notes:</center><br>"
if(security_note)
final_paper_text += text("- [security_note]<br>")
final_paper_text += "- [security_note]<br>"
if(description)
final_paper_text += text("- [description]<br>")
final_paper_text += "- [description]<br>"
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()
code/game/machinery/camera/camera.dm
+1 -1
View File
@@ -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("<HTML><HEAD><TITLE>[]</TITLE></HEAD><BODY><TT>[]</TT></BODY></HTML>", itemname, info), text("window=[]", itemname))
potential_viewer << browse("<HTML><HEAD><TITLE>[itemname]</TITLE></HEAD><BODY><TT>[info]</TT></BODY></HTML>", "window=[itemname]")
return
if(istype(attacking_item, /obj/item/paper))
code/game/machinery/camera/tracking.dm
+1 -1
View File
@@ -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
code/game/machinery/computer/prisoner/management.dm
+5 -5
View File
@@ -24,12 +24,12 @@
else if(screen == 1)
dat += "<H3>Prisoner ID Management</H3>"
if(contained_id)
dat += text("<A href='?src=[REF(src)];id=eject'>[contained_id]</A><br>")
dat += text("Collected Points: [contained_id.points]. <A href='?src=[REF(src)];id=reset'>Reset.</A><br>")
dat += text("Card goal: [contained_id.goal]. <A href='?src=[REF(src)];id=setgoal'>Set </A><br>")
dat += text("Space Law recommends quotas of 100 points per minute they would normally serve in the brig.<BR>")
dat += "<A href='?src=[REF(src)];id=eject'>[contained_id]</A><br>"
dat += "Collected Points: [contained_id.points]. <A href='?src=[REF(src)];id=reset'>Reset.</A><br>"
dat += "Card goal: [contained_id.goal]. <A href='?src=[REF(src)];id=setgoal'>Set </A><br>"
dat += "Space Law recommends quotas of 100 points per minute they would normally serve in the brig.<BR>"
else
dat += text("<A href='?src=[REF(src)];id=insert'>Insert Prisoner ID.</A><br>")
dat += "<A href='?src=[REF(src)];id=insert'>Insert Prisoner ID.</A><br>"
dat += "<H3>Prisoner Implant Management</H3>"
dat += "<HR>Chemical Implants<BR>"
var/turf/current_turf = get_turf(src)
code/game/machinery/doors/airlock.dm
+1 -1
View File
@@ -1373,7 +1373,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)
code/game/objects/items/pinpointer.dm
+1 -1
View File
@@ -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
code/game/objects/items/storage/secure.dm
+5 -5
View File
@@ -76,14 +76,14 @@
/obj/item/storage/secure/attack_self(mob/user)
var/locked = atom_storage.locked
user.set_machine(src)
var/dat = text("<TT><B>[]</B><BR>\n\nLock Status: []",src, (locked ? "LOCKED" : "UNLOCKED"))
var/dat = "<TT><B>[src]</B><BR>\n\nLock Status: [locked ? "LOCKED" : "UNLOCKED"]"
var/message = "Code"
if (!lock_set)
dat += text("<p>\n<b>5-DIGIT PASSCODE NOT SET.<br>ENTER NEW PASSCODE.</b>")
message = text("[]", entered_code)
dat += "<p>\n<b>5-DIGIT PASSCODE NOT SET.<br>ENTER NEW PASSCODE.</b>"
message = "[entered_code]"
if (!locked)
message = "*****"
dat += text("<HR>\n>[]<BR>\n<A href='?src=[REF(src)];type=1'>1</A>-<A href='?src=[REF(src)];type=2'>2</A>-<A href='?src=[REF(src)];type=3'>3</A><BR>\n<A href='?src=[REF(src)];type=4'>4</A>-<A href='?src=[REF(src)];type=5'>5</A>-<A href='?src=[REF(src)];type=6'>6</A><BR>\n<A href='?src=[REF(src)];type=7'>7</A>-<A href='?src=[REF(src)];type=8'>8</A>-<A href='?src=[REF(src)];type=9'>9</A><BR>\n<A href='?src=[REF(src)];type=R'>R</A>-<A href='?src=[REF(src)];type=0'>0</A>-<A href='?src=[REF(src)];type=E'>E</A><BR>\n</TT>", message)
dat += "<HR>\n>[message]<BR>\n<A href='?src=[REF(src)];type=1'>1</A>-<A href='?src=[REF(src)];type=2'>2</A>-<A href='?src=[REF(src)];type=3'>3</A><BR>\n<A href='?src=[REF(src)];type=4'>4</A>-<A href='?src=[REF(src)];type=5'>5</A>-<A href='?src=[REF(src)];type=6'>6</A><BR>\n<A href='?src=[REF(src)];type=7'>7</A>-<A href='?src=[REF(src)];type=8'>8</A>-<A href='?src=[REF(src)];type=9'>9</A><BR>\n<A href='?src=[REF(src)];type=R'>R</A>-<A href='?src=[REF(src)];type=0'>0</A>-<A href='?src=[REF(src)];type=E'>E</A><BR>\n</TT>"
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)
code/game/say.dm
+1 -1
View File
@@ -105,7 +105,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 = "<span class='[radio_freq ? get_radio_span(radio_freq) : "game say"]'>"
//Start name span.
code/modules/admin/verbs/adminevents.dm
+4 -4
View File
@@ -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
code/modules/admin/verbs/adminfun.dm
+7 -7
View File
@@ -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
code/modules/admin/verbs/list_exposer.dm
+1 -1
View File
@@ -6,7 +6,7 @@
return
var/data = "<b>Bombing List</b><hr>"
for(var/entry in GLOB.bombers)
data += text("[entry]<br>")
data += "[entry]<br>"
usr << browse(data, "window=bombers;size=800x500")
/datum/admins/proc/list_signalers()
code/modules/buildmode/submodes/boom.dm
+1 -1
View File
@@ -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
code/modules/detectivework/scanner.dm
+2 -2
View File
@@ -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("<center><B>Forensic Record - (FR-[])</B></center><HR><BR>", frNum)
report_paper.name = "FR-[frNum] 'Forensic Record'"
var/report_text = "<center><B>Forensic Record - (FR-[frNum])</B></center><HR><BR>"
report_text += jointext(log, "<BR>")
report_text += "<HR><B>Notes:</B><BR>"
code/modules/instruments/songs/editor.dm
+1 -1
View File
@@ -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
code/modules/mob/living/simple_animal/bot/mulebot.dm
+1 -1
View File
@@ -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()]"
code/modules/mob/mob.dm
+1 -1
View File
@@ -834,7 +834,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)
code/modules/modular_computers/file_system/programs/crewmanifest.dm
+1 -1
View File
@@ -24,7 +24,7 @@
<br>
[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
code/modules/pai/pai.dm
+2 -2
View File
@@ -185,9 +185,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)
code/modules/paperwork/paper.dm
+1 -1
View File
@@ -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()
code/modules/photography/photos/photo.dm
+1 -1
View File
@@ -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