diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index f305b2a2929..e0df9662f44 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -50,9 +50,9 @@ for(var/datum/data/record/R in sortRecord(data_core.general)) dat += text("[]: []
", src, R, R.fields["id"], R.fields["name"]) //Foreach goto(132) - dat += text("
Back", src) + dat += "
Back" if(3.0) - dat += text("Records Maintenance
\nBackup To Disk
\nUpload From disk
\nDelete All Records
\n
\nBack", src, src, src, src) + dat += "Records Maintenance
\nBackup To Disk
\nUpload From disk
\nDelete All Records
\n
\nBack" if(4.0) dat += "
Medical Record

" if((istype(src.active1, /datum/data/record) && data_core.general.Find(src.active1))) @@ -73,12 +73,12 @@ while(src.active2.fields[text("com_[]", counter)]) dat += text("[]
Delete Entry

", src.active2.fields[text("com_[]", counter)], src, counter) counter++ - dat += text("Add Entry

", src) - dat += text("Delete Record (Medical Only)

", src) + dat += "Add Entry

" + dat += "Delete Record (Medical Only)

" else dat += "Medical Record Lost!
" dat += text("New Record

") - dat += text("\nPrint Record
\nBack
", src, src) + dat += "\nPrint Record
\nBack
" if(5.0) dat += "
Virus Database
" for(var/Dt in typesof(/datum/disease/)) @@ -111,7 +111,7 @@ else else - dat += text("{Log In}", src) + dat += "{Log In}" var/datum/browser/popup = new(user, "med_rec", name, 400, 400) popup.set_content(dat) popup.open(0) @@ -215,7 +215,7 @@
Severity: [Dis.severity]"} if(href_list["del_all"]) - src.temp = text("Are you sure you wish to delete all records?
\n\tYes
\n\tNo
", src, src) + src.temp = "Are you sure you wish to delete all records?
\n\tYes
\n\tNo
" if(href_list["del_all2"]) for(var/datum/data/record/R in data_core.medical) @@ -302,10 +302,10 @@ src.active2.fields["notes"] = t1 if("p_stat") if(istype(src.active1, /datum/data/record)) - src.temp = text("Physical Condition:
\n\t*Deceased*
\n\t*SSD*
\n\tActive
\n\tPhysically Unfit
\n\tDisabled
", src, src, src, src, src) + src.temp = "Physical Condition:
\n\t*Deceased*
\n\t*SSD*
\n\tActive
\n\tPhysically Unfit
\n\tDisabled
" if("m_stat") if(istype(src.active1, /datum/data/record)) - src.temp = text("Mental Condition:
\n\t*Insane*
\n\t*Unstable*
\n\t*Watch*
\n\tStable
", src, src, src, src) + src.temp = "Mental Condition:
\n\t*Insane*
\n\t*Unstable*
\n\t*Watch*
\n\tStable
" if("b_type") if(istype(src.active2, /datum/data/record)) src.temp = text("Blood Type:
\n\tA- A+
\n\tB- B+
\n\tAB- AB+
\n\tO- O+
", src, src, src, src, src, src, src, src) @@ -381,7 +381,7 @@ if(href_list["del_r"]) if(src.active2) - src.temp = text("Are you sure you wish to delete the record (Medical Portion Only)?
\n\tYes
\n\tNo
", src, src) + src.temp = "Are you sure you wish to delete the record (Medical Portion Only)?
\n\tYes
\n\tNo
" if(href_list["del_r2"]) if(src.active2) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index bf33b157706..80617ba53eb 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -92,7 +92,7 @@ dat += {"

"} - dat += text("New Record
", src) + dat += "New Record
" //search bar dat += {" @@ -154,8 +154,8 @@ var complete_list = maintable.innerHTML;
"} - dat += text("Record Maintenance

", src) - dat += text("{Log Out}",src) + dat += "Record Maintenance

" + dat += "{Log Out}" if(2.0) dat += "Records Maintenance
" dat += "
Delete All Records

Back" @@ -187,15 +187,15 @@ while(active2.fields[text("com_[]", counter)]) dat += text("[]
Delete Entry

", active2.fields[text("com_[]", counter)], src, counter) counter++ - dat += text("Add Entry

", src) - dat += text("Delete Record (Security Only)

", src) + dat += "Add Entry

" + dat += "Delete Record (Security Only)

" else dat += "Security Record Lost!
" - dat += text("New Security Record

", src) - dat += text("\nDelete Record (ALL)

\nPrint Record
\nBack
", src, src, src) + dat += "New Security Record

" + dat += "\nDelete Record (ALL)

\nPrint Record
\nBack
" else else - dat += text("{Log In}", src) + dat += "{Log In}" var/datum/browser/popup = new(user, "secure_rec", name, 600, 400) popup.set_content(dat) popup.add_head_content(head_content) diff --git a/code/game/machinery/computer/skills.dm b/code/game/machinery/computer/skills.dm index 32e54dc161b..98e7a93c316 100644 --- a/code/game/machinery/computer/skills.dm +++ b/code/game/machinery/computer/skills.dm @@ -55,8 +55,8 @@ if(1.0) dat += {"

"} - dat += text("Search Records
", src) - dat += text("New Record
", src) + dat += "Search Records
" + dat += "New Record
" dat += {"

@@ -80,8 +80,8 @@ dat += text("", R.fields["rank"]) dat += text("", R.fields["fingerprint"]) dat += "
[][]

" - dat += text("Record Maintenance

", src) - dat += text("{Log Out}",src) + dat += "Record Maintenance

" + dat += "{Log Out}" if(2.0) dat += "Records Maintenance
" dat += "
Delete All Records

Back" @@ -102,10 +102,10 @@ ") else dat += "General Record Lost!
" - dat += text("\nDelete Record (ALL)

\nPrint Record
\nBack
", src, src, src) + dat += "\nDelete Record (ALL)

\nPrint Record
\nBack
" if(4.0) if(!Perp.len) - dat += text("ERROR. String could not be located.

Back", src) + dat += "ERROR. String could not be located.

Back" else dat += {" @@ -135,10 +135,10 @@ dat += text("", R.fields["fingerprint"]) dat += text("", crimstat) dat += "
[][]
" - dat += text("
Return to index.", src) + dat += "
Return to index." else else - dat += text("{Log In}", src) + dat += "{Log In}" user << browse(text("Employment Records[]", dat), "window=secure_rec;size=600x400") onclose(user, "secure_rec") return diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm index f9377d23494..30e5cac609f 100644 --- a/code/game/machinery/doors/airlock_electronics.dm +++ b/code/game/machinery/doors/airlock_electronics.dm @@ -51,7 +51,7 @@ else t1 += "[aname]
" - t1 += text("

Close

\n", src) + t1 += "

Close

\n" var/datum/browser/popup = new(user, "airlock_electronics", name, 400, 400) popup.set_content(t1) diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index c0f48260305..7c8d14fe469 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -182,13 +182,13 @@ FIRE ALARM A = A.loc if(A.fire) - d1 = text("Reset - Lockdown", src) + d1 = "Reset - Lockdown" else - d1 = text("Alarm - Lockdown", src) + d1 = "Alarm - Lockdown" if(src.timing) - d2 = text("Stop Time Lock", src) + d2 = "Stop Time Lock" else - d2 = text("Initiate Time Lock", src) + d2 = "Initiate Time Lock" var/second = round(src.time) % 60 var/minute = (round(src.time) - second) / 60 var/dat = "Fire alarm [d1]\n
The current alert level is: [get_security_level()]

\nTimer System: [d2]
\nTime Left: [(minute ? "[minute]:" : null)][second] - - + +\n" @@ -350,13 +350,13 @@ Just a object used in constructing fire alarms if(istype(user, /mob/living/carbon/human) || istype(user, /mob/living/silicon/ai)) if(A.party) - d1 = text("No Party :(", src) + d1 = "No Party :(" else - d1 = text("PARTY!!!", src) + d1 = "PARTY!!!" if(timing) - d2 = text("Stop Time Lock", src) + d2 = "Stop Time Lock" else - d2 = text("Initiate Time Lock", src) + d2 = "Initiate Time Lock" var/second = time % 60 var/minute = (time - second) / 60 var/dat = text("Party Button []\n
\nTimer System: []
\nTime Left: [][] - - + +\n", d1, d2, (minute ? text("[]:", minute) : null), second, src, src, src, src) diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index f3415f6896d..6f9e00778df 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -138,7 +138,7 @@ dat+= "The panel is ridden with controls, button and meters, labeled in strange signs and symbols that
you cannot understand. Probably the manufactoring world's language.
Among other things, a few controls catch your eye.

" dat+= text("A small dial with a \"�\" symbol embroidded on it. It's pointing towards a gauge that reads [].
Turn towards []
",(src.issuperUV ? "15nm" : "185nm"),src,(src.issuperUV ? "185nm" : "15nm") ) dat+= text("A thick old-style button, with 2 grimy LED lights next to it. The [] LED is on.
Press button",(src.safetieson? "GREEN" : "RED"),src) - dat+= text("

Close panel", user) + dat+= "

Close panel" //user << browse(dat, "window=ssu_m_panel;size=400x500") //onclose(user, "ssu_m_panel") else if(src.isUV) //The thing is running its cauterisation cycle. You have to wait. @@ -153,13 +153,13 @@ dat+= "Welcome to the Unit control panel.
" dat+= text("Helmet storage compartment: []
",(src.HELMET ? HELMET.name : "No helmet detected.") ) if(HELMET && src.isopen) - dat+=text("Dispense helmet
",src) + dat+="Dispense helmet
" dat+= text("Suit storage compartment: []
",(src.SUIT ? SUIT.name : "No exosuit detected.") ) if(SUIT && src.isopen) - dat+=text("Dispense suit
",src) + dat+="Dispense suit
" dat+= text("Breathmask storage compartment: []
",(src.MASK ? MASK.name : "No breathmask detected.") ) if(MASK && src.isopen) - dat+=text("Dispense mask
",src) + dat+="Dispense mask
" if(src.OCCUPANT) dat+= "
WARNING: Biological entity detected inside the Unit's storage. Please remove.
" dat+= "Eject extra load" @@ -169,14 +169,14 @@ else dat+= text(" - *[] Unit*
",src,(src.islocked ? "Unlock" : "Lock") ) dat+= text("Unit status: []",(src.islocked? "**LOCKED**
" : "**UNLOCKED**
") ) - dat+= text("Start Disinfection cycle
",src) - dat += text("

Close control panel", user) + dat+= "Start Disinfection cycle
" + dat += "

Close control panel" //user << browse(dat, "window=Suit Storage Unit;size=400x500") //onclose(user, "Suit Storage Unit") else //Ohhhh shit it's dirty or broken! Let's inform the guy. dat+= "Suit storage unit" dat+= "Unit chamber is too contaminated to continue usage. Please call for a qualified individual to perform maintenance.

" - dat+= text("
Close control panel", user) + dat+= "
Close control panel" //user << browse(dat, "window=suit_storage_unit;size=400x500") //onclose(user, "suit_storage_unit") diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index da81b00683a..2ba5f04019d 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -113,7 +113,7 @@ return 0 var/second = time % 60 var/minute = (time - second) / 60 - var/dat = text("Proximity Sensor\n[] []:[]\n- - + +\n", (timing ? text("Arming", src) : text("Not Arming", src)), minute, second, src, src, src, src) + var/dat = text("Proximity Sensor\n[] []:[]\n- - + +\n", (timing ? "Arming" : "Not Arming"), minute, second, src, src, src, src) dat += "
[scanning?"Armed":"Unarmed"] (Movement sensor active when armed!)" dat += "

Refresh" dat += "

Close" diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index ca597bd1207..0ce52543909 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -52,7 +52,7 @@ /obj/item/device/assembly/signaler/interact(mob/user as mob, flag1) var/t1 = "-------" // if((src.b_stat && !( flag1 ))) -// t1 = text("-------
\nGreen Wire: []
\nRed Wire: []
\nBlue Wire: []
\n", (src.wires & 4 ? text("Cut Wire", src) : text("Mend Wire", src)), (src.wires & 2 ? text("Cut Wire", src) : text("Mend Wire", src)), (src.wires & 1 ? text("Cut Wire", src) : text("Mend Wire", src))) +// t1 = text("-------
\nGreen Wire: []
\nRed Wire: []
\nBlue Wire: []
\n", (src.wires & 4 ? "Cut Wire" : "Mend Wire"), (src.wires & 2 ? "Cut Wire" : "Mend Wire"), (src.wires & 1 ? "Cut Wire" : "Mend Wire")) // else // t1 = "-------" Speaker: [src.listening ? "Engaged" : "Disengaged"]
var/dat = {" diff --git a/code/modules/computer3/computers/medical.dm b/code/modules/computer3/computers/medical.dm index fcb1a2d2dd8..e7b0e7e3130 100644 --- a/code/modules/computer3/computers/medical.dm +++ b/code/modules/computer3/computers/medical.dm @@ -82,9 +82,9 @@ for(var/datum/data/record/R in sortRecord(data_core.general)) dat += text("[]: []
", src, R, R.fields["id"], R.fields["name"]) //Foreach goto(132) - dat += text("
Back", src) + dat += "
Back" if(3.0) - dat += text("Records Maintenance
\nBackup To Disk
\nUpload From disk
\nDelete All Records
\n
\nBack", src, src, src, src) + dat += "Records Maintenance
\nBackup To Disk
\nUpload From disk
\nDelete All Records
\n
\nBack" if(4.0) dat += "
Medical Record

" if((istype(src.active1, /datum/data/record) && data_core.general.Find(src.active1))) @@ -105,12 +105,12 @@ while(src.active2.fields[text("com_[]", counter)]) dat += text("[]
Delete Entry

", src.active2.fields[text("com_[]", counter)], src, counter) counter++ - dat += text("Add Entry

", src) - dat += text("Delete Record (Medical Only)

", src) + dat += "Add Entry

" + dat += "Delete Record (Medical Only)

" else dat += "Medical Record Lost!
" dat += text("New Record

") - dat += text("\nPrint Record
\nBack
", src, src) + dat += "\nPrint Record
\nBack
" if(5.0) dat += "
Virus Database
" for(var/Dt in typesof(/datum/disease/)) @@ -143,7 +143,7 @@ else else - dat += text("{Log In}", src) + dat += "{Log In}" popup.width = 600 popup.height = 400 popup.set_content(dat) @@ -239,7 +239,7 @@ src.temp += "
Details:
[v.fields["description"]]" if(href_list["del_all"]) - src.temp = text("Are you sure you wish to delete all records?
\n\tYes
\n\tNo
", src, src) + src.temp = "Are you sure you wish to delete all records?
\n\tYes
\n\tNo
" if(href_list["del_all2"]) for(var/datum/data/record/R in data_core.medical) @@ -326,10 +326,10 @@ src.active2.fields["notes"] = t1 if("p_stat") if(istype(src.active1, /datum/data/record)) - src.temp = text("Physical Condition:
\n\t*Deceased*
\n\t*SSD*
\n\tActive
\n\tPhysically Unfit
\n\tDisabled
", src, src, src, src, src) + src.temp = "Physical Condition:
\n\t*Deceased*
\n\t*SSD*
\n\tActive
\n\tPhysically Unfit
\n\tDisabled
" if("m_stat") if(istype(src.active1, /datum/data/record)) - src.temp = text("Mental Condition:
\n\t*Insane*
\n\t*Unstable*
\n\t*Watch*
\n\tStable
", src, src, src, src) + src.temp = "Mental Condition:
\n\t*Insane*
\n\t*Unstable*
\n\t*Watch*
\n\tStable
" if("b_type") if(istype(src.active2, /datum/data/record)) src.temp = text("Blood Type:
\n\tA- A+
\n\tB- B+
\n\tAB- AB+
\n\tO- O+
", src, src, src, src, src, src, src, src) @@ -405,7 +405,7 @@ if(href_list["del_r"]) if(src.active2) - src.temp = text("Are you sure you wish to delete the record (Medical Portion Only)?
\n\tYes
\n\tNo
", src, src) + src.temp = "Are you sure you wish to delete the record (Medical Portion Only)?
\n\tYes
\n\tNo
" if(href_list["del_r2"]) if(src.active2) diff --git a/code/modules/computer3/computers/scanconsole.dm b/code/modules/computer3/computers/scanconsole.dm index 9166953ccf6..747ca4b1a61 100644 --- a/code/modules/computer3/computers/scanconsole.dm +++ b/code/modules/computer3/computers/scanconsole.dm @@ -1118,13 +1118,13 @@ if("mainmenu") temp_html += "

Main Menu

" if(viable_occupant) //is there REALLY someone in there who can be modified? - temp_html += text("Modify Unique Identifier
", src) - temp_html += text("Modify Structural Enzymes

", src) + temp_html += "Modify Unique Identifier
" + temp_html += "Modify Structural Enzymes

" else temp_html += "Modify Unique Identifier
" temp_html += "Modify Structural Enzymes

" - temp_html += text("Radiation Emitter Settings

", src) - temp_html += text("Transfer Buffer

", src) + temp_html += "Radiation Emitter Settings

" + temp_html += "Transfer Buffer

" if("unimenu") if(!viable_occupant) @@ -1159,7 +1159,7 @@ temp_html = "<< Main Menu
" temp_html += "

Radiation Emitter Settings

" if(viable_occupant) - temp_html += text("Pulse Radiation", src) + temp_html += "Pulse Radiation" else temp_html += "Pulse Radiation" temp_html += "

Radiation Duration: - [radduration] +
" @@ -1175,12 +1175,12 @@ temp_html += text("Data: []
", buffer1) temp_html += text("By: []
", buffer1owner) temp_html += text("Label: []
", buffer1label) - if(viable_occupant) temp_html += text("Save : UI - UI+UE - SE
", src, src, src) - if(buffer1) temp_html += text("Transfer to: Occupant - Injector
", src, src) - //if(buffer1) temp_html += text("Isolate Block
", src) + if(viable_occupant) temp_html += "Save : UI - UI+UE - SE
" + if(buffer1) temp_html += "Transfer to: Occupant - Injector
" + //if(buffer1) temp_html += "Isolate Block
" if(buffer1) temp_html += "Disk: Save To | Load From
" - if(buffer1) temp_html += text("Edit Label
", src) - if(buffer1) temp_html += text("Clear Buffer

", src) + if(buffer1) temp_html += "Edit Label
" + if(buffer1) temp_html += "Clear Buffer

" if(!buffer1) temp_html += "
" temp_html += "

Buffer 2:

" if(!(buffer2)) @@ -1189,12 +1189,12 @@ temp_html += text("Data: []
", buffer2) temp_html += text("By: []
", buffer2owner) temp_html += text("Label: []
", buffer2label) - if(viable_occupant) temp_html += text("Save : UI - UI+UE - SE
", src, src, src) - if(buffer2) temp_html += text("Transfer to: Occupant - Injector
", src, src) - //if(buffer2) temp_html += text("Isolate Block
", src) + if(viable_occupant) temp_html += "Save : UI - UI+UE - SE
" + if(buffer2) temp_html += "Transfer to: Occupant - Injector
" + //if(buffer2) temp_html += "Isolate Block
" if(buffer2) temp_html += "Disk: Save To | Load From
" - if(buffer2) temp_html += text("Edit Label
", src) - if(buffer2) temp_html += text("Clear Buffer

", src) + if(buffer2) temp_html += "Edit Label
" + if(buffer2) temp_html += "Clear Buffer

" if(!buffer2) temp_html += "
" temp_html += "

Buffer 3:

" if(!(buffer3)) @@ -1203,12 +1203,12 @@ temp_html += text("Data: []
", buffer3) temp_html += text("By: []
", buffer3owner) temp_html += text("Label: []
", buffer3label) - if(viable_occupant) temp_html += text("Save : UI - UI+UE - SE
", src, src, src) - if(buffer3) temp_html += text("Transfer to: Occupant - Injector
", src, src) - //if(buffer3) temp_html += text("Isolate Block
", src) + if(viable_occupant) temp_html += "Save : UI - UI+UE - SE
" + if(buffer3) temp_html += "Transfer to: Occupant - Injector
" + //if(buffer3) temp_html += "Isolate Block
" if(buffer3) temp_html += "Disk: Save To | Load From
" - if(buffer3) temp_html += text("Edit Label
", src) - if(buffer3) temp_html += text("Clear Buffer

", src) + if(buffer3) temp_html += "Edit Label
" + if(buffer3) temp_html += "Clear Buffer

" if(!buffer3) temp_html += "
" temp_html += temp_footer_html @@ -1262,7 +1262,7 @@ dat += "Inject Rejuvenators
" if(!isnull(diskette)) - dat += text("Eject Disk
", src) + dat += "Eject Disk
" dat += "
" diff --git a/code/modules/computer3/computers/security.dm b/code/modules/computer3/computers/security.dm index c17998d4133..fa19f847a4c 100644 --- a/code/modules/computer3/computers/security.dm +++ b/code/modules/computer3/computers/security.dm @@ -75,8 +75,8 @@ if(1.0) dat += {"

"} - dat += text("Search Records
", src) - dat += text("New Record
", src) + dat += "Search Records
" + dat += "New Record
" dat += {"

@@ -119,8 +119,8 @@ dat += text("", R.fields["fingerprint"]) dat += text("", crimstat) dat += "
[][]
" - dat += text("Record Maintenance

", src) - dat += text("{Log Out}",src) + dat += "Record Maintenance

" + dat += "{Log Out}" if(2.0) dat += "Records Maintenance
" dat += "
Delete All Records

Back" @@ -146,15 +146,15 @@ while(active2.fields[text("com_[]", counter)]) dat += text("[]
Delete Entry

", active2.fields[text("com_[]", counter)], src, counter) counter++ - dat += text("Add Entry

", src) - dat += text("Delete Record (Security Only)

", src) + dat += "Add Entry

" + dat += "Delete Record (Security Only)

" else dat += "Security Record Lost!
" - dat += text("New Security Record

", src) - dat += text("\nDelete Record (ALL)

\nPrint Record
\nBack
", src, src, src) + dat += "New Security Record

" + dat += "\nDelete Record (ALL)

\nPrint Record
\nBack
" if(4.0) if(!Perp.len) - dat += text("ERROR. String could not be located.

Back", src) + dat += "ERROR. String could not be located.

Back" else dat += {" @@ -198,10 +198,10 @@ dat += text("", R.fields["fingerprint"]) dat += text("", crimstat) dat += "
[][]
" - dat += text("
Return to index.", src) + dat += "
Return to index." else else - dat += text("{Log In}", src) + dat += "{Log In}" popup.width = 600 popup.height = 400 popup.set_content(dat)