mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-07-14 09:27:45 +01:00
Text() away (#19850)
Refactored all the builtin text procs to use string interpolation instead. Added a linting for the above. This is based on, and should only be merged after, #19847
This commit is contained in:
@@ -185,7 +185,7 @@ var/savefile/Banlist
|
||||
if(!expiry) expiry = "Removal Pending"
|
||||
else expiry = "Permaban"
|
||||
|
||||
dat += text("<tr><td><A href='?src=[ref];unbanf=[key][id]'>(U)</A><A href='?src=[ref];unbane=[key][id]'>(E)</A> Key: <B>[key]</B></td><td>ComputerID: <B>[id]</B></td><td>IP: <B>[ip]</B></td><td> [expiry]</td><td>(By: [by])</td><td>(Reason: [reason])</td></tr>")
|
||||
dat += "<tr><td><A href='?src=[ref];unbanf=[key][id]'>(U)</A><A href='?src=[ref];unbane=[key][id]'>(E)</A> Key: <B>[key]</B></td><td>ComputerID: <B>[id]</B></td><td>IP: <B>[ip]</B></td><td> [expiry]</td><td>(By: [by])</td><td>(Reason: [reason])</td></tr>"
|
||||
|
||||
dat += "</table>"
|
||||
dat = "<HR><B>Bans:</B> <FONT COLOR=blue>(U) = Unban , (E) = Edit Ban</FONT> - <FONT COLOR=green>([count] Bans)</FONT><HR><table border=1 rules=all frame=void cellspacing=0 cellpadding=3 >[dat]"
|
||||
|
||||
@@ -24,10 +24,10 @@
|
||||
/proc/admin_attack_log(var/mob/attacker, var/mob/victim, var/attacker_message, var/victim_message, var/admin_message)
|
||||
var/jmp_link = ""
|
||||
if(victim)
|
||||
victim.attack_log += text("\[[time_stamp()]\] <font color='orange'>[key_name(attacker)] - [victim_message]</font>")
|
||||
victim.attack_log +="\[[time_stamp()]\] <font color='orange'>[key_name(attacker)] - [victim_message]</font>"
|
||||
jmp_link = " (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[victim.x];Y=[victim.y];Z=[victim.z]'>JMP</a>)"
|
||||
if(attacker)
|
||||
attacker.attack_log += text("\[[time_stamp()]\] <span class='warning'>[key_name(victim)] - [attacker_message]</span>")
|
||||
attacker.attack_log += "\[[time_stamp()]\] <span class='warning'>[key_name(victim)] - [attacker_message]</span>"
|
||||
jmp_link = " (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[attacker.x];Y=[attacker.y];Z=[attacker.z]'>JMP</a>)"
|
||||
|
||||
msg_admin_attack("[attacker ? key_name_admin(attacker) : ""] [admin_message] [victim ? key_name_admin(victim) : ""] (INTENT: [attacker? uppertext(attacker.a_intent) : "N/A"])[jmp_link]",ckey=key_name(attacker),ckey_target=key_name(victim))
|
||||
|
||||
@@ -8,5 +8,5 @@
|
||||
|
||||
var/dat = "<B>Bombing List</B>"
|
||||
for(var/l in GLOB.bombers)
|
||||
dat += text("[l]<BR>")
|
||||
dat += "[l]<BR>"
|
||||
user << browse(dat, "window=bombers")
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
to_chat(src, "Only administrators may use this command.")
|
||||
return
|
||||
|
||||
var/msg = sanitize(input("Message:", text("Subtle PM to [M.key]")) as text)
|
||||
var/msg = sanitize(input("Message:", "Subtle PM to [M.key]"))
|
||||
|
||||
if (!msg)
|
||||
return
|
||||
@@ -83,7 +83,7 @@
|
||||
to_chat(src, "Only administrators may use this command.")
|
||||
return
|
||||
|
||||
var/msg = html_decode(sanitize(input("Message:", text("Enter the text you wish to appear to everyone:")) as text))
|
||||
var/msg = html_decode(sanitize(input("Message:", "Enter the text you wish to appear to everyone:")))
|
||||
|
||||
if (!msg)
|
||||
return
|
||||
@@ -110,7 +110,7 @@
|
||||
else
|
||||
return
|
||||
|
||||
var/msg = html_decode(sanitize(input("Message:", text("Enter the text you wish to appear to everyone within seven tiles of you:")) as text))
|
||||
var/msg = html_decode(sanitize(input("Message:", "Enter the text you wish to appear to everyone within seven tiles of you:")))
|
||||
if(!msg)
|
||||
return
|
||||
for(var/M in message_mobs)
|
||||
@@ -133,7 +133,7 @@
|
||||
if(!M)
|
||||
return
|
||||
|
||||
var/msg = html_decode(sanitize(input("Message:", text("Enter the text you wish to appear to your target:")) as text))
|
||||
var/msg = html_decode(sanitize(input("Message:", "Enter the text you wish to appear to your target:")))
|
||||
|
||||
if( !msg )
|
||||
return
|
||||
@@ -662,13 +662,13 @@ Traitors and the like can also be revived with the previous role mostly intact.
|
||||
|
||||
if(!check_rights(R_DEBUG|R_FUN)) 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
|
||||
|
||||
if ((devastation != -1) || (heavy != -1) || (light != -1) || (flash != -1))
|
||||
@@ -690,9 +690,9 @@ Traitors and the like can also be revived with the previous role mostly intact.
|
||||
|
||||
if(!check_rights(R_DEBUG|R_FUN)) 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
|
||||
|
||||
if (heavy || light)
|
||||
|
||||
Reference in New Issue
Block a user