diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index dc65660366a..29004bc234d 100755 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -138,18 +138,18 @@ // current_filter_type = "ERROR - Report this bug to the admin, please!" // dat += {" - // Power: [use_power?"On":"Off"]
+ // Power: [use_power?"On":"Off"]
// Filtering: [current_filter_type]

//

Set Filter Type:

- // Phoron
- // Oxygen
- // Nitrogen
- // Carbon Dioxide
- // Nitrous Oxide
- // Nothing
+ // Phoron
+ // Oxygen
+ // Nitrogen
+ // Carbon Dioxide
+ // Nitrous Oxide
+ // Nothing
//
// Set Flow Rate Limit: - // [src.set_flow_rate]L/s | Change
+ // [src.set_flow_rate]L/s | Change
// Flow rate: [round(last_flow_rate, 0.1)]L/s // "} diff --git a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm index 86ee7517622..02b0127b320 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm @@ -106,25 +106,25 @@ // return // user.set_machine(src) // var/list/node_connects = get_node_connect_dirs() - // var/dat = {span_bold("Power: ") + "[use_power?"On":"Off"]
+ // var/dat = {span_bold("Power: ") + "[use_power?"On":"Off"]
// Set Flow Rate Limit: - // [set_flow_rate]L/s | Change + // [set_flow_rate]L/s | Change //
// Flow Rate: [round(last_flow_rate, 0.1)]L/s //

// Node 1 ([dir_name(node_connects[1],TRUE)]) Concentration: - // - - // - + // - + // - // [mixing_inputs[air1]]([mixing_inputs[air1]*100]%) - // + - // + + // + + // + //
// Node 2 ([dir_name(node_connects[2],TRUE)]) Concentration: - // - - // - + // - + // - // [mixing_inputs[air2]]([mixing_inputs[air2]*100]%) - // + - // + + // + + // + // "} // user << browse("[src.name] control[dat]", "window=atmo_mixer") diff --git a/code/ZAS/Variable Settings.dm b/code/ZAS/Variable Settings.dm index 8867060e6fc..1b097b776cf 100644 --- a/code/ZAS/Variable Settings.dm +++ b/code/ZAS/Variable Settings.dm @@ -110,7 +110,7 @@ var/global/vs_control/vsc = new vw = vars[ch] if("[ch]_DESC" in vars) vw_desc = vars["[ch]_DESC"] if("[ch]_NAME" in vars) vw_name = vars["[ch]_NAME"] - dat += span_bold("[vw_name] = [vw]") + " \[Change\]
" + dat += span_bold("[vw_name] = [vw]") + " \[Change\]
" dat += "[vw_desc]

" user << browse(dat,"window=settings") diff --git a/code/__defines/admin.dm b/code/__defines/admin.dm index 4895a51ae6c..e4934f522b2 100644 --- a/code/__defines/admin.dm +++ b/code/__defines/admin.dm @@ -48,26 +48,26 @@ #define SMITE_LIGHTNINGBOLT "Lightning Bolt" #define SMITE_TERROR "Terrify" -#define ADMIN_QUE(user) "(?)" -#define ADMIN_FLW(user) "(FLW)" -#define ADMIN_PP(user) "(PP)" -#define ADMIN_VV(atom) "(VV)" -#define ADMIN_SM(user) "(SM)" -#define ADMIN_TP(user) "(TP)" -#define ADMIN_BSA(user) "(BSA)" -#define ADMIN_KICK(user) "(KICK)" -#define ADMIN_CENTCOM_REPLY(user) "(RPLY)" -#define ADMIN_SYNDICATE_REPLY(user) "(RPLY)" -#define ADMIN_SC(user) "(SC)" -#define ADMIN_SMITE(user) "(SMITE)" +#define ADMIN_QUE(user) "(?)" +#define ADMIN_FLW(user) "(FLW)" +#define ADMIN_PP(user) "(PP)" +#define ADMIN_VV(atom) "(VV)" +#define ADMIN_SM(user) "(SM)" +#define ADMIN_TP(user) "(TP)" +#define ADMIN_BSA(user) "(BSA)" +#define ADMIN_KICK(user) "(KICK)" +#define ADMIN_CENTCOM_REPLY(user) "(RPLY)" +#define ADMIN_SYNDICATE_REPLY(user) "(RPLY)" +#define ADMIN_SC(user) "(SC)" +#define ADMIN_SMITE(user) "(SMITE)" #define ADMIN_LOOKUP(user) "[key_name_admin(user)][ADMIN_QUE(user)]" #define ADMIN_LOOKUPFLW(user) "[key_name_admin(user)][ADMIN_QUE(user)] [ADMIN_FLW(user)]" #define ADMIN_FULLMONTY_NONAME(user) "[ADMIN_QUE(user)] [ADMIN_PP(user)] [ADMIN_VV(user)] [ADMIN_SM(user)] [ADMIN_FLW(user)] [ADMIN_TP(user)]" #define ADMIN_FULLMONTY(user) "[key_name_admin(user)] [ADMIN_FULLMONTY_NONAME(user)]" -#define ADMIN_JMP(src) "(JMP)" +#define ADMIN_JMP(src) "(JMP)" #define COORD(src) "[src ? "([src.x],[src.y],[src.z])" : "nonexistent location"]" #define ADMIN_COORDJMP(src) "[src ? "[COORD(src)] [ADMIN_JMP(src)]" : "nonexistent location"]" -#define ADMIN_CA(user) "(?)" +#define ADMIN_CA(user) "(?)" #define AHELP_ACTIVE 1 #define AHELP_CLOSED 2 diff --git a/code/_helpers/logging.dm b/code/_helpers/logging.dm index d016b7111dc..05b6ff61582 100644 --- a/code/_helpers/logging.dm +++ b/code/_helpers/logging.dm @@ -228,7 +228,7 @@ if(key) if(include_link && C) - . += "" + . += "" if(C && C.holder && C.holder.fakekey) . += "Administrator" diff --git a/code/_helpers/unsorted.dm b/code/_helpers/unsorted.dm index 8b5c5d0325b..065576f9355 100644 --- a/code/_helpers/unsorted.dm +++ b/code/_helpers/unsorted.dm @@ -1199,7 +1199,7 @@ var/list/WALLITEMS = list( /proc/topic_link(var/datum/D, var/arglist, var/content) if(istype(arglist,/list)) arglist = list2params(arglist) - return "[content]" + return "[content]" /proc/get_random_colour(var/simple, var/lower=0, var/upper=255) var/colour @@ -1534,7 +1534,7 @@ GLOBAL_REAL_VAR(list/stack_trace_storage) // Note that object refs will be converted to text, as if \ref[thing] was done. To get the ref back on Topic() side, you will need to use locate(). // Third one is the text that will be clickable. /proc/href(href_src, list/href_params, href_text) - return "[href_text]" + return "[href_text]" // This is a helper for anything that wants to render the map in TGUI /proc/get_tgui_plane_masters() diff --git a/code/controllers/subsystems/inactivity.dm b/code/controllers/subsystems/inactivity.dm index bc7a5a7dde1..4708be526c0 100644 --- a/code/controllers/subsystems/inactivity.dm +++ b/code/controllers/subsystems/inactivity.dm @@ -46,7 +46,7 @@ SUBSYSTEM_DEF(inactivity) information = " while an AI." var/adminlinks - adminlinks = " (JMP|CRYO)" + adminlinks = " (JMP|CRYO)" log_and_message_admins("being kicked for AFK[information][adminlinks]", C.mob) diff --git a/code/controllers/subsystems/vote.dm b/code/controllers/subsystems/vote.dm index 19030913c84..112a2322c2b 100644 --- a/code/controllers/subsystems/vote.dm +++ b/code/controllers/subsystems/vote.dm @@ -253,7 +253,7 @@ SUBSYSTEM_DEF(vote) log_vote(text) - to_world(span_filter_system(span_purple(span_bold("[text]") + "\nType " + span_bold("vote") + " or click here to place your votes.\nYou have [config.vote_period / 10] seconds to vote."))) + to_world(span_filter_system(span_purple(span_bold("[text]") + "\nType " + span_bold("vote") + " or click here to place your votes.\nYou have [config.vote_period / 10] seconds to vote."))) if(vote_type == VOTE_CREW_TRANSFER || vote_type == VOTE_GAMEMODE || vote_type == VOTE_CUSTOM) world << sound('sound/ambience/alarm4.ogg', repeat = 0, wait = 0, volume = 50, channel = 3) @@ -292,55 +292,55 @@ SUBSYSTEM_DEF(vote) . += "" var/thisVote = (current_votes[C.ckey] == i) if(mode == VOTE_GAMEMODE) - . += "[thisVote ? "" : ""][gamemode_names[choices[i]]][thisVote ? "" : ""][votes]" + . += "[thisVote ? "" : ""][gamemode_names[choices[i]]][thisVote ? "" : ""][votes]" else - . += "[thisVote ? "" : ""][choices[i]][thisVote ? "" : ""][votes]" + . += "[thisVote ? "" : ""][choices[i]][thisVote ? "" : ""][votes]" if (additional_text.len >= i) . += additional_text[i] . += "" - . += "Unvote" + . += "Unvote" . += "
" if(admin) - . += "(Cancel Vote) " + . += "(Cancel Vote) " else . += "

Start a vote:



" - . += "Close" + . += "Close" /datum/controller/subsystem/vote/Topic(href, href_list[]) if(!usr || !usr.client) diff --git a/code/datums/browser.dm b/code/datums/browser.dm index 1c6cdaf4704..3b297a31529 100644 --- a/code/datums/browser.dm +++ b/code/datums/browser.dm @@ -202,13 +202,13 @@ var/output = {"
[Message]

- [Button1]"} + [Button1]"} if (Button2) - output += {"[Button2]"} + output += {"[Button2]"} if (Button3) - output += {"[Button3]"} + output += {"[Button3]"} output += {"
"} diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index be1b1236adb..49f267e2960 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -45,7 +45,7 @@ var/prompt = tgui_alert(usr, "Do you want to grant [C] access to view this VV window? (they will not be able to edit or change anysrc nor open nested vv windows unless they themselves are an admin)", "Confirm", list("Yes", "No")) if (prompt != "Yes" || !usr.client) return - message_admins("[key_name_admin(usr)] Showed [key_name_admin(C)] a VV window") + message_admins("[key_name_admin(usr)] Showed [key_name_admin(C)] a VV window") log_admin("Admin [key_name(usr)] Showed [key_name(C)] a VV window of a [src]") to_chat(C, "[usr.client.holder.fakekey ? "an Administrator" : "[usr.client.key]"] has granted you access to view a View Variables window") C.debug_variables(src) diff --git a/code/datums/managed_browsers/changelingevolution.dm b/code/datums/managed_browsers/changelingevolution.dm index a58b2552400..635b9dd9b54 100644 --- a/code/datums/managed_browsers/changelingevolution.dm +++ b/code/datums/managed_browsers/changelingevolution.dm @@ -27,14 +27,14 @@ dat += "
Genetic Points Available: [geneticpoints_current] / [geneticpoints_max]
" dat += "Obtain more by feeding on your own kind.

" - dat += "What am I?

" - dat += "Inherent" - dat += "Armor" - dat += "Weapons" - dat += "Stings" - dat += "Shrieks" - dat += "Health" - dat += "Enhancements
" + dat += "What am I?

" + dat += "Inherent" + dat += "Armor" + dat += "Weapons" + dat += "Stings" + dat += "Shrieks" + dat += "Health" + dat += "Enhancements" if(textbody) dat += "" dat += "[textbody]" @@ -162,6 +162,6 @@ textbody += "
This ability is already evolved!
" else if(cat != "Inherent") textbody += "
Cost: [powerdata.genomecost]
" - textbody += "
Evolve
" + textbody += "
Evolve
" textbody += "" display() diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 17b39256456..78a75a7114e 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -133,7 +133,7 @@ var/out = span_bold("[name]") + "[(current&&(current.real_name!=name))?" (as [current.real_name])":""]
" out += "Mind currently owned by key: [key] [active?"(synced)":"(not synced)"]
" - out += "Assigned role: [assigned_role]. Edit
" + out += "Assigned role: [assigned_role]. Edit
" out += "
" out += "Factions and special roles:
" for(var/antag_type in all_antag_types) @@ -150,15 +150,15 @@ out += "([span_green("complete")])" else out += "([span_red("incomplete")])" - out += " \[toggle\]" - out += " \[remove\]
" + out += " \[toggle\]" + out += " \[remove\]
" num++ - out += "
\[announce objectives\]" + out += "
\[announce objectives\]" else out += "None." - out += "
\[add\]

" - out += span_bold("Ambitions:") + " [ambitions ? ambitions : "None"] \[edit\]
" + out += "
\[add\]

" + out += span_bold("Ambitions:") + " [ambitions ? ambitions : "None"] \[edit\]
" usr << browse(out, "window=edit_memory[src]") /datum/mind/Topic(href, href_list) diff --git a/code/game/antagonist/alien/borer.dm b/code/game/antagonist/alien/borer.dm index c36cd16d314..8156a792d68 100644 --- a/code/game/antagonist/alien/borer.dm +++ b/code/game/antagonist/alien/borer.dm @@ -30,7 +30,7 @@ var/datum/antagonist/borer/borers borers = src /datum/antagonist/xenos/borer/get_extra_panel_options(var/datum/mind/player) - return "\[put in host\]" + return "\[put in host\]" /datum/antagonist/borer/create_objectives(var/datum/mind/player) if(!..()) diff --git a/code/game/antagonist/antagonist_panel.dm b/code/game/antagonist/antagonist_panel.dm index 8fa2d060f03..60925b9d9b6 100644 --- a/code/game/antagonist/antagonist_panel.dm +++ b/code/game/antagonist/antagonist_panel.dm @@ -3,13 +3,13 @@ var/dat = "" return dat @@ -27,11 +27,11 @@ var/mob/M = player.current dat += "" if(M) - dat += "" - dat += "" + dat += "" else dat += "" dat += "" @@ -45,7 +45,7 @@ while(!istype(disk_loc, /turf)) if(istype(disk_loc, /mob)) var/mob/M = disk_loc - dat += "carried by [M.real_name] " + dat += "carried by [M.real_name] " if(istype(disk_loc, /obj)) var/obj/O = disk_loc dat += "in \a [O.name] " diff --git a/code/game/antagonist/station/traitor.dm b/code/game/antagonist/station/traitor.dm index e517ec8e38b..898e71fd463 100644 --- a/code/game/antagonist/station/traitor.dm +++ b/code/game/antagonist/station/traitor.dm @@ -19,7 +19,7 @@ var/datum/antagonist/traitor/traitors traitors = src /datum/antagonist/traitor/get_extra_panel_options(var/datum/mind/player) - return "\[set crystals\]\[spawn uplink\]" + return "\[set crystals\]\[spawn uplink\]" /datum/antagonist/traitor/Topic(href, href_list) if (..()) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index e428aae3a7e..80580031d68 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -647,13 +647,13 @@ . = ..() var/custom_edit_name if(!isliving(src)) - custom_edit_name = "[src]" + custom_edit_name = "[src]" . += {" [custom_edit_name]
- << - [dir2text(dir)] - >> + << + [dir2text(dir)] + >> "} var/turf/T = get_turf(src) diff --git a/code/game/gamemodes/changeling/modularchangling.dm b/code/game/gamemodes/changeling/modularchangling.dm index 5563d4f01bb..84d5294575c 100644 --- a/code/game/gamemodes/changeling/modularchangling.dm +++ b/code/game/gamemodes/changeling/modularchangling.dm @@ -113,7 +113,7 @@ var/list/datum/power/changeling/powerinstances = list() if(!ownsthis) { - body += "Evolve" + body += "Evolve" } body += "" @@ -75,7 +75,7 @@ var/list/trait_categories = list() // The categories available for the trait men style_class = "linkOff" else if(ticked) style_class = "linkOn" - . += "" + . += "" // . += "" var/invalidity = T.test_for_invalidity(src) @@ -91,7 +91,7 @@ var/list/trait_categories = list() // The categories available for the trait men // if(ticked) // . += "" . += "
[role_text]:" var/extra = get_extra_panel_options(player) if(is_antagonist(player)) - dat += "\[-\]" - dat += "\[equip\]" + dat += "\[-\]" + dat += "\[equip\]" if(starting_locations && starting_locations.len) - dat += "\[move to spawn\]" + dat += "\[move to spawn\]" if(extra) dat += "[extra]" else - dat += "\[+\]" + dat += "\[+\]" dat += "
[M.real_name]/([player.key])" + dat += "[M.real_name]/([player.key])" if(!M.client) dat += " (logged out)" if(M.stat == DEAD) dat += " (DEAD)" dat += "\[PP]\[PM\]\[TP\]\[PP]\[PM\]\[TP\][player.key] Mob not found!
"; @@ -357,4 +357,3 @@ var/list/datum/power/changeling/powerinstances = list() call(M.current, Thepower.verbpath)() else if(remake_verbs) M.current.make_changeling() - diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm index 9b5c9968a62..2401cbde097 100644 --- a/code/game/gamemodes/cult/talisman.dm +++ b/code/game/gamemodes/cult/talisman.dm @@ -63,15 +63,15 @@ var/dat = span_bold("There are [src.uses] bloody runes on the parchment.") + "
" dat += "Please choose the chant to be imbued into the fabric of reality.
" dat += "
" - dat += "N'ath reth sh'yro eth d'raggathnor! - Allows you to summon a new arcane tome.
" - dat += "Sas'so c'arta forbici! - Allows you to move to a rune with the same last word.
" - dat += "Ta'gh fara'qha fel d'amar det! - Allows you to destroy technology in a short range.
" - dat += "Kla'atu barada nikt'o! - Allows you to conceal the runes you placed on the floor.
" - dat += "O bidai nabora se'sma! - Allows you to coordinate with others of your cult.
" - dat += "Fuu ma'jin - Allows you to stun a person by attacking them with the talisman.
" - dat += "Sa tatha najin - Allows you to summon armoured robes and an unholy blade
" - dat += "Kal om neth - Summons a soul stone
" - dat += "Da A'ig Osk - Summons a construct shell for use with captured souls. It is too large to carry on your person.
" + dat += "N'ath reth sh'yro eth d'raggathnor! - Allows you to summon a new arcane tome.
" + dat += "Sas'so c'arta forbici! - Allows you to move to a rune with the same last word.
" + dat += "Ta'gh fara'qha fel d'amar det! - Allows you to destroy technology in a short range.
" + dat += "Kla'atu barada nikt'o! - Allows you to conceal the runes you placed on the floor.
" + dat += "O bidai nabora se'sma! - Allows you to coordinate with others of your cult.
" + dat += "Fuu ma'jin - Allows you to stun a person by attacking them with the talisman.
" + dat += "Sa tatha najin - Allows you to summon armoured robes and an unholy blade
" + dat += "Kal om neth - Summons a soul stone
" + dat += "Da A'ig Osk - Summons a construct shell for use with captured souls. It is too large to carry on your person.
" usr << browse(dat, "window=id_com;size=350x200") return diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index cf1fc43839f..afbe5c334d9 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -80,8 +80,8 @@ if(locked && (!istype(user, /mob/living/silicon))) t += "(Swipe ID card to unlock control panel.)
" else - t += text("Dispenser [] - []?
\n", disabled?"deactivated":"activated", src, disabled?"Enable":"Disable") - t += text("Uses Left: [uses]. Activate the dispenser?
\n") + t += text("Dispenser [] - []?
\n", disabled?"deactivated":"activated", src, disabled?"Enable":"Disable") + t += text("Uses Left: [uses]. Activate the dispenser?
\n") user << browse(t, "window=computer;size=575x450") onclose(user, "computer") diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index 9bc753b59e9..58d78574a8a 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -118,23 +118,23 @@ if(connected) var/d2 if(timing) //door controls do not need timers. - d2 = "Stop Time Launch" + d2 = "Stop Time Launch" else - d2 = "Initiate Time Launch" + d2 = "Initiate Time Launch" var/second = time % 60 var/minute = (time - second) / 60 - dat += "
\nTimer System: [d2]\nTime Left: [minute ? "[minute]:" : null][second] - - + +" + dat += "
\nTimer System: [d2]\nTime Left: [minute ? "[minute]:" : null][second] - - + +" var/temp = "" var/list/L = list( 0.25, 0.5, 1, 2, 4, 8, 16 ) for(var/t in L) if(t == connected.power) temp += "[t] " else - temp += "[t] " - dat += "
\nPower Level: [temp]
\nFiring Sequence
\nTest Fire Driver
\nToggle Outer Door
" + temp += "[t] " + dat += "
\nPower Level: [temp]
\nFiring Sequence
\nTest Fire Driver
\nToggle Outer Door
" else - dat += "
\nToggle Outer Door
" - dat += "

Close" + dat += "
\nToggle Outer Door
" + dat += "

Close" user << browse(dat, "window=computer;size=400x500") add_fingerprint(user) onclose(user, "computer") diff --git a/code/game/machinery/computer/prisonshuttle.dm b/code/game/machinery/computer/prisonshuttle.dm index 201768f3600..4099a8f9fd1 100644 --- a/code/game/machinery/computer/prisonshuttle.dm +++ b/code/game/machinery/computer/prisonshuttle.dm @@ -43,8 +43,8 @@ var/prison_shuttle_timeleft = 0 else dat += {"
Prison Shuttle
\nLocation: [prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison ? "Moving to station ([prison_shuttle_timeleft] Secs.)":prison_shuttle_at_station ? "Station":"Dock"]
- [prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison ? "\n*Shuttle already called*
\n
":prison_shuttle_at_station ? "\nSend to Dock
\n
":"\nSend to station
\n
"] - \nClose"} + [prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison ? "\n*Shuttle already called*
\n
":prison_shuttle_at_station ? "\nSend to Dock
\n
":"\nSend to station
\n
"] + \nClose"} user << browse(dat, "window=computer;size=575x450") onclose(user, "computer") @@ -65,7 +65,7 @@ var/prison_shuttle_timeleft = 0 if(!prison_shuttle_at_station|| prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return post_signal("prison") to_chat(usr, span_notice("The prison shuttle has been called and will arrive in [(PRISON_MOVETIME/10)] seconds.")) - src.temp += "Shuttle sent.

OK" + src.temp += "Shuttle sent.

OK" src.updateUsrDialog() prison_shuttle_moving_to_prison = 1 prison_shuttle_time = world.timeofday + PRISON_MOVETIME @@ -79,7 +79,7 @@ var/prison_shuttle_timeleft = 0 if(prison_shuttle_at_station || prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return post_signal("prison") to_chat(usr, span_notice("The prison shuttle has been called and will arrive in [(PRISON_MOVETIME/10)] seconds.")) - src.temp += "Shuttle sent.

OK" + src.temp += "Shuttle sent.

OK" src.updateUsrDialog() prison_shuttle_moving_to_station = 1 prison_shuttle_time = world.timeofday + PRISON_MOVETIME diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index 9f16d3d057b..14d342031ad 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -215,7 +215,7 @@ R.SetLockdown(!R.lockcharge) to_chat(R, "[!R.lockcharge ? span_notice("Your lockdown has been lifted!") : span_alert("You have been locked down!")]") if(R.connected_ai) - to_chat(R.connected_ai, "[!R.lockcharge ? span_notice("NOTICE - Cyborg lockdown lifted") : span_alert("ALERT - Cyborg lockdown detected")]: [R.name]
") + to_chat(R.connected_ai, "[!R.lockcharge ? span_notice("NOTICE - Cyborg lockdown lifted") : span_alert("ALERT - Cyborg lockdown detected")]: [R.name]
") . = TRUE if("hackbot") // AIs hacking/emagging a borg var/mob/living/silicon/robot/R = locate(params["ref"]) diff --git a/code/game/machinery/computer/specops_shuttle.dm b/code/game/machinery/computer/specops_shuttle.dm index cdd30db5e28..44468522632 100644 --- a/code/game/machinery/computer/specops_shuttle.dm +++ b/code/game/machinery/computer/specops_shuttle.dm @@ -267,8 +267,8 @@ var/specops_shuttle_timeleft = 0 else dat += {"
Special Operations Shuttle
\nLocation: [specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom ? "Departing for [station_name()] in ([specops_shuttle_timeleft] seconds.)":specops_shuttle_at_station ? "Station":"Dock"]
- [specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom ? "\n*The Special Ops. shuttle is already leaving.*
\n
":specops_shuttle_at_station ? "\nShuttle standing by...
\n
":"\nDepart to [station_name()]
\n
"] - \nClose"} + [specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom ? "\n*The Special Ops. shuttle is already leaving.*
\n
":specops_shuttle_at_station ? "\nShuttle standing by...
\n
":"\nDepart to [station_name()]
\n
"] + \nClose"} user << browse(dat, "window=computer;size=575x450") onclose(user, "computer") @@ -294,7 +294,7 @@ var/specops_shuttle_timeleft = 0 to_chat(usr, span_notice("The Special Operations shuttle will arrive at [using_map.boss_name] in [(SPECOPS_MOVETIME/10)] seconds.")) - temp += "Shuttle departing.

OK" + temp += "Shuttle departing.

OK" updateUsrDialog() specops_shuttle_moving_to_centcom = 1 @@ -311,7 +311,7 @@ var/specops_shuttle_timeleft = 0 to_chat(usr, span_notice("The Special Operations shuttle will arrive on [station_name()] in [(SPECOPS_MOVETIME/10)] seconds.")) - temp += "Shuttle departing.

OK" + temp += "Shuttle departing.

OK" updateUsrDialog() var/area/centcom/specops/special_ops = locate() diff --git a/code/game/machinery/computer3/computers/card.dm b/code/game/machinery/computer3/computers/card.dm index a9776bc79b0..9323b37706f 100644 --- a/code/game/machinery/computer3/computers/card.dm +++ b/code/game/machinery/computer3/computers/card.dm @@ -36,8 +36,8 @@ jobs_all += "" jobs_all += ""//Site Manager in special because he is head of heads ~Intercross21 - jobs_all += "" - jobs_all += "" + jobs_all += "" + jobs_all += "" counter = 0 jobs_all += ""//Red @@ -46,7 +46,7 @@ if(counter >= 6) jobs_all += "" counter = 0 - jobs_all += "" + jobs_all += "" counter = 0 jobs_all += ""//Orange @@ -55,7 +55,7 @@ if(counter >= 6) jobs_all += "" counter = 0 - jobs_all += "" + jobs_all += "" counter = 0 jobs_all += ""//Green @@ -64,7 +64,7 @@ if(counter >= 6) jobs_all += "" counter = 0 - jobs_all += "" + jobs_all += "" counter = 0 jobs_all += ""//Purple @@ -73,7 +73,7 @@ if(counter >= 6) jobs_all += "" counter = 0 - jobs_all += "" + jobs_all += "" counter = 0 jobs_all += ""//Grey @@ -82,7 +82,7 @@ if(counter >= 6) jobs_all += "" counter = 0 - jobs_all += "" + jobs_all += "" dat = {""}, "window=asset_cache_browser&file=asset_cache_send_verify.htm") + src << browse({""}, "window=asset_cache_browser&file=asset_cache_send_verify.htm") while(!completed_asset_jobs["[job]"] && t < timeout_time) // Reception is handled in Topic() stoplag(1) // Lock up the caller until this is received. diff --git a/code/modules/catalogue/cataloguer.dm b/code/modules/catalogue/cataloguer.dm index 2ea1045dca7..c4c803bdbbb 100644 --- a/code/modules/catalogue/cataloguer.dm +++ b/code/modules/catalogue/cataloguer.dm @@ -247,15 +247,15 @@ GLOBAL_LIST_EMPTY(all_cataloguers) // Important buttons go on top since the scrollbar will default to the top of the window. dat += "Contains [points_stored] Exploration Points." - dat += "\[Highlight Scannables\]\[Refresh\]\[Close\]" + dat += "\[Highlight Scannables\]\[Refresh\]\[Close\]" // If displayed_data exists, we show that, otherwise we show a list of all data in the mysterious global list. if(displayed_data) title = uppertext(displayed_data.name) - dat += "\[Back to List\]" + dat += "\[Back to List\]" if(debug && !displayed_data.visible) - dat += "\[(DEBUG) Force Discovery\]" + dat += "\[(DEBUG) Force Discovery\]" dat += "
" dat += span_italics("[displayed_data.desc]") @@ -274,7 +274,7 @@ GLOBAL_LIST_EMPTY(all_cataloguers) group_dat += span_bold("[group.name]") for(var/datum/category_item/catalogue/item as anything in group.items) if(item.visible || debug) - group_dat += "[item.name]" + group_dat += "[item.name]" show_group = TRUE if(show_group || debug) // Avoid showing 'empty' groups on regular cataloguers. diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index 39099159b4a..bf75522f0f0 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -712,7 +712,7 @@ /client/proc/check_panel_loaded() if(stat_panel && stat_panel.is_ready()) return - to_chat(src, span_danger("Statpanel failed to load, click here to reload the panel. If this does not work, reconnecting will reassign a new panel.")) + to_chat(src, span_danger("Statpanel failed to load, click here to reload the panel. If this does not work, reconnecting will reassign a new panel.")) /** * Handles incoming messages from the stat-panel TGUI. diff --git a/code/modules/client/preference_setup/antagonism/01_basic.dm b/code/modules/client/preference_setup/antagonism/01_basic.dm index 438692e1735..7a5701fef52 100644 --- a/code/modules/client/preference_setup/antagonism/01_basic.dm +++ b/code/modules/client/preference_setup/antagonism/01_basic.dm @@ -28,15 +28,15 @@ var/global/list/uplink_locations = list("PDA", "Headset", "None") character.antag_vis = pref.antag_vis /datum/category_item/player_setup_item/antagonism/basic/content(var/mob/user) - . += "Faction: [pref.antag_faction]
" - . += "Visibility: [pref.antag_vis]
" - . +=span_bold("Uplink Type : [pref.uplinklocation]") + . += "Faction: [pref.antag_faction]
" + . += "Visibility: [pref.antag_vis]
" + . +=span_bold("Uplink Type : [pref.uplinklocation]") . +="
" . +=span_bold("Exploitable information:") + "
" if(jobban_isbanned(user, "Records")) . += span_bold("You are banned from using character records.") + "
" else - . +="[TextPreview(pref.exploit_record,40)]
" + . +="[TextPreview(pref.exploit_record,40)]
" /datum/category_item/player_setup_item/antagonism/basic/OnTopic(var/href,var/list/href_list, var/mob/user) if (href_list["antagtask"]) diff --git a/code/modules/client/preference_setup/antagonism/02_candidacy.dm b/code/modules/client/preference_setup/antagonism/02_candidacy.dm index 5c1c58fc72f..f7b4b88a114 100644 --- a/code/modules/client/preference_setup/antagonism/02_candidacy.dm +++ b/code/modules/client/preference_setup/antagonism/02_candidacy.dm @@ -52,7 +52,7 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set if(jobban_isbanned(user, i) || (i == "positronic brain" && jobban_isbanned(user, JOB_AI) && jobban_isbanned(user, JOB_CYBORG)) || (i == "pAI candidate" && jobban_isbanned(user, JOB_PAI))) . += span_bold("Be [i]:") + " \[BANNED]
" else - . += span_bold("Be [i]:") + " " + span_bold("[pref.be_special&(1<
" + . += span_bold("Be [i]:") + "
" + span_bold("[pref.be_special&(1<
" n++ /datum/category_item/player_setup_item/antagonism/candidacy/OnTopic(var/href,var/list/href_list, var/mob/user) diff --git a/code/modules/client/preference_setup/general/01_basic.dm b/code/modules/client/preference_setup/general/01_basic.dm index ac56b2b005b..173c6de2a61 100644 --- a/code/modules/client/preference_setup/general/01_basic.dm +++ b/code/modules/client/preference_setup/general/01_basic.dm @@ -82,19 +82,19 @@ /datum/category_item/player_setup_item/general/basic/content() . = list() . += span_bold("Name:") + " " - . += "
[pref.real_name]
" - . += "Randomize Name
" - . += "Always Random Name: [pref.be_random_name ? "Yes" : "No"]
" + . += "[pref.real_name]
" + . += "Randomize Name
" + . += "Always Random Name: [pref.be_random_name ? "Yes" : "No"]
" . += span_bold("Nickname:") + " " - . += "[pref.nickname]" - . += "(Clear)" + . += "[pref.nickname]" + . += "(Clear)" . += "
" - . += span_bold("Biological Sex:") + " [gender2text(pref.biological_gender)]
" - . += span_bold("Pronouns:") + " [gender2text(pref.identifying_gender)]
" - . += span_bold("Age:") + " [pref.age]Birthday:[pref.bday_month]/[pref.bday_day] - Announce?:[pref.bday_announce ? "Yes" : "No"]
" - . += span_bold("Spawn Point") + ": [pref.spawnpoint]
" + . += span_bold("Biological Sex:") + " [gender2text(pref.biological_gender)]
" + . += span_bold("Pronouns:") + " [gender2text(pref.identifying_gender)]
" + . += span_bold("Age:") + " [pref.age]Birthday:[pref.bday_month]/[pref.bday_day] - Announce?:[pref.bday_announce ? "Yes" : "No"]
" + . += span_bold("Spawn Point") + ": [pref.spawnpoint]
" if(CONFIG_GET(flag/allow_metadata)) - . += span_bold("OOC Notes: EditLikesDislikes") + "
" + . += span_bold("OOC Notes: EditLikesDislikes") + "
" . = jointext(.,null) /datum/category_item/player_setup_item/general/basic/OnTopic(var/href,var/list/href_list, var/mob/user) diff --git a/code/modules/client/preference_setup/general/02_language.dm b/code/modules/client/preference_setup/general/02_language.dm index 06a7fc6f260..d796ba9ca29 100644 --- a/code/modules/client/preference_setup/general/02_language.dm +++ b/code/modules/client/preference_setup/general/02_language.dm @@ -75,24 +75,24 @@ testing("LANGSANI: Truncated [pref.client]'s character [pref.real_name || "-name not yet loaded-"] language list because it was too long (len: [pref.alternate_languages.len], allowed: [S.num_alternate_languages])") pref.alternate_languages.len = (S.num_alternate_languages + pref.extra_languages) // Truncate to allowed length if(S.language) - . += "- [S.language] - Set Custom Key
" + . += "- [S.language] - Set Custom Key
" if(S.default_language && S.default_language != S.language) - . += "- [S.default_language] - Set Custom Key
" + . += "- [S.default_language] - Set Custom Key
" if(S.num_alternate_languages + pref.extra_languages) if(pref.alternate_languages.len) for(var/i = 1 to pref.alternate_languages.len) var/lang = pref.alternate_languages[i] - . += "- [lang] - remove - Set Custom Key
" + . += "- [lang] - remove - Set Custom Key
" if(pref.alternate_languages.len < (S.num_alternate_languages + pref.extra_languages)) - . += "- add ([(S.num_alternate_languages + pref.extra_languages) - pref.alternate_languages.len] remaining)
" + . += "- add ([(S.num_alternate_languages + pref.extra_languages) - pref.alternate_languages.len] remaining)
" else . += "- [pref.species] cannot choose secondary languages.
" . += span_bold("Language Keys") + "
" - . += " [jointext(pref.language_prefixes, " ")] ChangeReset
" - . += span_bold("Preferred Language") + " [pref.preferred_language]
" // VOREStation Add - . += span_bold("Runechat Color") + " Change Runechat Color [color_square(hex = pref.runechat_color)]" + . += " [jointext(pref.language_prefixes, " ")] ChangeReset
" + . += span_bold("Preferred Language") + " [pref.preferred_language]
" // VOREStation Add + . += span_bold("Runechat Color") + " Change Runechat Color [color_square(hex = pref.runechat_color)]" /datum/category_item/player_setup_item/general/language/OnTopic(var/href,var/list/href_list, var/mob/user) if(href_list["remove_language"]) diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm index abdecba39f8..c0128fccbad 100644 --- a/code/modules/client/preference_setup/general/03_body.dm +++ b/code/modules/client/preference_setup/general/03_body.dm @@ -480,15 +480,15 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O var/datum/species/mob_species = GLOB.all_species[pref.species] . += "
Command
Special"+JOB_SITE_MANAGER+"Custom"+JOB_SITE_MANAGER+"Custom
Security
[replacetext(job, " ", " ")][replacetext(job, " ", " ")]
Engineering
[replacetext(job, " ", " ")][replacetext(job, " ", " ")]
Medical
[replacetext(job, " ", " ")][replacetext(job, " ", " ")]
Science
[replacetext(job, " ", " ")][replacetext(job, " ", " ")]
Civilian
[replacetext(job, " ", " ")][replacetext(job, " ", " ")]
Body " - . += "(®)" + . += "(®)" . += "
" - . += "Species: [pref.species]
" - . += "Blood Type: [pref.b_type]
" + . += "Species: [pref.species]
" + . += "Blood Type: [pref.b_type]
" if(has_flag(mob_species, HAS_SKIN_TONE)) - . += "Skin Tone: [-pref.s_tone + 35]/220
" - . += "Needs Glasses: [pref.disabilities & NEARSIGHTED ? "Yes" : "No"]
" - . += "Limbs: Adjust Reset
" - . += "Internal Organs: Adjust
" + . += "Skin Tone: [-pref.s_tone + 35]/220
" + . += "Needs Glasses: [pref.disabilities & NEARSIGHTED ? "Yes" : "No"]
" + . += "Limbs: Adjust Reset
" + . += "Internal Organs: Adjust
" //display limbs below var/ind = 0 @@ -601,40 +601,40 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O . += "" for(var/entry in pref.body_descriptors) var/datum/mob_descriptor/descriptor = mob_species.descriptors[entry] - . += "" + . += "" . += "
[capitalize(descriptor.chargen_label)]:[descriptor.get_standalone_value_descriptor(pref.body_descriptors[entry])]Change
[capitalize(descriptor.chargen_label)]:[descriptor.get_standalone_value_descriptor(pref.body_descriptors[entry])]Change

" . += "
Preview
" - . += "
Cycle background" - . += "
[pref.equip_preview_mob & EQUIP_PREVIEW_LOADOUT ? "Hide loadout" : "Show loadout"]" - . += "
[pref.equip_preview_mob & EQUIP_PREVIEW_JOB ? "Hide job gear" : "Show job gear"]" - . += "
[pref.animations_toggle ? "Stop animations" : "Show animations"]" + . += "
Cycle background" + . += "
[pref.equip_preview_mob & EQUIP_PREVIEW_LOADOUT ? "Hide loadout" : "Show loadout"]" + . += "
[pref.equip_preview_mob & EQUIP_PREVIEW_JOB ? "Hide job gear" : "Show job gear"]" + . += "
[pref.animations_toggle ? "Stop animations" : "Show animations"]" . += "
" . += span_bold("Hair") + "
" if(has_flag(mob_species, HAS_HAIR_COLOR)) - . += "Change Color [color_square(pref.r_hair, pref.g_hair, pref.b_hair)] " - . += " Style: < > [pref.h_style]
" //The < & > in this line is correct-- those extra characters are the arrows you click to switch between styles. + . += "Change Color [color_square(pref.r_hair, pref.g_hair, pref.b_hair)] " + . += " Style: < > [pref.h_style]
" //The < & > in this line is correct-- those extra characters are the arrows you click to switch between styles. . += span_bold("Gradient") + "
" - . += "Change Color [color_square(pref.r_grad, pref.g_grad, pref.b_grad)] " - . += " Style: < > [pref.grad_style]
" + . += "Change Color [color_square(pref.r_grad, pref.g_grad, pref.b_grad)] " + . += " Style: < > [pref.grad_style]
" . += "
Facial
" if(has_flag(mob_species, HAS_HAIR_COLOR)) - . += "Change Color [color_square(pref.r_facial, pref.g_facial, pref.b_facial)] " - . += " Style: < > [pref.f_style]
" //Same as above with the extra > & < characters + . += "Change Color [color_square(pref.r_facial, pref.g_facial, pref.b_facial)] " + . += " Style: < > [pref.f_style]
" //Same as above with the extra > & < characters if(has_flag(mob_species, HAS_EYE_COLOR)) . += "
Eyes
" - . += "Change Color [color_square(pref.r_eyes, pref.g_eyes, pref.b_eyes)]
" + . += "Change Color [color_square(pref.r_eyes, pref.g_eyes, pref.b_eyes)]
" if(has_flag(mob_species, HAS_SKIN_COLOR)) . += "
Body Color
" - . += "Change Color [color_square(pref.r_skin, pref.g_skin, pref.b_skin)]
" + . += "Change Color [color_square(pref.r_skin, pref.g_skin, pref.b_skin)]
" if(mob_species.digi_allowed) - . += "
Digitigrade?: [pref.digitigrade ? "Yes" : "No"]
" + . += "
Digitigrade?: [pref.digitigrade ? "Yes" : "No"]
" . += "

Genetics Settings

" @@ -642,64 +642,64 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O var/datum/sprite_accessory/ears/ear = ear_styles[pref.ear_style] . += span_bold("Ears") + "
" if(istype(ear)) - . += " Style: [ear.name]
" + . += " Style: [ear.name]
" if(ear.do_colouration) - . += "Change Color [color_square(pref.r_ears, pref.g_ears, pref.b_ears)]
" + . += "Change Color [color_square(pref.r_ears, pref.g_ears, pref.b_ears)]
" if(ear.extra_overlay) - . += "Change Secondary Color [color_square(pref.r_ears2, pref.g_ears2, pref.b_ears2)]
" + . += "Change Secondary Color [color_square(pref.r_ears2, pref.g_ears2, pref.b_ears2)]
" if(ear.extra_overlay2) - . += "Change Tertiary Color [color_square(pref.r_ears3, pref.g_ears3, pref.b_ears3)]
" + . += "Change Tertiary Color [color_square(pref.r_ears3, pref.g_ears3, pref.b_ears3)]
" else - . += " Style: Select
" + . += " Style: Select
" var/datum/sprite_accessory/ears/ears_secondary = ear_styles[pref.ear_secondary_style] . += span_bold("Horns") + "
" if(istype(ears_secondary)) - . += " Style: [ears_secondary.name]
" + . += " Style: [ears_secondary.name]
" for(var/channel in 1 to min(ears_secondary.get_color_channel_count(), length(GLOB.fancy_sprite_accessory_color_channel_names))) - . += "Change [GLOB.fancy_sprite_accessory_color_channel_names[channel]] Color [color_square(hex = LAZYACCESS(pref.ear_secondary_colors, channel) || "#ffffff")]
" + . += "Change [GLOB.fancy_sprite_accessory_color_channel_names[channel]] Color [color_square(hex = LAZYACCESS(pref.ear_secondary_colors, channel) || "#ffffff")]
" else - . += " Style: Select
" + . += " Style: Select
" var/list/tail_styles = pref.get_available_styles(global.tail_styles_list) var/datum/sprite_accessory/tail/tail = tail_styles[pref.tail_style] . += span_bold("Tail") + "
" if(istype(tail)) - . += " Style: [tail.name]
" + . += " Style: [tail.name]
" if(tail.do_colouration) - . += "Change Color [color_square(pref.r_tail, pref.g_tail, pref.b_tail)]
" + . += "Change Color [color_square(pref.r_tail, pref.g_tail, pref.b_tail)]
" if(tail.extra_overlay) - . += "Change Secondary Color [color_square(pref.r_tail2, pref.g_tail2, pref.b_tail2)]
" + . += "Change Secondary Color [color_square(pref.r_tail2, pref.g_tail2, pref.b_tail2)]
" if(tail.extra_overlay2) - . += "Change Tertiary Color [color_square(pref.r_tail3, pref.g_tail3, pref.b_tail3)]
" + . += "Change Tertiary Color [color_square(pref.r_tail3, pref.g_tail3, pref.b_tail3)]
" else - . += " Style: Select
" + . += " Style: Select
" var/list/wing_styles = pref.get_available_styles(global.wing_styles_list) var/datum/sprite_accessory/wing/wings = wing_styles[pref.wing_style] . += span_bold("Wing") + "
" if(istype(wings)) - . += " Style: [wings.name]
" + . += " Style: [wings.name]
" if(wings.do_colouration) - . += "Change Color [color_square(pref.r_wing, pref.g_wing, pref.b_wing)]
" + . += "Change Color [color_square(pref.r_wing, pref.g_wing, pref.b_wing)]
" if(wings.extra_overlay) - . += "Change Secondary Color [color_square(pref.r_wing2, pref.g_wing2, pref.b_wing2)]
" + . += "Change Secondary Color [color_square(pref.r_wing2, pref.g_wing2, pref.b_wing2)]
" if(wings.extra_overlay2) - . += "Change Secondary Color [color_square(pref.r_wing3, pref.g_wing3, pref.b_wing3)]
" + . += "Change Secondary Color [color_square(pref.r_wing3, pref.g_wing3, pref.b_wing3)]
" else - . += " Style: Select
" + . += " Style: Select
" - . += "
Body Markings +
" + . += "
Body Markings +
" . += "" for(var/M in pref.body_markings) - . += "" + . += "" . += "
[M][pref.body_markings.len > 1 ? "˄ ˅ mv " : ""]- Color[color_square(hex = pref.body_markings[M]["color"] ? pref.body_markings[M]["color"] : "#000000")] - Customize
[M][pref.body_markings.len > 1 ? "˄ ˅ mv " : ""]- Color[color_square(hex = pref.body_markings[M]["color"] ? pref.body_markings[M]["color"] : "#000000")] - Customize
" . += "
" - . += span_bold("Allow Synth markings:") + " [pref.synth_markings ? "Yes" : "No"]
" - . += span_bold("Allow Synth color:") + " [pref.synth_color ? "Yes" : "No"]
" + . += span_bold("Allow Synth markings:") + " [pref.synth_markings ? "Yes" : "No"]
" + . += span_bold("Allow Synth color:") + " [pref.synth_color ? "Yes" : "No"]
" if(pref.synth_color) - . += "Change Color [color_square(pref.r_synth, pref.g_synth, pref.b_synth)]" + . += "Change Color [color_square(pref.r_synth, pref.g_synth, pref.b_synth)]" . = jointext(.,null) @@ -1419,7 +1419,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O pref.species_preview = SPECIES_HUMAN var/datum/species/current_species = GLOB.all_species[pref.species_preview] var/dat = "" - dat += "

[current_species.name] \[change\]


" + dat += "

[current_species.name] \[change\]


" dat += "" dat += "" //vorestation edit begin @@ -1481,11 +1481,11 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O if(restricted) if(restricted == 1) - dat += "You cannot play as this species.
If you wish to be whitelisted, you can make an application post on the forums.

" + dat += "You cannot play as this species.
If you wish to be whitelisted, you can make an application post on the forums.

" else if(restricted == 2) dat += "You cannot play as this species.
This species is not available for play as a station race..

" if(!restricted || check_rights(R_ADMIN|R_EVENT, 0) || current_species.spawn_flags & SPECIES_WHITELIST_SELECTABLE) //VOREStation Edit: selectability - dat += "\[select\]" + dat += "\[select\]" dat += "" user << browse(dat, "window=species;size=700x400") @@ -1493,15 +1493,15 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O /datum/category_item/player_setup_item/general/body/proc/markings_subwindow(mob/user, marking) var/static/list/part_to_string = list(BP_HEAD = "Head", BP_TORSO = "Upper Body", BP_GROIN = "Lower Body", BP_R_ARM = "Right Arm", BP_L_ARM = "Left Arm", BP_R_HAND = "Right Hand", BP_L_HAND = "Left Hand", BP_R_LEG = "Right Leg", BP_L_LEG = "Left Leg", BP_R_FOOT = "Right Foot", BP_L_FOOT = "Left Foot") var/dat = "

Editing '[marking]'


" - dat += "Enable All " - dat += "Disable All " - dat += "Change Color of All
" + dat += "Enable All " + dat += "Disable All " + dat += "Change Color of All
" dat += "
" for (var/bodypart in pref.body_markings[marking]) if (!islist(pref.body_markings[marking][bodypart])) continue dat += "[part_to_string[bodypart]]: [color_square(hex = pref.body_markings[marking][bodypart]["color"])] " - dat += "Change " - dat += "[pref.body_markings[marking][bodypart]["on"] ? "Toggle Off" : "Toggle On"]
" + dat += "Change " + dat += "[pref.body_markings[marking][bodypart]["on"] ? "Toggle Off" : "Toggle On"]
" dat += "" winshow(user, "prefs_markings_subwindow", TRUE) diff --git a/code/modules/client/preference_setup/general/04_equipment.dm b/code/modules/client/preference_setup/general/04_equipment.dm index b76ff9ee387..27dc98a4dce 100644 --- a/code/modules/client/preference_setup/general/04_equipment.dm +++ b/code/modules/client/preference_setup/general/04_equipment.dm @@ -123,19 +123,19 @@ var/global/list/valid_ringtones = list( . += span_bold("Equipment:") + "
" for(var/datum/category_group/underwear/UWC in global_underwear.categories) var/item_name = pref.all_underwear[UWC.name] ? pref.all_underwear[UWC.name] : "None" - . += "[UWC.name]: [item_name]" + . += "[UWC.name]: [item_name]" var/datum/category_item/underwear/UWI = UWC.items_by_name[item_name] if(UWI) for(var/datum/gear_tweak/gt in UWI.tweaks) - . += " [gt.get_contents(get_metadata(UWC.name, gt))]" + . += " [gt.get_contents(get_metadata(UWC.name, gt))]" . += "
" - . += "Headset Type: [GLOB.headsetlist[pref.headset]]
" - . += "Backpack Type: [backbaglist[pref.backbag]]
" - . += "PDA Type: [pdachoicelist[pref.pdachoice]]
" - . += "Communicator Visibility: [(pref.communicator_visibility) ? "Yes" : "No"]
" - . += "Ringtone (leave blank for job default): [pref.ringtone]
" - . += "Spawn With Shoes:[(pref.shoe_hater) ? "No" : "Yes"]
" //RS Addition + . += "Headset Type: [GLOB.headsetlist[pref.headset]]
" + . += "Backpack Type: [backbaglist[pref.backbag]]
" + . += "PDA Type: [pdachoicelist[pref.pdachoice]]
" + . += "Communicator Visibility: [(pref.communicator_visibility) ? "Yes" : "No"]
" + . += "Ringtone (leave blank for job default): [pref.ringtone]
" + . += "Spawn With Shoes:[(pref.shoe_hater) ? "No" : "Yes"]
" //RS Addition return jointext(.,null) diff --git a/code/modules/client/preference_setup/general/05_background.dm b/code/modules/client/preference_setup/general/05_background.dm index bbf4e9f694d..8025514cf77 100644 --- a/code/modules/client/preference_setup/general/05_background.dm +++ b/code/modules/client/preference_setup/general/05_background.dm @@ -45,26 +45,26 @@ /datum/category_item/player_setup_item/general/background/content(var/mob/user) . += span_bold("Background Information") + "
" - . += "Economic Status: [pref.economic_status]
" - . += "Home: [pref.home_system]
" - . += "Birthplace: [pref.birthplace]
" - . += "Citizenship: [pref.citizenship]
" - . += "Faction: [pref.faction]
" - . += "Religion: [pref.religion]
" + . += "Economic Status: [pref.economic_status]
" + . += "Home: [pref.home_system]
" + . += "Birthplace: [pref.birthplace]
" + . += "Citizenship: [pref.citizenship]
" + . += "Faction: [pref.faction]
" + . += "Religion: [pref.religion]
" . += "
Records:
" if(jobban_isbanned(user, "Records")) . += span_danger("You are banned from using character records.") + "
" else . += "Medical Records:
" - . += "[TextPreview(pref.med_record,40)]
" - . += " (Reset)

" + . += "[TextPreview(pref.med_record,40)]
" + . += " (Reset)

" . += "Employment Records:
" - . += "[TextPreview(pref.gen_record,40)]
" - . += "(Reset)

" + . += "[TextPreview(pref.gen_record,40)]
" + . += "(Reset)

" . += "Security Records:
" - . += "[TextPreview(pref.sec_record,40)]
" - . += "(Reset)" + . += "[TextPreview(pref.sec_record,40)]
" + . += "(Reset)" /datum/category_item/player_setup_item/general/background/OnTopic(var/href,var/list/href_list, var/mob/user) if(href_list["econ_status"]) diff --git a/code/modules/client/preference_setup/general/06_flavor.dm b/code/modules/client/preference_setup/general/06_flavor.dm index 334fd413fd2..4690dc4deb8 100644 --- a/code/modules/client/preference_setup/general/06_flavor.dm +++ b/code/modules/client/preference_setup/general/06_flavor.dm @@ -55,9 +55,9 @@ /datum/category_item/player_setup_item/general/flavor/content(var/mob/user) . += span_bold("Flavor:") + "
" - . += "Set Flavor Text
" - . += "Set Robot Flavor Text
" - . += "Set Custom Link
" + . += "Set Flavor Text
" + . += "Set Robot Flavor Text
" + . += "Set Custom Link
" /datum/category_item/player_setup_item/general/flavor/OnTopic(var/href,var/list/href_list, var/mob/user) if(href_list["flavor_text"]) @@ -104,31 +104,31 @@ HTML += span_bold("Set Flavor Text") + "
" HTML += "Note: This is not *literal* flavor of your character. This is visual description of what they look like.
" HTML += "
" - HTML += "General: " + HTML += "General: " HTML += TextPreview(pref.flavor_texts["general"]) HTML += "
" - HTML += "Head: " + HTML += "Head: " HTML += TextPreview(pref.flavor_texts["head"]) HTML += "
" - HTML += "Face: " + HTML += "Face: " HTML += TextPreview(pref.flavor_texts["face"]) HTML += "
" - HTML += "Eyes: " + HTML += "Eyes: " HTML += TextPreview(pref.flavor_texts["eyes"]) HTML += "
" - HTML += "Body: " + HTML += "Body: " HTML += TextPreview(pref.flavor_texts["torso"]) HTML += "
" - HTML += "Arms: " + HTML += "Arms: " HTML += TextPreview(pref.flavor_texts["arms"]) HTML += "
" - HTML += "Hands: " + HTML += "Hands: " HTML += TextPreview(pref.flavor_texts["hands"]) HTML += "
" - HTML += "Legs: " + HTML += "Legs: " HTML += TextPreview(pref.flavor_texts["legs"]) HTML += "
" - HTML += "Feet: " + HTML += "Feet: " HTML += TextPreview(pref.flavor_texts["feet"]) HTML += "
" HTML += "
" @@ -141,11 +141,11 @@ HTML += "
" HTML += span_bold("Set Robot Flavour Text") + "
" HTML += "
" - HTML += "Default: " + HTML += "Default: " HTML += TextPreview(pref.flavour_texts_robot["Default"]) HTML += "
" for(var/module in robot_module_types) - HTML += "[module]: " + HTML += "[module]: " HTML += TextPreview(pref.flavour_texts_robot[module]) HTML += "
" HTML += "
" diff --git a/code/modules/client/preference_setup/global/01_ui.dm b/code/modules/client/preference_setup/global/01_ui.dm index 9c40d063960..1d67d38661f 100644 --- a/code/modules/client/preference_setup/global/01_ui.dm +++ b/code/modules/client/preference_setup/global/01_ui.dm @@ -57,28 +57,28 @@ pref.chat_timestamp = sanitize_integer(pref.chat_timestamp, 0, 1, initial(pref.chat_timestamp)) /datum/category_item/player_setup_item/player_global/ui/content(var/mob/user) - . = span_bold("UI Style:") + " [pref.UI_style]
" + . = span_bold("UI Style:") + " [pref.UI_style]
" . += span_bold("Custom UI") + " (recommended for White UI):
" - . += "-Color: [pref.UI_style_color] [color_square(hex = pref.UI_style_color)] reset
" - . += "-Alpha(transparency): [pref.UI_style_alpha] reset
" - . += span_bold("Tooltip Style:") + " [pref.tooltipstyle]
" - . += span_bold("Client FPS:") + " [pref.client_fps]
" - . += span_bold("Random Ambience Frequency:") + " [pref.ambience_freq]
" - . += span_bold("Ambience Chance:") + " [pref.ambience_chance]
" - . += span_bold("TGUI Window Mode:") + " [(pref.tgui_fancy) ? "Fancy (default)" : "Compatible (slower)"]
" - . += span_bold("TGUI Window Placement:") + " [(pref.tgui_lock) ? "Primary Monitor" : "Free (default)"]
" - . += span_bold("TGUI Input Framework:") + " [(pref.tgui_input_mode) ? "Enabled" : "Disabled (default)"]
" - . += span_bold("TGUI Large Buttons:") + " [(pref.tgui_large_buttons) ? "Enabled (default)" : "Disabled"]
" - . += span_bold("TGUI Swapped Buttons:") + " [(pref.tgui_swapped_buttons) ? "Enabled" : "Disabled (default)"]
" - . += span_bold("Obfuscate Ckey:") + " [(pref.obfuscate_key) ? "Enabled" : "Disabled (default)"]
" - . += span_bold("Obfuscate Job:") + " [(pref.obfuscate_job) ? "Enabled" : "Disabled (default)"]
" - . += span_bold("Chat Timestamps:") + " [(pref.chat_timestamp) ? "Enabled" : "Disabled (default)"]
" + . += "-Color: [pref.UI_style_color] [color_square(hex = pref.UI_style_color)] reset
" + . += "-Alpha(transparency): [pref.UI_style_alpha] reset
" + . += span_bold("Tooltip Style:") + " [pref.tooltipstyle]
" + . += span_bold("Client FPS:") + " [pref.client_fps]
" + . += span_bold("Random Ambience Frequency:") + " [pref.ambience_freq]
" + . += span_bold("Ambience Chance:") + " [pref.ambience_chance]
" + . += span_bold("TGUI Window Mode:") + " [(pref.tgui_fancy) ? "Fancy (default)" : "Compatible (slower)"]
" + . += span_bold("TGUI Window Placement:") + " [(pref.tgui_lock) ? "Primary Monitor" : "Free (default)"]
" + . += span_bold("TGUI Input Framework:") + " [(pref.tgui_input_mode) ? "Enabled" : "Disabled (default)"]
" + . += span_bold("TGUI Large Buttons:") + " [(pref.tgui_large_buttons) ? "Enabled (default)" : "Disabled"]
" + . += span_bold("TGUI Swapped Buttons:") + " [(pref.tgui_swapped_buttons) ? "Enabled" : "Disabled (default)"]
" + . += span_bold("Obfuscate Ckey:") + " [(pref.obfuscate_key) ? "Enabled" : "Disabled (default)"]
" + . += span_bold("Obfuscate Job:") + " [(pref.obfuscate_job) ? "Enabled" : "Disabled (default)"]
" + . += span_bold("Chat Timestamps:") + " [(pref.chat_timestamp) ? "Enabled" : "Disabled (default)"]
" if(can_select_ooc_color(user)) . += span_bold("OOC Color:") if(pref.ooccolor == initial(pref.ooccolor)) - . += "Using Default
" + . += "Using Default
" else - . += "[pref.ooccolor] [color_square(hex = pref.ooccolor)]reset
" + . += "[pref.ooccolor] [color_square(hex = pref.ooccolor)]reset
" /datum/category_item/player_setup_item/player_global/ui/OnTopic(var/href,var/list/href_list, var/mob/user) if(href_list["select_style"]) diff --git a/code/modules/client/preference_setup/global/03_pai.dm b/code/modules/client/preference_setup/global/03_pai.dm index 22c92e9905a..af393875358 100644 --- a/code/modules/client/preference_setup/global/03_pai.dm +++ b/code/modules/client/preference_setup/global/03_pai.dm @@ -32,10 +32,10 @@ if(!candidate) log_debug("[user] pAI prefs have a null candidate var.") return . - . += "Name: [candidate.name ? candidate.name : "None Set"]
" - . += "Description: [candidate.description ? TextPreview(candidate.description, 40) : "None Set"]
" - . += "Role: [candidate.role ? TextPreview(candidate.role, 40) : "None Set"]
" - . += "OOC Comments: [candidate.comments ? TextPreview(candidate.comments, 40) : "None Set"]
" + . += "Name: [candidate.name ? candidate.name : "None Set"]
" + . += "Description: [candidate.description ? TextPreview(candidate.description, 40) : "None Set"]
" + . += "Role: [candidate.role ? TextPreview(candidate.role, 40) : "None Set"]
" + . += "OOC Comments: [candidate.comments ? TextPreview(candidate.comments, 40) : "None Set"]
" /datum/category_item/player_setup_item/player_global/pai/OnTopic(var/href,var/list/href_list, var/mob/user) if(href_list["option"]) diff --git a/code/modules/client/preference_setup/global/04_ooc.dm b/code/modules/client/preference_setup/global/04_ooc.dm index e99777927f2..18ac5deec97 100644 --- a/code/modules/client/preference_setup/global/04_ooc.dm +++ b/code/modules/client/preference_setup/global/04_ooc.dm @@ -18,8 +18,8 @@ . += span_bold("OOC:") + "
" . += "Ignored Players
" for(var/ignored_player in pref.ignored_players) - . += "[ignored_player] (Unignore)
" - . += "(Ignore Player)" + . += "[ignored_player] (Unignore)
" + . += "(Ignore Player)" /datum/category_item/player_setup_item/player_global/ooc/OnTopic(var/href,var/list/href_list, var/mob/user) if(href_list["unignore_player"]) diff --git a/code/modules/client/preference_setup/loadout/loadout.dm b/code/modules/client/preference_setup/loadout/loadout.dm index 5019e5c845e..0fba39295b8 100644 --- a/code/modules/client/preference_setup/loadout/loadout.dm +++ b/code/modules/client/preference_setup/loadout/loadout.dm @@ -137,7 +137,7 @@ var/list/gear_datums = list() fcolor = "#E67300" . += "
" - . += "" + . += "" . += "" var/datum/loadout_category/LC = loadout_categories[current_tab] @@ -176,7 +176,7 @@ var/list/gear_datums = list() if(G.character_name && !(preference_mob.client.prefs.real_name in G.character_name)) continue var/ticked = (G.display_name in pref.gear) - . += "" + . += "" . += "" . += "" if(G.show_roles && G.allowed_roles) @@ -184,7 +184,7 @@ var/list/gear_datums = list() if(ticked) . += "" . += "
\<\<\[[pref.gear_slot]\] \>\>[total_cost]/[MAX_GEAR_COST] loadout points spent. \[Clear Loadout\]
\<\<\[[pref.gear_slot]\] \>\>[total_cost]/[MAX_GEAR_COST] loadout points spent. \[Clear Loadout\]
" var/firstcat = 1 @@ -159,9 +159,9 @@ var/list/gear_datums = list() . += " " + span_linkOn("[category] - [category_cost]") + " " else if(category_cost) - . += " [category] - [category_cost] " + . += " [category] - [category_cost] " else - . += " [category] - 0 " + . += " [category] - 0 " . += "
[G.display_name]
[G.display_name][G.cost][G.description]
" for(var/datum/gear_tweak/tweak in G.gear_tweaks) - . += " [tweak.get_contents(get_tweak_metadata(G, tweak))]" + . += " [tweak.get_contents(get_tweak_metadata(G, tweak))]" . += "
" . = jointext(., null) diff --git a/code/modules/client/preference_setup/occupation/occupation.dm b/code/modules/client/preference_setup/occupation/occupation.dm index 08befbebe71..493481e0666 100644 --- a/code/modules/client/preference_setup/occupation/occupation.dm +++ b/code/modules/client/preference_setup/occupation/occupation.dm @@ -71,7 +71,7 @@ . = list() . += "
" . += span_bold("Choose occupation chances") + "
Unavailable occupations are crossed out.
" - . += "" + . += "" . += "
" // Table within a table for alignment, also allows you to easily add more columns. . += "" var/index = -1 @@ -131,7 +131,7 @@ var/rank = job.title lastJob = job - . += "" + . += "" if(jobban_isbanned(user, rank)) . += "[rank]" continue @@ -189,7 +189,7 @@ prefUpperLevel = 3 prefLowerLevel = 1 - . += "" + . += "" if(job.type == /datum/job/assistant)//Assistant is special if(pref.job_civilian_low & ASSISTANT) @@ -197,26 +197,26 @@ else . += " \[No]" if(LAZYLEN(job.alt_titles)) //Blatantly cloned from a few lines down. - . += "" + . += "" . += "" continue . += " \[[prefLevelLabel]]" if(LAZYLEN(job.alt_titles)) - . += "" + . += "" . += "" . += "
\[BANNED]
 \[[pref.GetPlayerAltTitle(job)]\]
 \[[pref.GetPlayerAltTitle(job)]\]
 \[[pref.GetPlayerAltTitle(job)]\]
 \[[pref.GetPlayerAltTitle(job)]\]
" . += "
" switch(pref.alternate_option) if(GET_RANDOM_JOB) - . += span_underline("Get random job if preferences unavailable") + . += span_underline("Get random job if preferences unavailable") if(BE_ASSISTANT) - . += span_underline("Be assistant if preference unavailable") + . += span_underline("Be assistant if preference unavailable") if(RETURN_TO_LOBBY) - . += span_underline("Return to lobby if preference unavailable") + . += span_underline("Return to lobby if preference unavailable") - . += "\[Reset\]
" + . += "\[Reset\]
" . += "
" . = jointext(.,null) @@ -264,7 +264,7 @@ dat += "
" if(CONFIG_GET(string/wikiurl)) - dat += "Open wiki page in browser" + dat += "Open wiki page in browser" var/alt_title = pref.GetPlayerAltTitle(job) var/list/description = job.get_description_blurb(alt_title) diff --git a/code/modules/client/preference_setup/preference_setup.dm b/code/modules/client/preference_setup/preference_setup.dm index d43fb0529c2..ce487482ab6 100644 --- a/code/modules/client/preference_setup/preference_setup.dm +++ b/code/modules/client/preference_setup/preference_setup.dm @@ -80,8 +80,8 @@ if(PS == selected_category) dat += "[PS.name] " // TODO: Check how to properly mark a href/button selected in a classic browser window else - dat += "[PS.name] " - dat += "Game Options" + dat += "[PS.name] " + dat += "Game Options" return dat /datum/category_collection/player_setup_collection/proc/content(var/mob/user) diff --git a/code/modules/client/preference_setup/traits/traits.dm b/code/modules/client/preference_setup/traits/traits.dm index f51459de337..12a9077bc7a 100644 --- a/code/modules/client/preference_setup/traits/traits.dm +++ b/code/modules/client/preference_setup/traits/traits.dm @@ -60,7 +60,7 @@ var/list/trait_categories = list() // The categories available for the trait men if(category == current_tab) . += " " + span_linkOn("[category]") + " " else - . += " [category] " + . += " [category] " . += "
[T.name]
[T.name]
[G.cost]
" // for(var/datum/gear_tweak/tweak in G.gear_tweaks) -// . += " [tweak.get_contents(get_tweak_metadata(G, tweak))]" +// . += " [tweak.get_contents(get_tweak_metadata(G, tweak))]" // . += "
" . = jointext(., null) diff --git a/code/modules/client/preference_setup/volume_sliders/01_volume.dm b/code/modules/client/preference_setup/volume_sliders/01_volume.dm index eb07af33cc0..4c63fc7abbb 100644 --- a/code/modules/client/preference_setup/volume_sliders/01_volume.dm +++ b/code/modules/client/preference_setup/volume_sliders/01_volume.dm @@ -31,7 +31,7 @@ /datum/category_item/player_setup_item/volume_sliders/volume/content(var/mob/user) . += span_bold("Volume Settings") + "
" for(var/channel in pref.volume_channels) - . += "[channel]: [pref.volume_channels[channel] * 100]%
" + . += "[channel]: [pref.volume_channels[channel] * 100]%
" . += "
" /datum/category_item/player_setup_item/volume_sliders/volume/OnTopic(var/href, var/list/href_list, var/mob/user) diff --git a/code/modules/client/preference_setup/volume_sliders/02_media.dm b/code/modules/client/preference_setup/volume_sliders/02_media.dm index 979eac55ce6..d6617b5816c 100644 --- a/code/modules/client/preference_setup/volume_sliders/02_media.dm +++ b/code/modules/client/preference_setup/volume_sliders/02_media.dm @@ -20,14 +20,14 @@ /datum/category_item/player_setup_item/volume_sliders/media/content(var/mob/user) . += span_bold("Jukebox Volume:") - . += "[round(pref.media_volume * 100)]%
" + . += "[round(pref.media_volume * 100)]%
" . += span_bold("Media Player Type:") + " Depending on you operating system, one of these might work better. " . += "Use HTML5 if it works for you. If neither HTML5 nor WMP work, you'll have to fall back to using VLC, " . += "but this requires you have the VLC client installed on your comptuer." . += "Try the others if you want but you'll probably just get no music.
" - . += (pref.media_player == 2) ? (span_linkOn(span_bold("HTML5")) + " ") : "HTML5 " - . += (pref.media_player == 1) ? (span_linkOn(span_bold("WMP")) + " ") : "WMP " - . += (pref.media_player == 0) ? (span_linkOn(span_bold("VLC")) + " ") : "VLC " + . += (pref.media_player == 2) ? (span_linkOn(span_bold("HTML5")) + " ") : "HTML5 " + . += (pref.media_player == 1) ? (span_linkOn(span_bold("WMP")) + " ") : "WMP " + . += (pref.media_player == 0) ? (span_linkOn(span_bold("VLC")) + " ") : "VLC " . += "
" /datum/category_item/player_setup_item/volume_sliders/media/OnTopic(var/href, var/list/href_list, var/mob/user) diff --git a/code/modules/client/preference_setup/vore/02_size.dm b/code/modules/client/preference_setup/vore/02_size.dm index 447b3298371..305659a34e1 100644 --- a/code/modules/client/preference_setup/vore/02_size.dm +++ b/code/modules/client/preference_setup/vore/02_size.dm @@ -73,17 +73,17 @@ /datum/category_item/player_setup_item/vore/size/content(var/mob/user) . += "
" - . += span_bold("Scale:") + " [round(pref.size_multiplier*100)]%
" - . += span_bold("Scaled Appearance:") + " [pref.fuzzy ? "Fuzzy" : "Sharp"]
" - . += span_bold("Scaling Center:") + " [pref.offset_override ? "Odd" : "Even"]
" - . += span_bold("Voice Frequency:") + " [pref.voice_freq]
" - . += span_bold("Voice Sounds:") + " [pref.voice_sound]
" - . += "Test Selected Voice
" - . += span_bold("Custom Speech Bubble:") + " [pref.custom_speech_bubble]
" + . += span_bold("Scale:") + " [round(pref.size_multiplier*100)]%
" + . += span_bold("Scaled Appearance:") + " [pref.fuzzy ? "Fuzzy" : "Sharp"]
" + . += span_bold("Scaling Center:") + " [pref.offset_override ? "Odd" : "Even"]
" + . += span_bold("Voice Frequency:") + " [pref.voice_freq]
" + . += span_bold("Voice Sounds:") + " [pref.voice_sound]
" + . += "Test Selected Voice
" + . += span_bold("Custom Speech Bubble:") + " [pref.custom_speech_bubble]
" . += "
" - . += span_bold("Relative Weight:") + " [pref.weight_vr]
" - . += span_bold("Weight Gain Rate:") + " [pref.weight_gain]
" - . += span_bold("Weight Loss Rate:") + " [pref.weight_loss]
" + . += span_bold("Relative Weight:") + " [pref.weight_vr]
" + . += span_bold("Weight Gain Rate:") + " [pref.weight_gain]
" + . += span_bold("Weight Loss Rate:") + " [pref.weight_loss]
" /datum/category_item/player_setup_item/vore/size/OnTopic(var/href, var/list/href_list, var/mob/user) if(href_list["size_multiplier"]) diff --git a/code/modules/client/preference_setup/vore/03_egg.dm b/code/modules/client/preference_setup/vore/03_egg.dm index e8e989f9df4..4b75ae23548 100644 --- a/code/modules/client/preference_setup/vore/03_egg.dm +++ b/code/modules/client/preference_setup/vore/03_egg.dm @@ -43,8 +43,8 @@ /datum/category_item/player_setup_item/vore/egg/content(var/mob/user) . += "
" - . += " Egg Type: [pref.vore_egg_type]
" - . += span_bold("Autohiss Default Setting:") + " [pref.autohiss]
" // VOREStation Add + . += " Egg Type: [pref.vore_egg_type]
" + . += span_bold("Autohiss Default Setting:") + " [pref.autohiss]
" // VOREStation Add /datum/category_item/player_setup_item/vore/egg/OnTopic(var/href, var/list/href_list, var/mob/user) if(!CanUseTopic(user)) diff --git a/code/modules/client/preference_setup/vore/04_resleeving.dm b/code/modules/client/preference_setup/vore/04_resleeving.dm index 6ec8ca51bff..1185288552c 100644 --- a/code/modules/client/preference_setup/vore/04_resleeving.dm +++ b/code/modules/client/preference_setup/vore/04_resleeving.dm @@ -42,9 +42,9 @@ /datum/category_item/player_setup_item/vore/resleeve/content(var/mob/user) . += "
" - . += span_bold("Start With Body Scan:") + " [pref.resleeve_scan ? "Yes" : "No"]
" - . += span_bold("Start With Mind Scan:") + " [pref.mind_scan ? "Yes" : "No"]
" - . += span_bold("Prevent Body Impersonation:") + " [pref.resleeve_lock ? "Yes" : "No"]
" + . += span_bold("Start With Body Scan:") + " [pref.resleeve_scan ? "Yes" : "No"]
" + . += span_bold("Start With Mind Scan:") + " [pref.mind_scan ? "Yes" : "No"]
" + . += span_bold("Prevent Body Impersonation:") + " [pref.resleeve_lock ? "Yes" : "No"]
" /datum/category_item/player_setup_item/vore/resleeve/OnTopic(var/href, var/list/href_list, var/mob/user) if(href_list["toggle_resleeve_lock"]) diff --git a/code/modules/client/preference_setup/vore/05_persistence.dm b/code/modules/client/preference_setup/vore/05_persistence.dm index 704b22bb6ca..3b04126b506 100644 --- a/code/modules/client/preference_setup/vore/05_persistence.dm +++ b/code/modules/client/preference_setup/vore/05_persistence.dm @@ -47,9 +47,9 @@ /datum/category_item/player_setup_item/vore/persistence/proc/make_yesno(var/bit) if(pref.persistence_settings & bit) - return "" + span_linkOn(span_bold("Yes")) + " No" + return "" + span_linkOn(span_bold("Yes")) + " No" else - return "Yes " + span_linkOn(span_bold("No")) + "" + return "Yes " + span_linkOn(span_bold("No")) + "" /datum/category_item/player_setup_item/vore/persistence/OnTopic(var/href, var/list/href_list, var/mob/user) if(href_list["toggle_on"]) diff --git a/code/modules/client/preference_setup/vore/06_vantag.dm b/code/modules/client/preference_setup/vore/06_vantag.dm index 5433e712f04..2b03fb95b2d 100644 --- a/code/modules/client/preference_setup/vore/06_vantag.dm +++ b/code/modules/client/preference_setup/vore/06_vantag.dm @@ -27,8 +27,8 @@ /datum/category_item/player_setup_item/vore/vantag/content(var/mob/user) . += "
" - . += span_bold("Event Volunteer:") + " " + span_bold("[pref.vantag_volunteer ? "Yes" : "No"]") + "
" - . += span_bold("Event Pref:") + " " + span_bold("[vantag_choices_list[pref.vantag_preference]]") + "
" + . += span_bold("Event Volunteer:") + " " + span_bold("[pref.vantag_volunteer ? "Yes" : "No"]") + "
" + . += span_bold("Event Pref:") + " " + span_bold("[vantag_choices_list[pref.vantag_preference]]") + "
" /datum/category_item/player_setup_item/vore/vantag/OnTopic(var/href, var/list/href_list, var/mob/user) if(href_list["toggle_vantag_volunteer"]) diff --git a/code/modules/client/preference_setup/vore/07_traits.dm b/code/modules/client/preference_setup/vore/07_traits.dm index 1246d62b955..2184a30f925 100644 --- a/code/modules/client/preference_setup/vore/07_traits.dm +++ b/code/modules/client/preference_setup/vore/07_traits.dm @@ -57,7 +57,7 @@ var/global/list/valid_bloodreagents = list("default",REAGENT_ID_IRON,REAGENT_ID_ trait_prefs[identifier] = trait.default_value_for_pref(identifier) //won't be called at all often altered = TRUE . += "
  • - [pref_list[2]]:" - var/link = " " + var/link = " " switch (pref_list[1]) if (1) //TRAIT_PREF_TYPE_BOOLEAN . += link + (trait_prefs[identifier] ? "Enabled" : "Disabled") @@ -274,12 +274,12 @@ var/global/list/valid_bloodreagents = list("default",REAGENT_ID_IRON,REAGENT_ID_ /datum/category_item/player_setup_item/vore/traits/content(var/mob/user) . += span_bold("Custom Species Name:") + " " - . += "[pref.custom_species ? pref.custom_species : "-Input Name-"]
    " + . += "[pref.custom_species ? pref.custom_species : "-Input Name-"]
    " var/datum/species/selected_species = GLOB.all_species[pref.species] if(selected_species.selects_bodytype) . += span_bold("Icon Base:") + " " - . += "[pref.custom_base ? pref.custom_base : "Human"]
    " + . += "[pref.custom_base ? pref.custom_base : "Human"]
    " var/traits_left = pref.max_traits @@ -295,57 +295,57 @@ var/global/list/valid_bloodreagents = list("default",REAGENT_ID_IRON,REAGENT_ID_ if(points_left < 0 || traits_left < 0 || (!pref.custom_species && pref.species == SPECIES_CUSTOM)) . += span_red(span_bold("^ Fix things! ^")) + "
    " - . += "Positive Trait +
    " + . += "Positive Trait +
    " . += "" - . += "Neutral Trait +
    " + . += "Neutral Trait +
    " . += "" - . += "Negative Trait +
    " + . += "Negative Trait +
    " . += "" . += span_bold("Blood Color: ") //People that want to use a certain species to have that species traits (xenochimera/promethean/spider) should be able to set their own blood color. - . += "Set Color " - . += "R
    " + . += "Set Color " + . += "R
    " . += span_bold("Blood Reagent: ") //Wanna be copper-based? Go ahead. - . += "[pref.blood_reagents]
    " + . += "[pref.blood_reagents]
    " . += "
    " . += span_bold("Custom Say: ") - . += "Set Say Verb" - . += "(Reset)" + . += "Set Say Verb" + . += "(Reset)" . += "
    " . += span_bold("Custom Whisper: ") - . += "Set Whisper Verb" - . += "(Reset)" + . += "Set Whisper Verb" + . += "(Reset)" . += "
    " . += span_bold("Custom Ask: ") - . += "Set Ask Verb" - . += "(Reset)" + . += "Set Ask Verb" + . += "(Reset)" . += "
    " . += span_bold("Custom Exclaim: ") - . += "Set Exclaim Verb" - . += "(Reset)" + . += "Set Exclaim Verb" + . += "(Reset)" . += "
    " . += span_bold("Custom Heat Discomfort: ") - . += "Set Heat Messages" - . += "(Reset)" + . += "Set Heat Messages" + . += "(Reset)" . += "
    " . += span_bold("Custom Cold Discomfort: ") - . += "Set Cold Messages" - . += "(Reset)" + . += "Set Cold Messages" + . += "(Reset)" . += "
    " /datum/category_item/player_setup_item/vore/traits/OnTopic(var/href,var/list/href_list, var/mob/user) diff --git a/code/modules/client/preference_setup/vore/09_misc.dm b/code/modules/client/preference_setup/vore/09_misc.dm index c2e3ebd24bd..771f97b1649 100644 --- a/code/modules/client/preference_setup/vore/09_misc.dm +++ b/code/modules/client/preference_setup/vore/09_misc.dm @@ -45,15 +45,15 @@ /datum/category_item/player_setup_item/vore/misc/content(var/mob/user) . += "
    " - . += span_bold("Appear in Character Directory:") + " [pref.show_in_directory ? "Yes" : "No"]
    " - . += span_bold("Character Directory Vore Tag:") + " [pref.directory_tag]
    " - . += span_bold("Character Directory ERP Tag:") + " [pref.directory_erptag]
    " - . += span_bold("Character Directory Advertisement:") + " Set Directory Ad
    " - . += span_bold("Suit Sensors Preference:") + " [sensorpreflist[pref.sensorpref]]
    " - . += span_bold("Capture Crystal Preference:") + " [pref.capture_crystal ? "Yes" : "No"]
    " - . += span_bold("Spawn With Backup Implant:") + " [pref.auto_backup_implant ? "Yes" : "No"]
    " - . += span_bold("Allow petting as robot:") + " [pref.borg_petting ? "Yes" : "No"]
    " - . += span_bold("Enable Stomach Sprites:") + " [pref.stomach_vision ? "Yes" : "No"]
    " + . += span_bold("Appear in Character Directory:") + " [pref.show_in_directory ? "Yes" : "No"]
    " + . += span_bold("Character Directory Vore Tag:") + " [pref.directory_tag]
    " + . += span_bold("Character Directory ERP Tag:") + " [pref.directory_erptag]
    " + . += span_bold("Character Directory Advertisement:") + " Set Directory Ad
    " + . += span_bold("Suit Sensors Preference:") + " [sensorpreflist[pref.sensorpref]]
    " + . += span_bold("Capture Crystal Preference:") + " [pref.capture_crystal ? "Yes" : "No"]
    " + . += span_bold("Spawn With Backup Implant:") + " [pref.auto_backup_implant ? "Yes" : "No"]
    " + . += span_bold("Allow petting as robot:") + " [pref.borg_petting ? "Yes" : "No"]
    " + . += span_bold("Enable Stomach Sprites:") + " [pref.stomach_vision ? "Yes" : "No"]
    " /datum/category_item/player_setup_item/vore/misc/OnTopic(var/href, var/list/href_list, var/mob/user) if(href_list["toggle_show_in_directory"]) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index b817e796895..1b161ad3111 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -244,11 +244,11 @@ var/list/preferences_datums = list() if(path) dat += "Slot - " - dat += "Load slot - " - dat += "Save slot - " - dat += "Reload slot - " - dat += "Reset slot - " - dat += "Copy slot" + dat += "Load slot - " + dat += "Save slot - " + dat += "Reload slot - " + dat += "Reset slot - " + dat += "Copy slot" else dat += "Please create an account to save your preferences." diff --git a/code/modules/client/verbs/advanced_who.dm b/code/modules/client/verbs/advanced_who.dm index 3e39936cf5d..dcc488af552 100644 --- a/code/modules/client/verbs/advanced_who.dm +++ b/code/modules/client/verbs/advanced_who.dm @@ -67,7 +67,7 @@ entry += "[seconds % 60] seconds)" entry += "" - entry += " (?)" + entry += " (?)" entry += "" Lines += entry diff --git a/code/modules/economy/EFTPOS.dm b/code/modules/economy/EFTPOS.dm index cd9f84f3d7c..33350e6a50e 100644 --- a/code/modules/economy/EFTPOS.dm +++ b/code/modules/economy/EFTPOS.dm @@ -78,7 +78,7 @@ var/dat = span_bold("[eftpos_name]") + "
    " dat += "This terminal is [machine_id]. Report this code when contacting IT Support
    " if(transaction_locked) - dat += "Back[transaction_paid ? "" : " (authentication required)"]

    " + dat += "Back[transaction_paid ? "" : " (authentication required)"]

    " dat += "Transaction purpose: [transaction_purpose]
    " dat += "Value: $[transaction_amount]
    " @@ -87,16 +87,16 @@ dat += "This transaction has been processed successfully.
    " else dat += "Swipe your card below the line to finish this transaction.
    " - dat += "\[------\]" + dat += "\[------\]" else - dat += "Lock in new transaction

    " + dat += "Lock in new transaction

    " - dat += "Transaction purpose: [transaction_purpose]
    " - dat += "Value: $[transaction_amount]
    " - dat += "Linked account: [linked_account ? linked_account.owner_name : "None"]
    " - dat += "Change access code
    " - dat += "Change EFTPOS ID
    " - dat += "Scan card to reset access code \[------\]" + dat += "Transaction purpose: [transaction_purpose]
    " + dat += "Value: $[transaction_amount]
    " + dat += "Linked account: [linked_account ? linked_account.owner_name : "None"]
    " + dat += "Change access code
    " + dat += "Change EFTPOS ID
    " + dat += "Scan card to reset access code \[------\]" user << browse(dat,"window=eftpos") else user << browse(null,"window=eftpos") diff --git a/code/modules/economy/cash_register.dm b/code/modules/economy/cash_register.dm index 17b1327ebf0..8f2e72c8346 100644 --- a/code/modules/economy/cash_register.dm +++ b/code/modules/economy/cash_register.dm @@ -66,14 +66,14 @@ /obj/machinery/cash_register/interact(mob/user as mob) var/dat = "

    Cash Register

    " if (locked) - dat += "Unlock
    " + dat += "Unlock
    " dat += "Linked account: " + span_bold("[linked_account ? linked_account.owner_name : "None"]") + "
    " dat += span_bold("[cash_locked? "Unlock" : "Lock"] Cash Box") + " | " else - dat += "Lock
    " - dat += "Linked account: [linked_account ? linked_account.owner_name : "None"]
    " - dat += "[cash_locked? "Unlock" : "Lock"] Cash Box | " - dat += "Custom Order
    " + dat += "Lock
    " + dat += "Linked account: [linked_account ? linked_account.owner_name : "None"]
    " + dat += "[cash_locked? "Unlock" : "Lock"] Cash Box | " + dat += "Custom Order
    " if(item_list.len) dat += get_current_transaction() @@ -83,7 +83,7 @@ dat += "[transaction_logs[i]]
    " if(transaction_logs.len) - dat += locked ? "
    " : "Reset Log
    " + dat += locked ? "
    " : "Reset Log
    " dat += "
    " dat += "Device ID: [machine_id]" user << browse(dat, "window=cash_register;size=350x500") @@ -397,9 +397,9 @@ var/item_name for(var/i=1, i<=item_list.len, i++) item_name = item_list[i] - dat += "[item_list[item_name] ? "- Set + [item_list[item_name]] x " : ""][item_name] Remove[price_list[item_name] * item_list[item_name]] þ" + dat += "[item_list[item_name] ? "- Set + [item_list[item_name]] x " : ""][item_name] Remove[price_list[item_name] * item_list[item_name]] þ" dat += "" - dat += "" + dat += "" dat += "
    Clear Entry" + span_bold("Total Amount: [transaction_amount] þ") + "
    Clear Entry" + span_bold("Total Amount: [transaction_amount] þ") + "
    " return dat diff --git a/code/modules/economy/money_bag.dm b/code/modules/economy/money_bag.dm index 3bfcb78579b..bb143f69bb3 100644 --- a/code/modules/economy/money_bag.dm +++ b/code/modules/economy/money_bag.dm @@ -32,17 +32,17 @@ var/dat = span_bold("The contents of the moneybag reveal...") + "
    " if (amt_gold) - dat += text("Gold coins: [amt_gold] Remove one
    ") + dat += text("Gold coins: [amt_gold] Remove one
    ") if (amt_silver) - dat += text("Silver coins: [amt_silver] Remove one
    ") + dat += text("Silver coins: [amt_silver] Remove one
    ") if (amt_iron) - dat += text("Metal coins: [amt_iron] Remove one
    ") + dat += text("Metal coins: [amt_iron] Remove one
    ") if (amt_diamond) - dat += text("Diamond coins: [amt_diamond] Remove one
    ") + dat += text("Diamond coins: [amt_diamond] Remove one
    ") if (amt_phoron) - dat += text("Phoron coins: [amt_phoron] Remove one
    ") + dat += text("Phoron coins: [amt_phoron] Remove one
    ") if (amt_uranium) - dat += text("Uranium coins: [amt_uranium] Remove one
    ") + dat += text("Uranium coins: [amt_uranium] Remove one
    ") user << browse("[dat]", "window=moneybag") /obj/item/moneybag/attackby(obj/item/W as obj, mob/user as mob) diff --git a/code/modules/economy/retail_scanner.dm b/code/modules/economy/retail_scanner.dm index 1b981dc6790..aa0c245b62e 100644 --- a/code/modules/economy/retail_scanner.dm +++ b/code/modules/economy/retail_scanner.dm @@ -64,12 +64,12 @@ /obj/item/retail_scanner/interact(mob/user as mob) var/dat = "

    Retail Scanner

    " if (locked) - dat += "Unlock
    " + dat += "Unlock
    " dat += "Linked account: [linked_account ? linked_account.owner_name : "None"]
    " else - dat += "Lock
    " - dat += "Linked account: [linked_account ? linked_account.owner_name : "None"]
    " - dat += "Custom Order
    " + dat += "Lock
    " + dat += "Linked account: [linked_account ? linked_account.owner_name : "None"]
    " + dat += "Custom Order
    " if(item_list.len) dat += get_current_transaction() @@ -79,7 +79,7 @@ dat += "[transaction_logs[i]]
    " if(transaction_logs.len) - dat += locked ? "
    " : "Reset Log
    " + dat += locked ? "
    " : "Reset Log
    " dat += "
    " dat += "Device ID: [machine_id]" user << browse(dat, "window=retail;size=350x500") @@ -333,9 +333,9 @@ var/item_name for(var/i=1, i<=item_list.len, i++) item_name = item_list[i] - dat += "[item_list[item_name] ? "- Set + [item_list[item_name]] x " : ""][item_name] Remove[price_list[item_name] * item_list[item_name]] þ" + dat += "[item_list[item_name] ? "- Set + [item_list[item_name]] x " : ""][item_name] Remove[price_list[item_name] * item_list[item_name]] þ" dat += "" - dat += "" + dat += "" dat += "
    Clear EntryTotal Amount: [transaction_amount] þ
    Clear EntryTotal Amount: [transaction_amount] þ
    " return dat diff --git a/code/modules/economy/trader.dm b/code/modules/economy/trader.dm index bbc18074657..8249250a0ab 100644 --- a/code/modules/economy/trader.dm +++ b/code/modules/economy/trader.dm @@ -258,7 +258,7 @@ dir = dt.dir log_admin("[src] has been placed at [loc], [x],[y],[z]") else - log_and_message_admins("[src] tried to move itself but its target pick list was empty, so it was not moved. (JMP)") + log_and_message_admins("[src] tried to move itself but its target pick list was empty, so it was not moved. (JMP)") /obj/move_trader_landmark //You need to place the trader somewhere in the world and enable the 'move_trader' var. When the trader initializes, it will make a list of these landmarks and then move itself. name = "trader mover" diff --git a/code/modules/error_handler/error_viewer.dm b/code/modules/error_handler/error_viewer.dm index 91bb51eb950..8687e9bd660 100644 --- a/code/modules/error_handler/error_viewer.dm +++ b/code/modules/error_handler/error_viewer.dm @@ -71,7 +71,7 @@ var/global/datum/ErrorViewer/ErrorCache/error_cache = null back_to_param = ";viewruntime_backto=\ref[back_to]" if(linear) back_to_param += ";viewruntime_linear=1" - return "[html_encode(linktext)]" + return "[html_encode(linktext)]" /datum/ErrorViewer/Topic(href, href_list) if(..()) @@ -183,20 +183,20 @@ var/global/datum/ErrorViewer/ErrorCache/error_cache = null var/html = buildHeader(back_to, linear) html += "
    [html_encode(name)]
    [desc]
    " if(srcRef) - html += "
    src: VV" + html += "
    src: VV" if(ispath(srcType, /mob)) - html += " PP" - html += " Follow" + html += " PP" + html += " Follow" if(istype(srcLoc)) - html += "
    src.loc: VV" - html += " JMP" + html += "
    src.loc: VV" + html += " JMP" if(usrRef) - html += "
    usr: VV" - html += " PP" - html += " Follow" + html += "
    usr: VV" + html += " PP" + html += " Follow" if(istype(usrLoc)) - html += "
    usr.loc: VV" - html += " JMP" + html += "
    usr.loc: VV" + html += " JMP" browseTo(user, html) /datum/ErrorViewer/ErrorEntry/makeLink(var/linktext, var/datum/ErrorViewer/back_to, var/linear) diff --git a/code/modules/events/event_manager.dm b/code/modules/events/event_manager.dm index 6416a583a02..96e69623dca 100644 --- a/code/modules/events/event_manager.dm +++ b/code/modules/events/event_manager.dm @@ -18,12 +18,12 @@ popup.open() /datum/controller/subsystem/events/proc/GetInteractWindow() - var/html = "Refresh" - html += "Pause All - [CONFIG_GET(flag/allow_random_events) ? "Pause" : "Resume"]" + var/html = "Refresh" + html += "Pause All - [CONFIG_GET(flag/allow_random_events) ? "Pause" : "Resume"]" if(selected_event_container) var/event_time = max(0, selected_event_container.next_event_time - world.time) - html += "Back
    " + html += "Back
    " html += "Time till start: [round(event_time / 600, 0.1)]
    " html += "
    " html += "

    Available [severity_to_string[selected_event_container.severity]] Events (queued & running events will not be displayed)

    " @@ -33,13 +33,13 @@ for(var/datum/event_meta/EM in selected_event_container.available_events) html += "" html += "[EM.name]" - html += "[EM.weight]" + html += "[EM.weight]" html += "[EM.min_weight]" html += "[EM.max_weight]" - html += "[EM.one_shot]" - html += "[EM.enabled]" + html += "[EM.one_shot]" + html += "[EM.enabled]" html += "" + span_alert("[selected_event_container.get_weight(EM, active_with_role)]") + "" - html += "Remove" + html += "Remove" html += "" html += "" html += "
    " @@ -49,16 +49,16 @@ html += "" html += "NameTypeWeightOneShot" html += "" - html += "[new_event.name ? new_event.name : "Enter Event"]" - html += "[new_event.event_type ? new_event.event_type : "Select Type"]" - html += "[new_event.weight ? new_event.weight : 0]" - html += "[new_event.one_shot]" + html += "[new_event.name ? new_event.name : "Enter Event"]" + html += "[new_event.event_type ? new_event.event_type : "Select Type"]" + html += "[new_event.weight ? new_event.weight : 0]" + html += "[new_event.one_shot]" html += "" html += "" - html += "Add
    " + html += "Add
    " html += "" else - html += "Round End Report: [report_at_round_end ? "On": "Off"]
    " + html += "Round End Report: [report_at_round_end ? "On": "Off"]
    " html += "
    " html += "

    Event Start

    " @@ -72,16 +72,16 @@ html += "[worldtime2stationtime(max(EC.next_event_time, world.time))]" html += "[round(next_event_at / 600, 0.1)]" html += "" - html += "--" - html += "-" - html += "+" - html += "++" + html += "--" + html += "-" + html += "+" + html += "++" html += "" html += "" - html += "[EC.delayed ? "Resume" : "Pause"]" + html += "[EC.delayed ? "Resume" : "Pause"]" html += "" html += "" - html += "[EC.delay_modifier]" + html += "[EC.delay_modifier]" html += "" html += "" html += "" @@ -96,9 +96,9 @@ var/datum/event_meta/EM = EC.next_event html += "" html += "[severity_to_string[severity]]" - html += "[EM ? EM.name : "Random"]" - html += "View" - html += "Clear" + html += "[EM ? EM.name : "Random"]" + html += "View" + html += "Clear" html += "" html += "" html += "
    " @@ -119,7 +119,7 @@ html += "[EM.name]" html += "[worldtime2stationtime(ends_at)]" html += "[ends_in]" - html += "Stop" + html += "Stop" html += "" html += "" html += "" diff --git a/code/modules/events/viral_infection.dm b/code/modules/events/viral_infection.dm index 2dc0db2210d..ddb4cbde529 100644 --- a/code/modules/events/viral_infection.dm +++ b/code/modules/events/viral_infection.dm @@ -58,7 +58,7 @@ var/list/used_viruses_links = list() var/list/used_viruses_text = list() for(var/datum/disease2/disease/D in used_viruses) - used_viruses_links += "[D.name()]" + used_viruses_links += "[D.name()]" used_viruses_text += D.name() var/list/used_candidates_links = list() diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index cbf879c03d6..af6d4076395 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -204,7 +204,7 @@ Gunshots/explosions/opening doors/less rare audio (done) var/button_txt = pick(possible_txt) - mocktxt += "[button_txt]
    " + mocktxt += "[button_txt]
    " buttons -= button possible_txt -= button_txt diff --git a/code/modules/food/kitchen/cooking_machines/fryer.dm b/code/modules/food/kitchen/cooking_machines/fryer.dm index d46a841be9f..777fe3cd1d6 100644 --- a/code/modules/food/kitchen/cooking_machines/fryer.dm +++ b/code/modules/food/kitchen/cooking_machines/fryer.dm @@ -235,7 +235,7 @@ user.attack_log += text("\[[time_stamp()]\] [span_red("Has [cook_type] \the [victim] ([victim.ckey]) in \a [src]")]") victim.attack_log += text("\[[time_stamp()]\] [span_orange("Has been [cook_type] in \a [src] by [user.name] ([user.ckey])")]") - msg_admin_attack("[key_name_admin(user)] [cook_type] \the [victim] ([victim.ckey]) in \a [src]. (JMP)") + msg_admin_attack("[key_name_admin(user)] [cook_type] \the [victim] ([victim.ckey]) in \a [src]. (JMP)") //Coat the victim in some oil oil.trans_to(victim, 40) diff --git a/code/modules/food/kitchen/icecream.dm b/code/modules/food/kitchen/icecream.dm index e764fff2ec8..3cec8a3d76f 100644 --- a/code/modules/food/kitchen/icecream.dm +++ b/code/modules/food/kitchen/icecream.dm @@ -69,19 +69,19 @@ var/dat dat += span_bold("ICECREAM") + "
    " dat += span_bold("Dispensing: [flavour_name] icecream ") + "

    " - dat += span_bold("Vanilla icecream:") + " " + span_bold("Select") + " " + span_bold("Make") + " " + span_bold("x5") + " [product_types[ICECREAM_VANILLA]] scoops left. (Ingredients: milk, ice)
    " - dat += span_bold("Strawberry icecream:") + " " + span_bold("Select") + " " + span_bold("Make") + " " + span_bold("x5") + " [product_types[ICECREAM_STRAWBERRY]] dollops left. (Ingredients: milk, ice, berry juice)
    " - dat += span_bold("Chocolate icecream:") + " " + span_bold("Select") + " " + span_bold("Make") + " " + span_bold("x5") + " [product_types[ICECREAM_CHOCOLATE]] dollops left. (Ingredients: milk, ice, coco powder)
    " - dat += span_bold("Blue icecream:") + " " + span_bold("Select") + " " + span_bold("Make") + " " + span_bold("x5") + " [product_types[ICECREAM_BLUE]] dollops left. (Ingredients: milk, ice, singulo)
    " + dat += span_bold("Vanilla icecream:") + " " + span_bold("Select") + " " + span_bold("Make") + " " + span_bold("x5") + " [product_types[ICECREAM_VANILLA]] scoops left. (Ingredients: milk, ice)
    " + dat += span_bold("Strawberry icecream:") + " " + span_bold("Select") + " " + span_bold("Make") + " " + span_bold("x5") + " [product_types[ICECREAM_STRAWBERRY]] dollops left. (Ingredients: milk, ice, berry juice)
    " + dat += span_bold("Chocolate icecream:") + " " + span_bold("Select") + " " + span_bold("Make") + " " + span_bold("x5") + " [product_types[ICECREAM_CHOCOLATE]] dollops left. (Ingredients: milk, ice, coco powder)
    " + dat += span_bold("Blue icecream:") + " " + span_bold("Select") + " " + span_bold("Make") + " " + span_bold("x5") + " [product_types[ICECREAM_BLUE]] dollops left. (Ingredients: milk, ice, singulo)
    " dat += "
    " + span_bold("CONES") + "
    " - dat += span_bold("Waffle cones:") + " " + span_bold("Dispense") + " " + span_bold("Make") + " " + span_bold("x5") + " [product_types[CONE_WAFFLE]] cones left. (Ingredients: flour, sugar)
    " - dat += span_bold("Chocolate cones:") + " " + span_bold("Dispense") + " " + span_bold("Make") + " " + span_bold("x5") + " [product_types[CONE_CHOC]] cones left. (Ingredients: flour, sugar, coco powder)
    " + dat += span_bold("Waffle cones:") + " " + span_bold("Dispense") + " " + span_bold("Make") + " " + span_bold("x5") + " [product_types[CONE_WAFFLE]] cones left. (Ingredients: flour, sugar)
    " + dat += span_bold("Chocolate cones:") + " " + span_bold("Dispense") + " " + span_bold("Make") + " " + span_bold("x5") + " [product_types[CONE_CHOC]] cones left. (Ingredients: flour, sugar, coco powder)
    " dat += "
    " dat += span_bold("VAT CONTENT") + "
    " for(var/datum/reagent/R in reagents.reagent_list) dat += "[R.name]: [R.volume]" - dat += "Purge
    " - dat += "Refresh Close" + dat += "Purge
    " + dat += "Refresh Close" var/datum/browser/popup = new(user, "icecreamvat","Icecream Vat", 700, 500, src) popup.set_content(dat) diff --git a/code/modules/ghosttrap/trap.dm b/code/modules/ghosttrap/trap.dm index f587fcc6792..1032fc1356e 100644 --- a/code/modules/ghosttrap/trap.dm +++ b/code/modules/ghosttrap/trap.dm @@ -49,7 +49,7 @@ var/list/ghost_traps if(pref_check && !(O.client.prefs.be_special & pref_check)) continue if(O.client) - to_chat(O, "[request_string]Click here if you wish to play as this option.") + to_chat(O, "[request_string]Click here if you wish to play as this option.") // Handles a response to request_player(). /datum/ghosttrap/Topic(href, href_list) diff --git a/code/modules/instruments/songs/editor.dm b/code/modules/instruments/songs/editor.dm index 9f67412670f..695cd8bfee5 100644 --- a/code/modules/instruments/songs/editor.dm +++ b/code/modules/instruments/songs/editor.dm @@ -4,30 +4,30 @@ /datum/song/proc/instrument_status_ui() . = list() . += "
    " - . += span_bold("Current instrument:") + " " + . += span_bold("Current instrument:") + " " if(!using_instrument) . += span_danger("No instrument loaded!") + "
    " else . += "[using_instrument.name]
    " . += "Playback Settings:
    " if(can_noteshift) - . += "Note Shift/Note Transpose: [note_shift] keys / [round(note_shift / 12, 0.01)] octaves
    " + . += "Note Shift/Note Transpose: [note_shift] keys / [round(note_shift / 12, 0.01)] octaves
    " var/smt var/modetext = "" switch(sustain_mode) if(SUSTAIN_LINEAR) smt = "Linear" - modetext = "Linear Sustain Duration: [sustain_linear_duration / 10] seconds
    " + modetext = "Linear Sustain Duration: [sustain_linear_duration / 10] seconds
    " if(SUSTAIN_EXPONENTIAL) smt = "Exponential" - modetext = "Exponential Falloff Factor: [sustain_exponential_dropoff]% per decisecond
    " - . += "Sustain Mode: [smt]
    " + modetext = "Exponential Falloff Factor: [sustain_exponential_dropoff]% per decisecond
    " + . += "Sustain Mode: [smt]
    " . += modetext . += using_instrument?.ready()? ("Status: " + span_green("Ready") + "
    ") : ("Status: " + span_red("!Instrument Definition Error!") + "
    ") . += "Instrument Type: [legacy? "Legacy" : "Synthesized"]
    " - . += "Volume: [volume]
    " - . += "Volume Dropoff Threshold: [sustain_dropoff_volume]
    " - . += "Sustain indefinitely last held note: [full_sustain_held_note? "Enabled" : "Disabled"].
    " + . += "Volume: [volume]
    " + . += "Volume Dropoff Threshold: [sustain_dropoff_volume]
    " + . += "Sustain indefinitely last held note: [full_sustain_held_note? "Enabled" : "Disabled"].
    " . += "
    " /datum/song/proc/interact(mob/user) @@ -38,31 +38,31 @@ if(lines.len > 0) dat += "

    Playback

    " if(!playing) - dat += "Play " + span_linkOn("Stop") + "

    " + dat += "Play " + span_linkOn("Stop") + "

    " dat += "Repeat Song: " - dat += repeat > 0 ? "--" : (span_linkOff("-") + span_linkOff("-")) + dat += repeat > 0 ? "--" : (span_linkOff("-") + span_linkOff("-")) dat += " [repeat] times " - dat += repeat < max_repeats ? "++" : (span_linkOff("+") + span_linkOff("+")) + dat += repeat < max_repeats ? "++" : (span_linkOff("+") + span_linkOff("+")) dat += "
    " else - dat += span_linkOn("Play") + " Stop
    " + dat += span_linkOn("Play") + " Stop
    " dat += "Repeats left: " + span_bold("[repeat]") + "
    " if(!editing) - dat += "
    " + span_bold("Show Editor") + "
    " + dat += "
    " + span_bold("Show Editor") + "
    " else dat += "

    Editing

    " - dat += span_bold("Hide Editor") - dat += " Start a New Song" - dat += " Import a Song

    " + dat += span_bold("Hide Editor") + dat += " Start a New Song" + dat += " Import a Song

    " var/bpm = round(600 / tempo) - dat += "Tempo: - [bpm] BPM +

    " + dat += "Tempo: - [bpm] BPM +

    " var/linecount = 0 for(var/line in lines) linecount += 1 - dat += "Line [linecount]: Edit X [line]
    " - dat += "Add Line

    " + dat += "Line [linecount]: Edit X [line]
    " + dat += "Add Line

    " if(help) - dat += span_bold("Hide Help") + "
    " + dat += span_bold("Hide Help") + "
    " dat += {" Lines are a series of chords, separated by commas (,), each with notes separated by hyphens (-).
    Every note in a chord will play together, with chord timed by the tempo.
    @@ -81,7 +81,7 @@ A song may only contain up to [MUSIC_MAXLINES] lines.
    "} else - dat += span_bold("Show Help") + "
    " + dat += span_bold("Show Help") + "
    " var/datum/browser/popup = new(user, "instrument", parent?.name || "instrument", 700, 500) popup.set_content(dat.Join("")) diff --git a/code/modules/integrated_electronics/core/special_pins/list_pin.dm b/code/modules/integrated_electronics/core/special_pins/list_pin.dm index 7f7c836d840..4a8ae54035c 100644 --- a/code/modules/integrated_electronics/core/special_pins/list_pin.dm +++ b/code/modules/integrated_electronics/core/special_pins/list_pin.dm @@ -11,17 +11,17 @@ var/list/my_list = data var/t = "

    [src]


    " t += "List length: [my_list.len]
    " - t += "\[Refresh\] | " - t += "\[Add\] | " - t += "\[Swap\] | " - t += "\[Clear\]
    " + t += "\[Refresh\] | " + t += "\[Add\] | " + t += "\[Swap\] | " + t += "\[Clear\]
    " t += "
    " var/i = 0 for(var/line in my_list) i++ t += "#[i] | [display_data(line)] | " - t += "\[Edit\] | " - t += "\[Remove\]
    " + t += "\[Edit\] | " + t += "\[Remove\]
    " user << browse(t, "window=list_pin_\ref[src];size=500x400") /datum/integrated_io/list/proc/add_to_list(mob/user, var/new_entry) diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index 45598b0126d..e224dc3c4c2 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -318,16 +318,16 @@ Book Cart End var/obj/item/W = pages[page] // first if(page == 1) - dat+= "" - dat+= "

    " + dat+= "" + dat+= "

    " // last else if(page == pages.len) - dat+= "" - dat+= "

    " + dat+= "" + dat+= "

    " // middle pages else - dat+= "" - dat+= "

    " + dat+= "" + dat+= "

    " if(istype(pages[page], /obj/item/paper)) var/obj/item/paper/P = W if(!(istype(usr, /mob/living/carbon/human) || isobserver(usr) || istype(usr, /mob/living/silicon))) diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index 06edbb03315..c9bc2e8deda 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -38,10 +38,10 @@ switch(screenstate) if(0) dat += {"

    Search Settings


    - Filter by Title: [title]
    - Filter by Category: [category]
    - Filter by Author: [author]
    - \[Start Search\]
    "} + Filter by Title: [title]
    + Filter by Category: [category]
    + Filter by Author: [author]
    + \[Start Search\]
    "} if(1) establish_db_connection() if(!dbcon_old.IsConnected()) @@ -62,7 +62,7 @@ var/id = query.item[4] dat += "[author][title][category][id]" dat += "
    " - dat += "\[Go Back\]
    " + dat += "\[Go Back\]
    " user << browse(dat, "window=publiclibrary") onclose(user, "publiclibrary") @@ -174,15 +174,15 @@ switch(screenstate) if(0) // Main Menu //VOREStation Edit start - dat += {"1. View General Inventory
    - 2. View Checked Out Inventory
    - 3. Check out a Book
    - 4. Connect to Internal Archive
    - 5. Upload New Title to Archive
    - 6. Print a Bible
    - 8. Access External Archive
    "} //VOREStation Edit end + dat += {"1. View General Inventory
    + 2. View Checked Out Inventory
    + 3. Check out a Book
    + 4. Connect to Internal Archive
    + 5. Upload New Title to Archive
    + 6. Print a Bible
    + 8. Access External Archive
    "} //VOREStation Edit end if(src.emagged) - dat += "7. Access the Forbidden Lore Vault
    " + dat += "7. Access the Forbidden Lore Vault
    " if(src.arcanecheckout) new /obj/item/book/tome(src.loc) var/datum/gender/T = gender_datums[user.get_visible_gender()] @@ -193,8 +193,8 @@ // Inventory dat += "

    Inventory


    " for(var/obj/item/book/b in inventory) - dat += "[b.name] (Delete)
    " - dat += "(Return to main menu)
    " + dat += "[b.name] (Delete)
    " + dat += "(Return to main menu)
    " if(2) // Checked Out dat += "

    Checked Out Books


    " @@ -211,27 +211,27 @@ else timedue = round(timedue) dat += {"\"[b.bookname]\", Checked out to: [b.mobname]
    --- Taken: [timetaken] minutes ago, Due: in [timedue] minutes
    - (Check In)

    "} - dat += "(Return to main menu)
    " + (Check In)

    "} + dat += "(Return to main menu)
    " if(3) // Check Out a Book dat += {"

    Check Out a Book


    Book: [src.buffer_book] - \[Edit\]
    + \[Edit\]
    Recipient: [src.buffer_mob] - \[Edit\]
    + \[Edit\]
    Checkout Date : [world.time/600]
    Due Date: [(world.time + checkoutperiod)/600]
    - (Checkout Period: [checkoutperiod] minutes) (+/-) - (Commit Entry)
    - (Return to main menu)
    "} + (Checkout Period: [checkoutperiod] minutes) (+/-) + (Commit Entry)
    + (Return to main menu)
    "} if(4) dat += "

    Internal Archive

    " if(!all_books || !all_books.len) dat += span_red(span_bold("ERROR") + " Something has gone seriously wrong. Contact System Administrator for more information.") else dat += {" - "} for(var/name in all_books) var/obj/item/book/masterbook = all_books[name] @@ -239,9 +239,9 @@ var/author = masterbook.author var/title = masterbook.name var/category = masterbook.libcategory - dat += "" + dat += "" dat += "
    TITLEAUTHORCATEGORY
    [author][title][category]\[Order\]
    [author][title][category]\[Order\]
    " - dat += "
    (Return to main menu)
    " + dat += "
    (Return to main menu)
    " if(5) //dat += "

    ERROR

    " //VOREStation Removal //dat+= span_red("Library Database is in Secure Management Mode.") + "
    \ //VOREStation Removal @@ -261,16 +261,16 @@ Title: [scanner.cache.name]
    "} if(!scanner.cache.author) scanner.cache.author = "Anonymous" - dat += {"Author: [scanner.cache.author]
    - Category: [upload_category]
    - \[Upload\]
    "} + dat += {"Author: [scanner.cache.author]
    + Category: [upload_category]
    + \[Upload\]
    "} //VOREStation Edit End - dat += "(Return to main menu)
    " + dat += "(Return to main menu)
    " if(7) dat += {"

    Accessing Forbidden Lore Vault v 1.3

    Are you absolutely sure you want to proceed? EldritchTomes Inc. takes no responsibilities for loss of sanity resulting from this action.

    - Yes.
    - No.
    "} + Yes.
    + No.
    "} if(8) dat += "

    External Archive

    " //VOREStation Edit establish_db_connection() @@ -280,9 +280,9 @@ if(!dbcon_old.IsConnected()) dat += span_red(span_bold("ERROR") + ": Unable to contact External Archive. Please contact your system administrator for assistance.") else - dat += {"(Order book by SS13BN)

    + dat += {"(Order book by SS13BN)

    - "} var/DBQuery/query = dbcon_old.NewQuery("SELECT id, author, title, category FROM library ORDER BY [sortby]") query.Execute() @@ -293,14 +293,14 @@ var/author = query.item[2] var/title = query.item[3] var/category = query.item[4] - dat += "" dat += "
    TITLEAUTHORCATEGORY
    [author][title][category]\[Order\]" + dat += "
    [author][title][category]\[Order\]" if(show_admin_options) // This isn't the only check, since you can just href-spoof press this button. Just to tidy things up. - dat += "\[Del\]" + dat += "\[Del\]" dat += "
    " - dat += "
    (Return to main menu)
    " + dat += "
    (Return to main menu)
    " - //dat += "Close

    " + //dat += "Close

    " user << browse(dat, "window=library") onclose(user, "library") @@ -321,9 +321,9 @@ if(!dbcon_old.IsConnected()) dat += span_red(span_bold("ERROR") + ": Unable to contact External Archive. Please contact your system administrator for assistance.") else - dat += {"(Order book by SS13BN)

    + dat += {"(Order book by SS13BN)

    - "} var/DBQuery/query = dbcon_old.NewQuery("SELECT id, author, title, category FROM library ORDER BY [sortby]") query.Execute() @@ -332,10 +332,10 @@ var/author = query.item[2] var/title = query.item[3] var/category = query.item[4] - dat += "" dat += "
    TITLEAUTHORCATEGORY
    [author][title][category]\[Del\]" + dat += "
    [author][title][category]\[Del\]" dat += "
    " - dat += "
    (Return to main menu)
    " + dat += "
    (Return to main menu)
    " user << browse(dat, "window=library") onclose(user, "library") @@ -539,9 +539,9 @@ dat += span_darkgray("Data stored in memory.") + "
    " else dat += "No data stored in memory.
    " - dat += "\[Scan\]" + dat += "\[Scan\]" if(cache) - dat += " \[Clear Memory\]

    \[Remove Book\]" + dat += " \[Clear Memory\]

    \[Remove Book\]" else dat += "
    " user << browse(dat, "window=scanner") diff --git a/code/modules/lore_codex/codex_tree.dm b/code/modules/lore_codex/codex_tree.dm index c6c00643f8d..9c49b6ecf00 100644 --- a/code/modules/lore_codex/codex_tree.dm +++ b/code/modules/lore_codex/codex_tree.dm @@ -73,7 +73,7 @@ var/output = "" output = span_bold("[checked.name]") while(checked.parent) - output = "[checked.parent.name] \> [output]" + output = "[checked.parent.name] \> [output]" checked = checked.parent return output @@ -129,16 +129,16 @@ dat += "
    " var/datum/lore/codex/category/C = D for(var/datum/lore/codex/child in C.children) - dat += "[child.name]" + dat += "[child.name]" dat += "
    " dat += "
    " var/list/H = history["[user]"] if(LAZYLEN(H)) - dat += "
    \[Go Back\]" + dat += "
    \[Go Back\]" if(D.parent) - dat += "
    \[Go Up\]" + dat += "
    \[Go Up\]" if(D != home) - dat += "
    \[Go To Home\]" + dat += "
    \[Go To Home\]" dat += "" user << browse(dat, "window=the_empress_protects;size=600x550") onclose(user, "the_empress_protects", src) diff --git a/code/modules/lore_codex/pages.dm b/code/modules/lore_codex/pages.dm index 88d2379809b..c4b7953f627 100644 --- a/code/modules/lore_codex/pages.dm +++ b/code/modules/lore_codex/pages.dm @@ -38,7 +38,7 @@ /datum/lore/codex/proc/quick_link(var/target, var/word_to_display) if(isnull(word_to_display)) word_to_display = target - return "[word_to_display]" + return "[word_to_display]" // Can only be found by specifically searching for it. /datum/lore/codex/page/ultimate_answer @@ -63,4 +63,4 @@ // Now get our children. If a child is also a category, it will get their children too. for(var/datum/lore/codex/child in children) results += child.index_page() - return results \ No newline at end of file + return results diff --git a/code/modules/mentor/mentor.dm b/code/modules/mentor/mentor.dm index c6524130aa0..f02cfdc8fb4 100644 --- a/code/modules/mentor/mentor.dm +++ b/code/modules/mentor/mentor.dm @@ -252,7 +252,7 @@ var/list/mentor_verbs_default = list( if (src.current_mentorhelp) src.current_mentorhelp.AddInteraction(interaction_message) - to_chat(recipient, span_mentor(span_italics("Mentor-PM from-[src]: [msg]"))) + to_chat(recipient, span_mentor(span_italics("Mentor-PM from-[src]: [msg]"))) to_chat(src, span_mentor(span_italics("Mentor-PM to-[recipient]: [msg]"))) log_admin("[key_name(src)]->[key_name(recipient)]: [msg]") diff --git a/code/modules/mentor/mentorhelp.dm b/code/modules/mentor/mentorhelp.dm index 2d748823ce1..9e009243e05 100644 --- a/code/modules/mentor/mentorhelp.dm +++ b/code/modules/mentor/mentorhelp.dm @@ -53,9 +53,9 @@ GLOBAL_DATUM_INIT(mhelp_tickets, /datum/mentor_help_tickets, new) if(!l2b) return var/list/dat = list("[title]") - dat += "Refresh

    " + dat += "Refresh

    " for(var/datum/mentor_help/MH as anything in l2b) - dat += span_adminnotice(span_adminhelp("Ticket #[MH.id]") + " [MH.initiator_ckey]: [MH.name]") + "
    " + dat += span_adminnotice(span_adminhelp("Ticket #[MH.id]") + " [MH.initiator_ckey]: [MH.name]") + "
    " usr << browse(dat.Join(), "window=mhelp_list[state];size=600x480") @@ -179,24 +179,24 @@ GLOBAL_DATUM_INIT(mhelp_tickets, /datum/mentor_help_tickets, new) /datum/mentor_help/proc/ClosureLinks(ref_src) if(!ref_src) ref_src = "\ref[src]" - . = " (RSLVE)" + . = " (RSLVE)" //private /datum/mentor_help/proc/LinkedReplyName(ref_src) if(!ref_src) ref_src = "\ref[src]" - return "[initiator_ckey]" + return "[initiator_ckey]" //private /datum/mentor_help/proc/TicketHref(msg, ref_src, action = "ticket") if(!ref_src) ref_src = "\ref[src]" - return "[msg]" + return "[msg]" //message from the initiator without a target, all people with mentor powers will see this /datum/mentor_help/proc/MessageNoRecipient(msg) var/ref_src = "\ref[src]" - var/chat_msg = span_notice("(ESCALATE) Ticket [TicketHref("#[id]", ref_src)]: [LinkedReplyName(ref_src)]: [msg]") + var/chat_msg = span_notice("(ESCALATE) Ticket [TicketHref("#[id]", ref_src)]: [LinkedReplyName(ref_src)]: [msg]") AddInteraction("[LinkedReplyName(ref_src)]: [msg]") for (var/client/C in GLOB.mentors) if (C.prefs?.read_preference(/datum/preference/toggle/play_mentorhelp_ping)) @@ -375,7 +375,7 @@ GLOBAL_DATUM_INIT(mhelp_tickets, /datum/mentor_help_tickets, new) if(state == AHELP_ACTIVE) . += ClosureLinks(ref_src) if(state != AHELP_RESOLVED) - . += " (ESCALATE)" + . += " (ESCALATE)" //Forwarded action from admin/Topic OR mentor/Topic depending on which rank the caller has /datum/mentor_help/proc/Action(action) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 375e4aea720..af7715b656b 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -258,9 +258,9 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp var/turf/location = get_turf(src) var/special_role = check_special_role() if(!istype(loc,/obj/machinery/cryopod)) - log_and_message_admins("has ghosted outside cryo[special_role ? " as [special_role]" : ""]. (JMP)",usr) + log_and_message_admins("has ghosted outside cryo[special_role ? " as [special_role]" : ""]. (JMP)",usr) else if(special_role) - log_and_message_admins("has ghosted in cryo as [special_role]. (JMP)",usr) + log_and_message_admins("has ghosted in cryo as [special_role]. (JMP)",usr) var/mob/observer/dead/ghost = ghostize(0) // 0 parameter is so we can never re-enter our body, "Charlie, you can never come baaaack~" :3 if(ghost) ghost.timeofdeath = world.time // Because the living mob won't have a time of death and we want the respawn timer to work properly. @@ -1063,7 +1063,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp to_chat(src, span_ghostalert("[message]")) if(source) throw_alert("\ref[source]_notify_revive", /obj/screen/alert/notify_cloning, new_master = source) - to_chat(src, span_ghostalert("(Click to re-enter)")) + to_chat(src, span_ghostalert("(Click to re-enter)")) if(sound) SEND_SOUND(src, sound(sound)) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 90156f2f5ef..120c24680bb 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -376,7 +376,7 @@ var/list/_simple_mob_default_emotes = list( HTML += TextPreview(flavor_texts["feet"]) HTML += "
    " HTML += "
    " - HTML +="\[Done\]" + HTML +="\[Done\]" HTML += "" src << browse(HTML, "window=flavor_changes;size=430x300") diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 80dabf789d2..7285ef5c41d 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -119,20 +119,20 @@ else for(var/obj/item/clothing/accessory/A in U.accessories) if(A.concealed_holster == 0 && A.show_examine) - accessory_descs += "\a [A]" + accessory_descs += "\a [A]" tie_msg += " [lowertext(english_list(accessory_descs))]." if(w_uniform.blood_DNA) - msg += span_warning("[T.He] [T.is] wearing [icon2html(w_uniform,user.client)] [w_uniform.gender==PLURAL?"some":"a"] [(w_uniform.blood_color != "#030303") ? "blood" : "oil"]-stained [w_uniform.name]![tie_msg]") + msg += span_warning("[T.He] [T.is] wearing [icon2html(w_uniform,user.client)] [w_uniform.gender==PLURAL?"some":"a"] [(w_uniform.blood_color != "#030303") ? "blood" : "oil"]-stained [w_uniform.name]![tie_msg]") else - msg += "[T.He] [T.is] wearing [icon2html(w_uniform,user.client)] \a [w_uniform].[tie_msg]" + msg += "[T.He] [T.is] wearing [icon2html(w_uniform,user.client)] \a [w_uniform].[tie_msg]" //head if(head && !(skip_gear & EXAMINE_SKIPHELMET) && head.show_examine) if(head.blood_DNA) - msg += span_warning("[T.He] [T.is] wearing [icon2html(head,user.client)] [head.gender==PLURAL?"some":"a"] [(head.blood_color != "#030303") ? "blood" : "oil"]-stained [head.name] on [T.his] head!") + msg += span_warning("[T.He] [T.is] wearing [icon2html(head,user.client)] [head.gender==PLURAL?"some":"a"] [(head.blood_color != "#030303") ? "blood" : "oil"]-stained [head.name] on [T.his] head!") else - msg += "[T.He] [T.is] wearing [icon2html(head,user.client)] \a [head] on [T.his] head." + msg += "[T.He] [T.is] wearing [icon2html(head,user.client)] \a [head] on [T.his] head." //suit/armour if(wear_suit) @@ -143,41 +143,41 @@ tie_msg += ". Attached to it is" var/list/accessory_descs = list() for(var/accessory in U.accessories) - accessory_descs += "\a [accessory]" + accessory_descs += "\a [accessory]" tie_msg += " [lowertext(english_list(accessory_descs))]." if(wear_suit.blood_DNA) - msg += span_warning("[T.He] [T.is] wearing [icon2html(wear_suit,user.client)] [wear_suit.gender==PLURAL?"some":"a"] [(wear_suit.blood_color != "#030303") ? "blood" : "oil"]-stained [wear_suit.name]![tie_msg]") + msg += span_warning("[T.He] [T.is] wearing [icon2html(wear_suit,user.client)] [wear_suit.gender==PLURAL?"some":"a"] [(wear_suit.blood_color != "#030303") ? "blood" : "oil"]-stained [wear_suit.name]![tie_msg]") else - msg += "[T.He] [T.is] wearing [icon2html(wear_suit,user.client)] \a [wear_suit].[tie_msg]" + msg += "[T.He] [T.is] wearing [icon2html(wear_suit,user.client)] \a [wear_suit].[tie_msg]" //suit/armour storage if(s_store && !(skip_gear & EXAMINE_SKIPSUITSTORAGE) && s_store.show_examine) if(s_store.blood_DNA) - msg += span_warning("[T.He] [T.is] carrying [icon2html(s_store,user.client)] [s_store.gender==PLURAL?"some":"a"] [(s_store.blood_color != "#030303") ? "blood" : "oil"]-stained [s_store.name] on [T.his] [wear_suit.name]!") + msg += span_warning("[T.He] [T.is] carrying [icon2html(s_store,user.client)] [s_store.gender==PLURAL?"some":"a"] [(s_store.blood_color != "#030303") ? "blood" : "oil"]-stained [s_store.name] on [T.his] [wear_suit.name]!") else - msg += "[T.He] [T.is] carrying [icon2html(s_store,user.client)] \a [s_store] on [T.his] [wear_suit.name]." + msg += "[T.He] [T.is] carrying [icon2html(s_store,user.client)] \a [s_store] on [T.his] [wear_suit.name]." //back if(back && !(skip_gear & EXAMINE_SKIPBACKPACK) && back.show_examine) if(back.blood_DNA) - msg += span_warning("[T.He] [T.has] [icon2html(back,user.client)] [back.gender==PLURAL?"some":"a"] [(back.blood_color != "#030303") ? "blood" : "oil"]-stained [back] on [T.his] back.") + msg += span_warning("[T.He] [T.has] [icon2html(back,user.client)] [back.gender==PLURAL?"some":"a"] [(back.blood_color != "#030303") ? "blood" : "oil"]-stained [back] on [T.his] back.") else - msg += "[T.He] [T.has] [icon2html(back,user.client)] \a [back] on [T.his] back." + msg += "[T.He] [T.has] [icon2html(back,user.client)] \a [back] on [T.his] back." //left hand if(l_hand && l_hand.show_examine) if(l_hand.blood_DNA) - msg += span_warning("[T.He] [T.is] holding [icon2html(l_hand,user.client)] [l_hand.gender==PLURAL?"some":"a"] [(l_hand.blood_color != "#030303") ? "blood" : "oil"]-stained [l_hand.name] in [T.his] left hand!") + msg += span_warning("[T.He] [T.is] holding [icon2html(l_hand,user.client)] [l_hand.gender==PLURAL?"some":"a"] [(l_hand.blood_color != "#030303") ? "blood" : "oil"]-stained [l_hand.name] in [T.his] left hand!") else - msg += "[T.He] [T.is] holding [icon2html(l_hand,user.client)] \a [l_hand] in [T.his] left hand." + msg += "[T.He] [T.is] holding [icon2html(l_hand,user.client)] \a [l_hand] in [T.his] left hand." //right hand if(r_hand && r_hand.show_examine) if(r_hand.blood_DNA) - msg += span_warning("[T.He] [T.is] holding [icon2html(r_hand,user.client)] [r_hand.gender==PLURAL?"some":"a"] [(r_hand.blood_color != "#030303") ? "blood" : "oil"]-stained [r_hand.name] in [T.his] right hand!") + msg += span_warning("[T.He] [T.is] holding [icon2html(r_hand,user.client)] [r_hand.gender==PLURAL?"some":"a"] [(r_hand.blood_color != "#030303") ? "blood" : "oil"]-stained [r_hand.name] in [T.his] right hand!") else - msg += "[T.He] [T.is] holding [icon2html(r_hand,user.client)] \a [r_hand] in [T.his] right hand." + msg += "[T.He] [T.is] holding [icon2html(r_hand,user.client)] \a [r_hand] in [T.his] right hand." //gloves if(gloves && !(skip_gear & EXAMINE_SKIPGLOVES) && gloves.show_examine) @@ -188,13 +188,13 @@ gloves_acc_msg += ". Attached to it is" var/list/accessory_descs = list() for(var/obj/item/clothing/accessory/A in G.accessories) - accessory_descs += "\a [A]" + accessory_descs += "\a [A]" gloves_acc_msg += " [lowertext(english_list(accessory_descs))]." if(gloves.blood_DNA) - msg += span_warning("[T.He] [T.has] [icon2html(gloves,user.client)] [gloves.gender==PLURAL?"some":"a"] [(gloves.blood_color != "#030303") ? "blood" : "oil"]-stained [gloves.name] on [T.his] hands![gloves_acc_msg]") + msg += span_warning("[T.He] [T.has] [icon2html(gloves,user.client)] [gloves.gender==PLURAL?"some":"a"] [(gloves.blood_color != "#030303") ? "blood" : "oil"]-stained [gloves.name] on [T.his] hands![gloves_acc_msg]") else - msg += "[T.He] [T.has] [icon2html(gloves,user.client)] \a [gloves] on [T.his] hands.[gloves_acc_msg]" + msg += "[T.He] [T.has] [icon2html(gloves,user.client)] \a [gloves] on [T.his] hands.[gloves_acc_msg]" else if(blood_DNA && !(skip_body & EXAMINE_SKIPHANDS)) msg += span_warning("[T.He] [T.has] [(hand_blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained hands!") @@ -213,16 +213,16 @@ //belt if(belt && !(skip_gear & EXAMINE_SKIPBELT) && belt.show_examine) if(belt.blood_DNA) - msg += span_warning("[T.He] [T.has] [icon2html(belt,user.client)] [belt.gender==PLURAL?"some":"a"] [(belt.blood_color != "#030303") ? "blood" : "oil"]-stained [belt.name] about [T.his] waist!") + msg += span_warning("[T.He] [T.has] [icon2html(belt,user.client)] [belt.gender==PLURAL?"some":"a"] [(belt.blood_color != "#030303") ? "blood" : "oil"]-stained [belt.name] about [T.his] waist!") else - msg += "[T.He] [T.has] [icon2html(belt,user.client)] \a [belt] about [T.his] waist." + msg += "[T.He] [T.has] [icon2html(belt,user.client)] \a [belt] about [T.his] waist." //shoes if(shoes && !(skip_gear & EXAMINE_SKIPSHOES) && shoes.show_examine) if(shoes.blood_DNA) - msg += span_warning("[T.He] [T.is] wearing [icon2html(shoes,user.client)] [shoes.gender==PLURAL?"some":"a"] [(shoes.blood_color != "#030303") ? "blood" : "oil"]-stained [shoes.name] on [T.his] feet!") + msg += span_warning("[T.He] [T.is] wearing [icon2html(shoes,user.client)] [shoes.gender==PLURAL?"some":"a"] [(shoes.blood_color != "#030303") ? "blood" : "oil"]-stained [shoes.name] on [T.his] feet!") else - msg += "[T.He] [T.is] wearing [icon2html(shoes,user.client)] \a [shoes] on [T.his] feet." + msg += "[T.He] [T.is] wearing [icon2html(shoes,user.client)] \a [shoes] on [T.his] feet." else if(feet_blood_DNA && !(skip_body & EXAMINE_SKIPHANDS)) msg += span_warning("[T.He] [T.has] [(feet_blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained feet!") @@ -233,28 +233,28 @@ descriptor = "in [T.his] mouth" if(wear_mask.blood_DNA) - msg += span_warning("[T.He] [T.has] [icon2html(wear_mask,user.client)] [wear_mask.gender==PLURAL?"some":"a"] [(wear_mask.blood_color != "#030303") ? "blood" : "oil"]-stained [wear_mask.name] [descriptor]!") + msg += span_warning("[T.He] [T.has] [icon2html(wear_mask,user.client)] [wear_mask.gender==PLURAL?"some":"a"] [(wear_mask.blood_color != "#030303") ? "blood" : "oil"]-stained [wear_mask.name] [descriptor]!") else - msg += "[T.He] [T.has] [icon2html(wear_mask,user.client)] \a [wear_mask] [descriptor]." + msg += "[T.He] [T.has] [icon2html(wear_mask,user.client)] \a [wear_mask] [descriptor]." //eyes if(glasses && !(skip_gear & EXAMINE_SKIPEYEWEAR) && glasses.show_examine) if(glasses.blood_DNA) - msg += span_warning("[T.He] [T.has] [icon2html(glasses,user.client)] [glasses.gender==PLURAL?"some":"a"] [(glasses.blood_color != "#030303") ? "blood" : "oil"]-stained [glasses] covering [T.his] eyes!") + msg += span_warning("[T.He] [T.has] [icon2html(glasses,user.client)] [glasses.gender==PLURAL?"some":"a"] [(glasses.blood_color != "#030303") ? "blood" : "oil"]-stained [glasses] covering [T.his] eyes!") else - msg += "[T.He] [T.has] [icon2html(glasses,user.client)] \a [glasses] covering [T.his] eyes." + msg += "[T.He] [T.has] [icon2html(glasses,user.client)] \a [glasses] covering [T.his] eyes." //left ear if(l_ear && !(skip_gear & EXAMINE_SKIPEARS) && l_ear.show_examine) - msg += "[T.He] [T.has] [icon2html(l_ear,user.client)] \a [l_ear] on [T.his] left ear." + msg += "[T.He] [T.has] [icon2html(l_ear,user.client)] \a [l_ear] on [T.his] left ear." //right ear if(r_ear && !(skip_gear & EXAMINE_SKIPEARS) && r_ear.show_examine) - msg += "[T.He] [T.has] [icon2html(r_ear,user.client)] \a [r_ear] on [T.his] right ear." + msg += "[T.He] [T.has] [icon2html(r_ear,user.client)] \a [r_ear] on [T.his] right ear." //ID if(wear_id && wear_id.show_examine) - msg += "[T.He] [T.is] wearing [icon2html(wear_id,user.client)]\a [wear_id]." + msg += "[T.He] [T.is] wearing [icon2html(wear_id,user.client)]\a [wear_id]." //Jitters if(is_jittery) @@ -409,8 +409,8 @@ if(R.fields["name"] == perpname) criminal = R.fields["criminal"] - msg += "Criminal status: \[[criminal]\]" - msg += "Security records: \[View\] \[Add comment\]" + msg += "Criminal status: \[[criminal]\]" + msg += "Security records: \[View\] \[Add comment\]" if(hasHUD(user,"medical")) var/perpname = name @@ -428,11 +428,11 @@ if (R.fields["name"] == perpname) medical = R.fields["p_stat"] - msg += "Physical status: \[[medical]\]" - msg += "Medical records: \[View\] \[Add comment\]" + msg += "Physical status: \[[medical]\]" + msg += "Medical records: \[View\] \[Add comment\]" if(hasHUD(user,"best")) - msg += "Employment records: \[View\] \[Add comment\]" + msg += "Employment records: \[View\] \[Add comment\]" var/flavor_text = print_flavor_text() @@ -444,8 +444,8 @@ msg += "Custom link: " + span_linkify("[custom_link]") if(ooc_notes) - msg += "OOC Notes: \[View\] - \[Print\]" - msg += "\[Mechanical Vore Preferences\]" + msg += "OOC Notes: \[View\] - \[Print\]" + msg += "\[Mechanical Vore Preferences\]" // VOREStation End msg = list(span_info(jointext(msg, "
    "))) if(applying_pressure) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index a0e41c8ab4c..1471229c135 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -450,7 +450,7 @@ security_hud_text += span_bold("Major Crimes:") + " [R.fields["ma_crim"]]" security_hud_text += span_bold("Details:") + " [R.fields["ma_crim_d"]]" security_hud_text += span_bold("Notes:") + " [R.fields["notes"]]" - security_hud_text += "\[View Comment Log\]" + security_hud_text += "\[View Comment Log\]" to_chat(usr, span_filter_notice("[jointext(security_hud_text, "
    ")]")) read = 1 @@ -479,7 +479,7 @@ counter++ if (counter == 1) to_chat(usr, span_filter_notice("No comment found.")) - to_chat(usr, span_filter_notice("\[Add comment\]")) + to_chat(usr, span_filter_notice("\[Add comment\]")) if(!read) to_chat(usr, span_filter_notice("[span_red("Unable to locate a data core entry for this person.")]")) @@ -570,7 +570,7 @@ medical_hud_text += span_bold("Major Disabilities:") + " [R.fields["ma_dis"]]" medical_hud_text += span_bold("Details:") + " [R.fields["ma_dis_d"]]" medical_hud_text += span_bold("Notes:") + " [R.fields["notes"]]" - medical_hud_text += "\[View Comment Log\]" + medical_hud_text += "\[View Comment Log\]" to_chat(usr, span_filter_notice("[jointext(medical_hud_text, "
    ")]")) read = 1 @@ -599,7 +599,7 @@ counter++ if (counter == 1) to_chat(usr, span_filter_notice("No comment found.")) - to_chat(usr, span_filter_notice("\[Add comment\]")) + to_chat(usr, span_filter_notice("\[Add comment\]")) if(!read) to_chat(usr, span_filter_notice("[span_red("Unable to locate a data core entry for this person.")]")) @@ -656,7 +656,7 @@ emp_hud_text += span_bold("Religious Beliefs:") + " [R.fields["religion"]]" emp_hud_text += span_bold("Known Languages:") + " [R.fields["languages"]]" emp_hud_text += span_bold("Notes:") + " [R.fields["notes"]]" - emp_hud_text += "\[View Comment Log\]" + emp_hud_text += "\[View Comment Log\]" to_chat(usr, span_filter_notice("[jointext(emp_hud_text, "
    ")]")) read = 1 @@ -685,7 +685,7 @@ counter++ if (counter == 1) to_chat(usr, span_filter_notice("No comment found.")) - to_chat(usr, span_filter_notice("\[Add comment\]")) + to_chat(usr, span_filter_notice("\[Add comment\]")) if(!read) to_chat(usr, span_filter_notice("[span_red("Unable to locate a data core entry for this person.")]")) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index cbedd7d3923..90bdef8fdd7 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -1248,15 +1248,15 @@ /mob/living/vv_get_header() . = ..() . += {" - [src] -
    [ckey ? ckey : "No ckey"] / [real_name ? real_name : "No real name"] + [src] +
    [ckey ? ckey : "No ckey"] / [real_name ? real_name : "No real name"]
    - BRUTE:[getBruteLoss()] - FIRE:[getFireLoss()] - TOXIN:[getToxLoss()] - OXY:[getOxyLoss()] - CLONE:[getCloneLoss()] - BRAIN:[getBrainLoss()] + BRUTE:[getBruteLoss()] + FIRE:[getFireLoss()] + TOXIN:[getToxLoss()] + OXY:[getOxyLoss()] + CLONE:[getCloneLoss()] + BRAIN:[getBrainLoss()]
    "} diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm index 1778cdc92ac..c086fd9bde4 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm @@ -132,7 +132,7 @@ trashman.reset_view(src) START_PROCESSING(SSobj, src) user.visible_message(span_warning("[hound.name]'s [src.name] groans lightly as [trashman] slips inside."), span_notice("Your [src.name] groans lightly as [trashman] slips inside.")) - log_admin("[key_name(hound)] has eaten [key_name(patient)] with a cyborg belly. ([hound ? "JMP" : "null"])") + log_admin("[key_name(hound)] has eaten [key_name(patient)] with a cyborg belly. ([hound ? "JMP" : "null"])") playsound(src, gulpsound, vol = 100, vary = 1, falloff = 0.1, preference = /datum/preference/toggle/eating_noises) if(delivery) if(islist(deliverylists[delivery_tag])) @@ -163,7 +163,7 @@ update_patient() START_PROCESSING(SSobj, src) user.visible_message(span_warning("[hound.name]'s [src.name] lights up as [H.name] slips inside."), span_notice("Your [src] lights up as [H] slips inside. Life support functions engaged.")) - log_admin("[key_name(hound)] has eaten [key_name(patient)] with a cyborg belly. ([hound ? "JMP" : "null"])") + log_admin("[key_name(hound)] has eaten [key_name(patient)] with a cyborg belly. ([hound ? "JMP" : "null"])") playsound(src, gulpsound, vol = 100, vary = 1, falloff = 0.1, preference = /datum/preference/toggle/eating_noises) /obj/item/dogborg/sleeper/proc/ingest_atom(var/atom/ingesting) @@ -250,7 +250,7 @@ for(var/re in injection_chems) var/datum/reagent/C = SSchemistry.chemical_reagents[re] if(C) - dat += "Inject [C.name]
    " + dat += "Inject [C.name]
    " else for(var/re in injection_chems) var/datum/reagent/C = SSchemistry.chemical_reagents[re] @@ -259,21 +259,21 @@ dat += "

    [name] Status

    " dat += "
    " - dat += "Refresh" - dat += "Eject All" - dat += "Eject port: [eject_port]" - dat += "Vore All" //might as well make it obvious + dat += "Refresh" + dat += "Eject All" + dat += "Eject port: [eject_port]" + dat += "Vore All" //might as well make it obvious if(!cleaning) - dat += "Self-Clean" + dat += "Self-Clean" else dat += span_linkOff("Self-Clean") if(medsensor) - dat += "Analyze Patient" + dat += "Analyze Patient" if(delivery) dat += "

    Cargo Compartment


    " - dat += "Active Slot: [delivery_tag]" + dat += "Active Slot: [delivery_tag]" if(islist(deliverylists[delivery_tag])) - dat += "Eject Slot" + dat += "Eject Slot" dat += "
    " dat += "
    " @@ -296,7 +296,7 @@ dat += "([jointext(contents - (deliveryslot_1 + deliveryslot_2 + deliveryslot_3),", ")])

    " if(analyzer && !synced) - dat += "Sync Files
    " + dat += "Sync Files
    " //Cleaning and there are still un-preserved items if(cleaning && length(contents - items_preserved)) @@ -597,7 +597,7 @@ drain(-25 * damage_gain) //25*total loss as with voreorgan stats. if(T.stat == DEAD) if(ishuman(T)) - log_admin("[key_name(hound)] has digested [key_name(T)] with a cyborg belly. ([hound ? "JMP" : "null"])") + log_admin("[key_name(hound)] has digested [key_name(T)] with a cyborg belly. ([hound ? "JMP" : "null"])") to_chat(hound, span_notice("You feel your belly slowly churn around [T], breaking them down into a soft slurry to be used as power for your systems.")) to_chat(T, span_notice("You feel [hound]'s belly slowly churn around your form, breaking you down into a soft slurry to be used as power for [hound]'s systems.")) var/deathsound = pick( diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index b95612426a0..97679780b41 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -1150,7 +1150,7 @@ if(first_arg != second_arg) to_chat(connected_ai, span_filter_notice("

    " + span_notice("NOTICE - [braintype] reclassification detected: [first_arg] is now designated as [second_arg].") + "
    ")) if(ROBOT_NOTIFICATION_AI_SHELL) //New Shell - to_chat(connected_ai, span_filter_notice("

    " + span_notice("NOTICE - New AI shell detected: [name]") + "
    ")) + to_chat(connected_ai, span_filter_notice("

    " + span_notice("NOTICE - New AI shell detected: [name]") + "
    ")) /mob/living/silicon/robot/proc/disconnect_from_ai() if(connected_ai) diff --git a/code/modules/mob/new_player/news.dm b/code/modules/mob/new_player/news.dm index 6af422e5538..6fa6c4f1260 100644 --- a/code/modules/mob/new_player/news.dm +++ b/code/modules/mob/new_player/news.dm @@ -55,9 +55,9 @@ else dat += get_news_page(CHANNEL, CHANNEL.messages[current_news_page], current_news_page) if(CHANNEL.messages.len > current_news_page) - dat += "Older Issue" + dat += "Older Issue" if(current_news_page > CHANNEL.messages.len || (CHANNEL.messages.len > 1) && !(current_news_page == 1)) - dat += "Newer Issue " + dat += "Newer Issue " dat += " (Page [current_news_page] out of [CHANNEL.messages.len])" @@ -83,4 +83,4 @@ dat += get_newspaper_content(MESSAGE.title, MESSAGE.body, MESSAGE.author, "#d4cec1", pic_data) - return dat \ No newline at end of file + return dat diff --git a/code/modules/news/new_newspaper.dm b/code/modules/news/new_newspaper.dm index 8d27c374211..43bef5f84b6 100644 --- a/code/modules/news/new_newspaper.dm +++ b/code/modules/news/new_newspaper.dm @@ -46,7 +46,7 @@ obj/item/newspaper/attack_self(mob/user) dat+="" if(scribble_page==curr_page) dat+="
    There is a small scribble near the end of this page... It reads: \"[scribble]\"" - dat+= "
    " + dat+= "
    " if(1) // X channel pages inbetween. for(var/datum/feed_channel/NP in news_content) pages++ //Let's get it right again. @@ -70,7 +70,7 @@ obj/item/newspaper/attack_self(mob/user) dat+="" if(scribble_page==curr_page) dat+="
    There is a small scribble near the end of this page... It reads: \"[scribble]\"" - dat+= "

    " + dat+= "

    " if(2) //Last page for(var/datum/feed_channel/NP in news_content) pages++ @@ -88,7 +88,7 @@ obj/item/newspaper/attack_self(mob/user) dat+=span_italics("Apart from some uninteresting Classified ads, there's nothing on this page...") if(scribble_page==curr_page) dat+="
    There is a small scribble near the end of this page... It reads: \"[scribble]\"" - dat+= "
    " + dat+= "
    " else dat+="I'm sorry to break your immersion. This shit's bugged. Report this bug to Agouri, polyxenitopalidou@gmail.com" diff --git a/code/modules/news/newspaper.dm b/code/modules/news/newspaper.dm index 09bc87b2eab..b46b8deadf6 100644 --- a/code/modules/news/newspaper.dm +++ b/code/modules/news/newspaper.dm @@ -46,7 +46,7 @@ dat+="" if(scribble_page==curr_page) dat+="
    There is a small scribble near the end of this page... It reads: \"[scribble]\"" - dat+= "
    " + dat+= "
    " if(1) // X channel pages inbetween. for(var/datum/feed_channel/NP in news_content) pages++ //Let's get it right again. @@ -71,7 +71,7 @@ dat+="" if(scribble_page==curr_page) dat+="
    There is a small scribble near the end of this page... It reads: \"[scribble]\"" - dat+= "

    " + dat+= "

    " if(2) //Last page for(var/datum/feed_channel/NP in news_content) pages++ @@ -89,7 +89,7 @@ dat+=span_italics("Apart from some uninteresting Classified ads, there's nothing on this page...") if(scribble_page==curr_page) dat+="
    There is a small scribble near the end of this page... It reads: \"[scribble]\"" - dat+= "
    " + dat+= "
    " else dat+="I'm sorry to break your immersion. This shit's bugged. Report this bug to Agouri, polyxenitopalidou@gmail.com" diff --git a/code/modules/nifsoft/software/14_commlink.dm b/code/modules/nifsoft/software/14_commlink.dm index 14061432276..f9d4ed8e475 100644 --- a/code/modules/nifsoft/software/14_commlink.dm +++ b/code/modules/nifsoft/software/14_commlink.dm @@ -106,7 +106,7 @@ voice_requests |= candidate if(ringer && nif.human) - nif.notify("New commlink call from [who]. (Open)") + nif.notify("New commlink call from [who]. (Open)") //Similar reason /obj/item/communicator/commlink/request_im(var/atom/candidate, var/origin_address, var/text) @@ -128,4 +128,4 @@ return if(ringer && nif.human) - nif.notify("Commlink message from [who]: \"[text]\" (Open) (Reply)") + nif.notify("Commlink message from [who]: \"[text]\" (Open) (Reply)") diff --git a/code/modules/overmap/ships/computers/ship.dm b/code/modules/overmap/ships/computers/ship.dm index 2b63f95b9a2..fe63e64015f 100644 --- a/code/modules/overmap/ships/computers/ship.dm +++ b/code/modules/overmap/ships/computers/ship.dm @@ -34,7 +34,7 @@ somewhere on that shuttle. Subtypes of these can be then used to perform ship ov /obj/machinery/computer/ship/proc/display_reconnect_dialog(var/mob/user, var/flavor) var/datum/browser/popup = new (user, "[src]", "[src]") - popup.set_content("
    Error
    Unable to connect to [flavor].
    Reconnect
    ") + popup.set_content("
    Error
    Unable to connect to [flavor].
    Reconnect
    ") popup.open() /obj/machinery/computer/ship/Topic(href, href_list) diff --git a/code/modules/paperwork/adminpaper.dm b/code/modules/paperwork/adminpaper.dm index aa944abb874..175dfba2a0b 100644 --- a/code/modules/paperwork/adminpaper.dm +++ b/code/modules/paperwork/adminpaper.dm @@ -27,13 +27,13 @@ //Snapshot is crazy and likes putting each topic hyperlink on a seperate line from any other tags so it's nice and clean. interactions += "
    The fax will transmit everything above this line
    " - interactions += "Send fax " - interactions += "Pen mode: [isCrayon ? "Crayon" : "Pen"] " - interactions += "Cancel fax " + interactions += "Send fax " + interactions += "Pen mode: [isCrayon ? "Crayon" : "Pen"] " + interactions += "Cancel fax " interactions += "
    " - interactions += "Toggle Header " - interactions += "Toggle Footer " - interactions += "Clear page " + interactions += "Toggle Header " + interactions += "Toggle Footer " + interactions += "Clear page " interactions += "
    " /obj/item/paper/admin/proc/generateHeader() diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm index f0d3e61bbc9..68b22b29271 100644 --- a/code/modules/paperwork/clipboard.dm +++ b/code/modules/paperwork/clipboard.dm @@ -69,21 +69,21 @@ /obj/item/clipboard/attack_self(mob/user as mob) var/dat = "Clipboard" if(haspen) - dat += "Remove Pen

    " + dat += "Remove Pen

    " else - dat += "Add Pen

    " + dat += "Add Pen

    " //The topmost paper. I don't think there's any way to organise contents in byond, so this is what we're stuck with. -Pete if(toppaper) var/obj/item/paper/P = toppaper - dat += "Write Remove Rename - [P.name]

    " + dat += "Write Remove Rename - [P.name]

    " for(var/obj/item/paper/P in src) if(P==toppaper) continue - dat += "Remove Rename - [P.name]
    " + dat += "Remove Rename - [P.name]
    " for(var/obj/item/photo/Ph in src) - dat += "Remove Rename - [Ph.name]
    " + dat += "Remove Rename - [Ph.name]
    " user << browse(dat, "window=clipboard") onclose(user, "clipboard") diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index aedfd802709..d132bb3af7a 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -415,9 +415,9 @@ Extracted to its own procedure for easier logic handling with paper bundles. /obj/machinery/photocopier/faxmachine/proc/message_admins(var/mob/sender, var/faxname, var/obj/item/sent, var/reply_type, font_colour="#006100") var/msg = "[faxname]: [get_options_bar(sender, 2,1,1)]" - msg += "(REPLY)" + msg += "(REPLY)" msg = span_bold(msg) + ": " - msg += "Receiving '[sent.name]' via secure connection ... view message" + msg += "Receiving '[sent.name]' via secure connection ... view message" msg = span_notice(msg) for(var/client/C in GLOB.admins) diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm index 1e89ee949c9..a7067ff75d1 100644 --- a/code/modules/paperwork/folders.dm +++ b/code/modules/paperwork/folders.dm @@ -85,11 +85,11 @@ var/dat = "[name]" for(var/obj/item/paper/P in src) - dat += "Remove Rename - [P.name]
    " + dat += "Remove Rename - [P.name]
    " for(var/obj/item/photo/Ph in src) - dat += "Remove Rename - [Ph.name]
    " + dat += "Remove Rename - [Ph.name]
    " for(var/obj/item/paper_bundle/Pb in src) - dat += "Remove Rename - [Pb.name]
    " + dat += "Remove Rename - [Pb.name]
    " user << browse(dat, "window=folder") onclose(user, "folder") add_fingerprint(user) diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 883a4bd6626..f07cdd17191 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -297,8 +297,8 @@ info_links = info var/i = 0 for(i=1,i<=fields,i++) - addtofield(i, "write", 1) - info_links = info_links + "write" + addtofield(i, "write", 1) + info_links = info_links + "write" /obj/item/paper/proc/clearpaper() diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm index 1bd9983553b..470e7a93177 100644 --- a/code/modules/paperwork/paper_bundle.dm +++ b/code/modules/paperwork/paper_bundle.dm @@ -109,19 +109,19 @@ // first if(page == 1) - dat+= "" - dat+= "" - dat+= "

    " + dat+= "" + dat+= "" + dat+= "

    " // last else if(page == pages.len) - dat+= "" - dat+= "" - dat+= "

    " + dat+= "" + dat+= "" + dat+= "

    " // middle pages else - dat+= "" - dat+= "" - dat+= "

    " + dat+= "" + dat+= "" + dat+= "

    " if(istype(pages[page], /obj/item/paper)) var/obj/item/paper/P = W diff --git a/code/modules/pda/messenger.dm b/code/modules/pda/messenger.dm index b9d84fbe289..4a5e1bcdd50 100644 --- a/code/modules/pda/messenger.dm +++ b/code/modules/pda/messenger.dm @@ -223,7 +223,7 @@ var/owner = data["owner"] var/job = data["job"] var/message = data["message"] - notify(span_bold("Message from [owner] ([job]), ") + "\"[message]\" (Reply)") + notify(span_bold("Message from [owner] ([job]), ") + "\"[message]\" (Reply)") /datum/data/pda/app/messenger/multicast /datum/data/pda/app/messenger/multicast/receive_message(list/data, ref) diff --git a/code/modules/power/antimatter/computer.dm b/code/modules/power/antimatter/computer.dm index 7fdb1236419..ce2936ad746 100644 --- a/code/modules/power/antimatter/computer.dm +++ b/code/modules/power/antimatter/computer.dm @@ -70,11 +70,11 @@ switch(src.state) if(STATE_DEFAULT) if (src.authenticated) - dat += "
    \[ Log Out \]
    " - dat += "
    \[ Engine Menu \]" - dat += "
    \[ Injector Menu \]" + dat += "
    \[ Log Out \]
    " + dat += "
    \[ Engine Menu \]" + dat += "
    \[ Injector Menu \]" else - dat += "
    \[ Log In \]" + dat += "
    \[ Log In \]" if(STATE_INJECTOR) if(src.connected_I.injecting) dat += "
    \[ Injecting \]
    " @@ -84,12 +84,12 @@ if(src.connected_E.stopping) dat += "
    \[ STOPPING \]" else if(src.connected_E.operating && !src.connected_E.stopping) - dat += "
    \[ Emergency Stop \]" + dat += "
    \[ Emergency Stop \]" else - dat += "
    \[ Activate Engine \]" + dat += "
    \[ Activate Engine \]" dat += "
    Contents:
    [src.connected_E.H_fuel]kg of Hydrogen
    [src.connected_E.antiH_fuel]kg of Anti-Hydrogen
    " - dat += "
    \[ [(src.state != STATE_DEFAULT) ? "Main Menu | " : ""]Close \]" + dat += "
    \[ [(src.state != STATE_DEFAULT) ? "Main Menu | " : ""]Close \]" user << browse(dat, "window=communications;size=400x500") onclose(user, "communications") diff --git a/code/modules/power/antimatter/control.dm b/code/modules/power/antimatter/control.dm index 34f20cdd8d1..ca1409571ba 100644 --- a/code/modules/power/antimatter/control.dm +++ b/code/modules/power/antimatter/control.dm @@ -261,28 +261,28 @@ var/dat = "" dat += "AntiMatter Control Panel
    " - dat += "Close
    " - dat += "Refresh
    " - dat += "Force Shielding Update

    " + dat += "Close
    " + dat += "Refresh
    " + dat += "Force Shielding Update

    " dat += "Status: [(active?"Injecting":"Standby")]
    " - dat += "Toggle Status
    " + dat += "Toggle Status
    " dat += "Instability: [stability]%
    " dat += "Reactor parts: [linked_shielding.len]
    "//TODO: perhaps add some sort of stability check dat += "Cores: [linked_cores.len]

    " dat += "-Current Efficiency: [reported_core_efficiency]
    " - dat += "-Average Stability: [stored_core_stability] (update)
    " + dat += "-Average Stability: [stored_core_stability] (update)
    " dat += "Last Produced: [stored_power]
    " dat += "Fuel: " if(!fueljar) dat += "
    No fuel receptacle detected." else - dat += "Eject
    " + dat += "Eject
    " dat += "- [fueljar.fuel]/[fueljar.fuel_max] Units
    " dat += "- Injecting: [fuel_injection] units
    " - dat += "- --|++

    " + dat += "- --|++

    " user << browse(dat, "window=AMcontrol;size=420x500") diff --git a/code/modules/power/fusion/core/core_control.dm b/code/modules/power/fusion/core/core_control.dm index 2965228b3a6..d146dfa5c51 100644 --- a/code/modules/power/fusion/core/core_control.dm +++ b/code/modules/power/fusion/core/core_control.dm @@ -27,8 +27,6 @@ var/new_ident = sanitize_text(tgui_input_text(usr, "Enter a new ident tag.", "Core Control", monitor.core_tag)) if(new_ident && user.Adjacent(src)) monitor.core_tag = new_ident -// id_tag = new_ident -// cur_viewed_device = null return /obj/machinery/computer/fusion_core_control/attack_ai(mob/user) @@ -41,179 +39,6 @@ monitor.tgui_interact(user) -/* -/obj/machinery/computer/fusion_core_control/attack_hand(mob/user) - add_fingerprint(user) - interact(user) - -/obj/machinery/computer/fusion_core_control/interact(mob/user) - - if(stat & (BROKEN|NOPOWER)) - user.unset_machine() - user << browse(null, "window=fusion_control") - return - - if(!cur_viewed_device || !check_core_status(cur_viewed_device)) - cur_viewed_device = null - - if(!id_tag) - to_chat(user, span_warning("This console has not been assigned an ident tag. Please contact your system administrator or conduct a manual update with a standard multitool.")) - return - - if(cur_viewed_device && (cur_viewed_device.id_tag != id_tag || get_dist(src, cur_viewed_device) > scan_range)) - cur_viewed_device = null - - var/dat = span_bold("Core Control #[id_tag]") + "
    " - - if(cur_viewed_device) - dat += {" - Back to overview
    - Device ident '[cur_viewed_device.id_tag]' [cur_viewed_device.owned_field ? span_green("Active") : span_red("Inactive")].
    - Power status: [cur_viewed_device.avail()]/[cur_viewed_device.active_power_usage] W
    -
    - Field Status: [cur_viewed_device.owned_field ? span_green("Online") : span_red("Offline")].
    - Reactant Dump: [cur_viewed_device.reactant_dump ? span_gren("Active") : span_red("Inactive")].
    -
    - Field power density (W.m-3):
    - ---- - --- - -- - - - [cur_viewed_device.field_strength] - + - ++ - +++ - ++++
    - "} - - if(cur_viewed_device.owned_field) - dat += {" - Approximate field diameter (m): [cur_viewed_device.owned_field.size]
    - Field instability: [cur_viewed_device.owned_field.percent_unstable * 100]%
    - Plasma temperature: [cur_viewed_device.owned_field.plasma_temperature + 295]K
    - Fuel:
    - - "} - for(var/reagent in cur_viewed_device.owned_field.dormant_reactant_quantities) - dat += "" - dat += "
    NameAmount
    [reagent][cur_viewed_device.owned_field.dormant_reactant_quantities[reagent]]

    " - - else - - connected_devices.Cut() - for(var/obj/machinery/power/fusion_core/C in fusion_cores) - if(C.id_tag == id_tag && get_dist(src, C) <= scan_range) - connected_devices += C - for(var/obj/machinery/power/fusion_core/C in gyrotrons) - if(C.id_tag == id_tag && get_dist(src, C) <= scan_range) - connected_devices += C - - if(connected_devices.len) - dat += {" - Connected EM field generators:
    - - - - - - - "} - - for(var/obj/machinery/power/fusion_core/C in connected_devices) - var/status - var/can_access = 1 - if(!check_core_status(C)) - status = span_red("Unresponsive") - can_access = 0 - else if(C.avail() < C.active_power_usage) - status = span_orange("Underpowered") - else - status = span_green("Good") - - dat += {" - - - - "} - - if(!can_access) - dat += {" - - "} - else - dat += {" - - "} - dat += {" - - "} - - else - dat += span_red("No electromagnetic field generators connected.") - - var/datum/browser/popup = new(user, "fusion_control", name, 500, 400, src) - popup.set_content(dat) - popup.open() - user.set_machine(src) - -/obj/machinery/computer/fusion_core_control/Topic(href, href_list) - . = ..() - if(.) - return - - if(href_list["access_device"]) - var/idx = CLAMP(text2num(href_list["toggle_active"]), 1, connected_devices.len) - cur_viewed_device = connected_devices[idx] - updateUsrDialog() - return 1 - - //All HREFs from this point on require a device anyways. - if(!cur_viewed_device || !check_core_status(cur_viewed_device) || cur_viewed_device.id_tag != id_tag || get_dist(src, cur_viewed_device) > scan_range) - return - - if(href_list["goto_scanlist"]) - cur_viewed_device = null - updateUsrDialog() - return 1 - - if(href_list["toggle_active"]) - if(!cur_viewed_device.Startup()) //Startup() whilst the device is active will return null. - cur_viewed_device.Shutdown() - updateUsrDialog() - return 1 - - if(href_list["str"]) - var/val = text2num(href_list["str"]) - if(!val) //Value is 0, which is manual entering. - cur_viewed_device.set_strength(input(usr, "Enter the new field power density (W.m^-3)", "Fusion Control", cur_viewed_device.field_strength) as num) - else - cur_viewed_device.set_strength(cur_viewed_device.field_strength + val) - updateUsrDialog() - return 1 - - if(href_list["syphon"]) - cur_viewed_device.reactant_dump = !cur_viewed_device.reactant_dump - updateUsrDialog() -*/ - //Returns 1 if the machine can be interacted with via this console. /obj/machinery/computer/fusion_core_control/proc/check_core_status(var/obj/machinery/power/fusion_core/C) return istype(C) ? C.check_core_status() : FALSE - -/* -/obj/machinery/computer/fusion_core_control/update_icon() - if(stat & (BROKEN)) - icon = 'icons/obj/computer.dmi' - icon_state = "broken" - set_light(0) - - if(stat & (NOPOWER)) - icon = 'icons/obj/computer.dmi' - icon_state = "computer" - set_light(0) - - if(!stat & (BROKEN|NOPOWER)) - icon = initial(icon) - icon_state = initial(icon_state) - set_light(light_range_on, light_power_on) -*/ diff --git a/code/modules/power/fusion/fuel_assembly/fuel_control.dm b/code/modules/power/fusion/fuel_assembly/fuel_control.dm index 2978b378258..6a1b50f334b 100644 --- a/code/modules/power/fusion/fuel_assembly/fuel_control.dm +++ b/code/modules/power/fusion/fuel_assembly/fuel_control.dm @@ -73,7 +73,7 @@ else dat += "" if(I.cur_assembly) - dat += "" + dat += "" else dat += "" if(I.cur_assembly) @@ -84,8 +84,8 @@ dat += "" dat += {"
    Device tagStatusControls
    [C.id_tag][status]" + span_red("ERROR") + "ACCESS
    [I.cur_assembly ? I.cur_assembly.fuel_type : "NONE"]\[[I.injecting ? "Halt injecting" : "Begin injecting"]\]\[[I.injecting ? "Halt injecting" : "Begin injecting"]\]None

    - Refresh - Close
    "} + Refresh + Close
    "} var/datum/browser/popup = new(user, "fuel_control", "Fusion Fuel Control Console", 800, 400, src) popup.set_content(dat) diff --git a/code/modules/power/fusion/gyrotron/gyrotron_control.dm b/code/modules/power/fusion/gyrotron/gyrotron_control.dm index c96e11644ce..9959123c766 100644 --- a/code/modules/power/fusion/gyrotron/gyrotron_control.dm +++ b/code/modules/power/fusion/gyrotron/gyrotron_control.dm @@ -65,9 +65,9 @@ dat += "" + span_red("ERROR") + "" dat += "" + span_red("ERROR") + "" else - dat += "[G.active ? "Emitting" : "Standing By"]" - dat += "[G.rate]" - dat += "[G.mega_energy]" + dat += "[G.active ? "Emitting" : "Standing By"]" + dat += "[G.rate]" + dat += "[G.mega_energy]" dat += "" diff --git a/code/modules/power/pacman2.dm b/code/modules/power/pacman2.dm index 8d641f9c276..038388f27b1 100644 --- a/code/modules/power/pacman2.dm +++ b/code/modules/power/pacman2.dm @@ -119,16 +119,16 @@ var/dat = text(span_bold("[name]") + "
    ") if (active) - dat += text("Generator: On
    ") + dat += text("Generator: On
    ") else - dat += text("Generator: Off
    ") + dat += text("Generator: Off
    ") if(P) dat += text("Currently loaded phoron tank: [P.air_contents.phoron]
    ") else dat += text("No phoron tank currently loaded.
    ") - dat += text("Power output: - [power_gen * power_output] +
    ") + dat += text("Power output: - [power_gen * power_output] +
    ") dat += text("Heat: [heat]
    ") - dat += "
    Close" + dat += "
    Close" user << browse("[dat]", "window=port_gen") Topic(href, href_list) diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index e73379d5a50..d7b27608da8 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -56,7 +56,7 @@ connect_to_network() /obj/machinery/power/emitter/Destroy() - message_admins("Emitter deleted at ([x],[y],[z] - JMP)",0,1) + message_admins("Emitter deleted at ([x],[y],[z] - JMP)",0,1) log_game("EMITTER([x],[y],[z]) Destroyed/deleted.") investigate_log("deleted at ([x],[y],[z])","singulo") ..() @@ -80,7 +80,7 @@ if(src.active==1) src.active = 0 to_chat(user, "You turn off [src].") - message_admins("Emitter turned off by [key_name(user, user.client)](?) in ([x],[y],[z] - JMP)",0,1) + message_admins("Emitter turned off by [key_name(user, user.client)](?) in ([x],[y],[z] - JMP)",0,1) log_game("EMITTER([x],[y],[z]) OFF by [key_name(user)]") investigate_log("turned off by [user.key]","singulo") else @@ -88,7 +88,7 @@ to_chat(user, "You turn on [src].") src.shot_number = 0 src.fire_delay = get_initial_fire_delay() - message_admins("Emitter turned on by [key_name(user, user.client)](?) in ([x],[y],[z] - JMP)",0,1) + message_admins("Emitter turned on by [key_name(user, user.client)](?) in ([x],[y],[z] - JMP)",0,1) log_game("EMITTER([x],[y],[z]) ON by [key_name(user)]") investigate_log("turned on by [user.key]","singulo") update_icon() diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index a8c47362de8..33e8db710c9 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -95,7 +95,7 @@ GLOBAL_LIST_BOILERPLATE(all_singularities, /obj/singularity) var/count = locate(/obj/machinery/containment_field) in orange(30, src) if (!count) - message_admins("A singulo has been created without containment fields active ([x], [y], [z] - JMP).") + message_admins("A singulo has been created without containment fields active ([x], [y], [z] - JMP).") investigate_log("was created. [count ? "" : "No containment fields were active."]", I_SINGULO) diff --git a/code/modules/power/smes_construction.dm b/code/modules/power/smes_construction.dm index c2f10b7e2a2..912e005fcc1 100644 --- a/code/modules/power/smes_construction.dm +++ b/code/modules/power/smes_construction.dm @@ -192,7 +192,7 @@ if(G.siemens_coefficient == 0) user_protected = 1 log_game("SMES FAILURE: [src.x]X [src.y]Y [src.z]Z User: [usr.ckey], Intensity: [intensity]/100") - message_admins("SMES FAILURE: [src.x]X [src.y]Y [src.z]Z User: [usr.ckey], Intensity: [intensity]/100 - JMP") + message_admins("SMES FAILURE: [src.x]X [src.y]Y [src.z]Z User: [usr.ckey], Intensity: [intensity]/100 - JMP") var/used_hand = h_user.hand?"l_hand":"r_hand" diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index a7365cfa965..c7e35a79985 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -164,7 +164,7 @@ set waitfor = 0 - message_admins("Supermatter exploded at ([x],[y],[z] - JMP)",0,1) + message_admins("Supermatter exploded at ([x],[y],[z] - JMP)",0,1) log_game("SUPERMATTER([x],[y],[z]) Exploded. Power:[power], Oxygen:[oxygen], Damage:[damage], Integrity:[get_integrity()]") anchored = TRUE grav_pulling = 1 @@ -539,7 +539,7 @@ icon_state = "darkmatter_broken" /obj/item/broken_sm/New() - message_admins("Broken SM shard created at ([x],[y],[z] - JMP)",0,1) + message_admins("Broken SM shard created at ([x],[y],[z] - JMP)",0,1) START_PROCESSING(SSobj, src) return ..() diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm index b7a59fd2c8d..982030a9d6c 100644 --- a/code/modules/power/turbine.dm +++ b/code/modules/power/turbine.dm @@ -291,8 +291,8 @@ var/t = "Gas Turbine Generator
    "
     	t += "Generated power : [DisplayPower(lastgen)]

    " t += "Turbine: [round(compressor.rpm)] RPM
    " - t += "Starter: [ compressor.starter ? "Off " + span_bold("On") : span_bold("Off") + " On"]" - t += "

    Close" + t += "Starter: [ compressor.starter ? "Off " + span_bold("On") : span_bold("Off") + " On"]" + t += "
    Close" t += "
    " var/datum/browser/popup = new(user, "turbine", name, 700, 500, src) popup.set_content(t) diff --git a/code/modules/projectiles/guns/projectile/dartgun.dm b/code/modules/projectiles/guns/projectile/dartgun.dm index 74bed8f9ff2..e468af615ec 100644 --- a/code/modules/projectiles/guns/projectile/dartgun.dm +++ b/code/modules/projectiles/guns/projectile/dartgun.dm @@ -144,12 +144,12 @@ for(var/datum/reagent/R in B.reagents.reagent_list) dat += "
    [R.volume] units of [R.name], " if (check_beaker_mixing(B)) - dat += text("Mixing ") + dat += text("Mixing ") else - dat += text("Not mixing ") + dat += text("Not mixing ") else dat += "nothing." - dat += " \[Eject\]
    " + dat += " \[Eject\]
    " i++ else dat += "There are no beakers inserted!

    " @@ -159,7 +159,7 @@ dat += "The dart cartridge has [ammo_magazine.stored_ammo.len] shots remaining." else dat += "The dart cartridge is empty!" - dat += " \[Eject\]" + dat += " \[Eject\]" user << browse(dat, "window=dartgun") onclose(user, "dartgun", src) diff --git a/code/modules/reagents/machinery/dispenser/reagent_tank.dm b/code/modules/reagents/machinery/dispenser/reagent_tank.dm index a729f579224..081ed52b76a 100644 --- a/code/modules/reagents/machinery/dispenser/reagent_tank.dm +++ b/code/modules/reagents/machinery/dispenser/reagent_tank.dm @@ -224,7 +224,7 @@ modded = modded ? 0 : 1 playsound(src, W.usesound, 75, 1) if (modded) - message_admins("[key_name_admin(user)] opened fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]), leaking fuel. (JMP)") + message_admins("[key_name_admin(user)] opened fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]), leaking fuel. (JMP)") log_game("[key_name(user)] opened fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]), leaking fuel.") leak_fuel(amount_per_transfer_from_this) if (istype(W,/obj/item/assembly_holder)) @@ -237,7 +237,7 @@ var/obj/item/assembly_holder/H = W if (istype(H.a_left,/obj/item/assembly/igniter) || istype(H.a_right,/obj/item/assembly/igniter)) - message_admins("[key_name_admin(user)] rigged fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]) for explosion. (JMP)") + message_admins("[key_name_admin(user)] rigged fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]) for explosion. (JMP)") log_game("[key_name(user)] rigged fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]) for explosion.") rig = W @@ -255,7 +255,7 @@ /obj/structure/reagent_dispensers/fueltank/bullet_act(var/obj/item/projectile/Proj) if(Proj.get_structure_damage()) if(istype(Proj.firer)) - message_admins("[key_name_admin(Proj.firer)] shot fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]) (JMP).") + message_admins("[key_name_admin(Proj.firer)] shot fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]) (JMP).") log_game("[key_name(Proj.firer)] shot fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]).") if(!istype(Proj ,/obj/item/projectile/beam/lasertag) && !istype(Proj ,/obj/item/projectile/beam/practice) ) diff --git a/code/modules/reagents/reagent_containers/borghypo.dm b/code/modules/reagents/reagent_containers/borghypo.dm index 822ec33a5f8..82b6a9976fe 100644 --- a/code/modules/reagents/reagent_containers/borghypo.dm +++ b/code/modules/reagents/reagent_containers/borghypo.dm @@ -102,7 +102,7 @@ if(mode == i) t += span_bold("[reagent_names[i]]") else - t += "[reagent_names[i]]" + t += "[reagent_names[i]]" t = "Available reagents: [t]." to_chat(user,span_infoplain(t)) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index c31597b6e9f..23ce1f00d0c 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -311,18 +311,18 @@ // if(!ai) // AI can't pull flush handle // if(flush) - // dat += "Disposal handle: Disengage Engaged" + // dat += "Disposal handle: Disengage Engaged" // else - // dat += "Disposal handle: Disengaged Engage" + // dat += "Disposal handle: Disengaged Engage" - // dat += "

    Eject contents
    " + // dat += "

    Eject contents
    " // if(mode <= 0) - // dat += "Pump: Off On
    " + // dat += "Pump: Off On
    " // else if(mode == 1) - // dat += "Pump: Off On (pressurizing)
    " + // dat += "Pump: Off On (pressurizing)
    " // else - // dat += "Pump: Off On (idle)
    " + // dat += "Pump: Off On (idle)
    " // var/per = 100* air_contents.return_pressure() / (SEND_PRESSURE) diff --git a/code/modules/scripting/IDE.dm b/code/modules/scripting/IDE.dm index 13b2c462571..ccf0a292094 100644 --- a/code/modules/scripting/IDE.dm +++ b/code/modules/scripting/IDE.dm @@ -11,7 +11,7 @@ var/tcscode=winget(src, "tcscode", "text") var/msg="[mob.name] is adding script to server [Server]: [tcscode]" log_misc(msg) - message_admins("[mob.name] has uploaded a NTLS script to [Machine.SelectedServer] ([mob.x],[mob.y],[mob.z] - JMP)",0,1) + message_admins("[mob.name] has uploaded a NTLS script to [Machine.SelectedServer] ([mob.x],[mob.y],[mob.z] - JMP)",0,1) Server.setcode( tcscode ) // this actually saves the code from input to the server src << output(null, "tcserror") // clear the errors else diff --git a/code/modules/security levels/keycard authentication.dm b/code/modules/security levels/keycard authentication.dm index 307570a01e9..4409bdcda1b 100644 --- a/code/modules/security levels/keycard authentication.dm +++ b/code/modules/security levels/keycard authentication.dm @@ -88,17 +88,17 @@ if(screen == 1) dat += "Select an event to trigger:" user << browse(dat, "window=keycard_auth;size=500x250") if(screen == 2) dat += "Please swipe your card to authorize the following event: [event]" - dat += "

    Back" + dat += "

    Back" user << browse(dat, "window=keycard_auth;size=500x250") return diff --git a/code/modules/telesci/gps_advanced.dm b/code/modules/telesci/gps_advanced.dm index e06c7f60715..9d206b1258c 100644 --- a/code/modules/telesci/gps_advanced.dm +++ b/code/modules/telesci/gps_advanced.dm @@ -39,7 +39,7 @@ if(emped) t += "ERROR" else - t += "
    Set Tag " + t += "
    Set Tag " t += "
    Tag: [gpstag]" for(var/obj/item/gps/advanced/G in GPS_list) diff --git a/code/modules/tgui/modules/admin/player_notes.dm b/code/modules/tgui/modules/admin/player_notes.dm index f198f00d44e..cd73dfc0bd6 100644 --- a/code/modules/tgui/modules/admin/player_notes.dm +++ b/code/modules/tgui/modules/admin/player_notes.dm @@ -195,7 +195,7 @@ PlayerNotesPageLegacy(1, filter) /datum/admins/proc/PlayerNotesPageLegacy(page, filter) - var/dat = span_bold("Player notes") + " - Apply Filter


    " + var/dat = span_bold("Player notes") + " - Apply Filter
    " var/savefile/S=new("data/player_notes.sav") var/list/note_keys S >> note_keys @@ -228,13 +228,13 @@ upper_bound = min(upper_bound, note_keys.len) for(var/index = lower_bound, index <= upper_bound, index++) var/t = note_keys[index] - dat += "[t]" + dat += "[t]" dat += "
    " // Display a footer to select different pages for(var/index = 1, index <= number_pages, index++) - dat += "[index] " + dat += "[index] " if(index == page) dat = span_bold(dat) @@ -281,12 +281,12 @@ update_file = 1 dat += "[I.content] by [I.author] ([I.rank]) on [I.timestamp] " if(I.author == usr.key || I.author == "Adminbot" || ishost(usr)) - dat += "Remove" + dat += "Remove" dat += "

    " if(update_file) info << infos dat += "
    " - dat += "Add Comment
    " + dat += "Add Comment
    " dat += "" usr << browse(dat, "window=adminplayerinfo;size=480x480") diff --git a/code/modules/tgui_panel/tgui_panel.dm b/code/modules/tgui_panel/tgui_panel.dm index 9e98e9a4d81..6bd4b096131 100644 --- a/code/modules/tgui_panel/tgui_panel.dm +++ b/code/modules/tgui_panel/tgui_panel.dm @@ -63,7 +63,7 @@ */ /datum/tgui_panel/proc/on_initialize_timed_out() // Currently does nothing but sending a message to old chat. - // SEND_TEXT(client, span_userdanger("Failed to load fancy chat, click HERE to attempt to reload it.")) + // SEND_TEXT(client, span_userdanger("Failed to load fancy chat, click HERE to attempt to reload it.")) /** * private diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index 5ab7c9d68ef..f83c477e901 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -556,7 +556,7 @@ SetSleeping(0) //Wake up instantly if asleep for(var/mob/living/simple_mob/SA in range(10)) LAZYSET(SA.prey_excludes, src, world.time) - log_and_message_admins("[key_name(src)] used the OOC escape button to get out of [key_name(B.owner)] ([B.owner ? "JMP" : "null"])") + log_and_message_admins("[key_name(src)] used the OOC escape button to get out of [key_name(B.owner)] ([B.owner ? "JMP" : "null"])") if(!ishuman(B.owner)) B.owner.update_icons() @@ -570,14 +570,14 @@ if(confirm != "Okay" || loc != belly) return //Actual escaping - log_and_message_admins("[key_name(src)] used the OOC escape button to get out of [key_name(pred)] (BORG) ([pred ? "JMP" : "null"])") + log_and_message_admins("[key_name(src)] used the OOC escape button to get out of [key_name(pred)] (BORG) ([pred ? "JMP" : "null"])") belly.go_out(src) //Just force-ejects from the borg as if they'd clicked the eject button. //You're in an AI hologram! else if(istype(loc, /obj/effect/overlay/aiholo)) var/obj/effect/overlay/aiholo/holo = loc holo.drop_prey() //Easiest way - log_and_message_admins("[key_name(src)] used the OOC escape button to get out of [key_name(holo.master)] (AI HOLO) ([holo ? "JMP" : "null"])") + log_and_message_admins("[key_name(src)] used the OOC escape button to get out of [key_name(holo.master)] (AI HOLO) ([holo ? "JMP" : "null"])") //You're in a capture crystal! ((It's not vore but close enough!)) else if(iscapturecrystal(loc)) @@ -1168,8 +1168,8 @@ if(custom_link) . += "Custom link: " + span_linkify("[custom_link]") if(ooc_notes) - . += "OOC Notes: \[View\] - \[Print\]" - . += "\[Mechanical Vore Preferences\]" + . += "OOC Notes: \[View\] - \[Print\]" + . += "\[Mechanical Vore Preferences\]" /mob/living/Topic(href, href_list) //Can't find any instances of Topic() being overridden by /mob/living in polaris' base code, even though /mob/living/carbon/human's Topic() has a ..() call diff --git a/code/modules/vore/eating/silicon_vr.dm b/code/modules/vore/eating/silicon_vr.dm index 0ef778f829d..a96e3de0ed5 100644 --- a/code/modules/vore/eating/silicon_vr.dm +++ b/code/modules/vore/eating/silicon_vr.dm @@ -99,7 +99,7 @@ . += "[flavor_text]" if(master.ooc_notes) - . += span_deptradio("OOC Notes:") + "\[View\] - \[Print\]" + . += span_deptradio("OOC Notes:") + "\[View\] - \[Print\]" // Allow dissipating ai holograms by attacking them /obj/effect/overlay/aiholo/attack_hand(mob/living/user) diff --git a/code/modules/vote/vote_datum.dm b/code/modules/vote/vote_datum.dm index 9a3597ae4cc..ebdaf6e596c 100644 --- a/code/modules/vote/vote_datum.dm +++ b/code/modules/vote/vote_datum.dm @@ -118,7 +118,7 @@ return null /datum/vote/proc/announce(start_text, var/time = vote_time) - to_chat(world, span_lightpurple("Type vote or click here to place your vote. \ + to_chat(world, span_lightpurple("Type vote or click here to place your vote. \ You have [time/10] seconds to vote.")) world << sound('sound/ambience/alarm4.ogg', repeat = 0, wait = 0, volume = 50, channel = 3) diff --git a/code/modules/xenobio2/machinery/core_extractor.dm b/code/modules/xenobio2/machinery/core_extractor.dm index 3ec567e038d..52766a30811 100644 --- a/code/modules/xenobio2/machinery/core_extractor.dm +++ b/code/modules/xenobio2/machinery/core_extractor.dm @@ -151,9 +151,9 @@ [occupant]
    "} if (occupant && !(stat & (NOPOWER|BROKEN))) - dat += "Start the core extraction.
    " + dat += "Start the core extraction.
    " if(occupant) - dat += "Eject the slime
    " + dat += "Eject the slime
    " else dat += "Please wait..." var/datum/browser/popup = new(user, "Slime Extractor", "Slime Extractor", src) diff --git a/code/modules/xenobio2/machinery/slime_replicator.dm b/code/modules/xenobio2/machinery/slime_replicator.dm index c493a47c970..82c6634fa2f 100644 --- a/code/modules/xenobio2/machinery/slime_replicator.dm +++ b/code/modules/xenobio2/machinery/slime_replicator.dm @@ -106,9 +106,9 @@ [core]
    "} if (core && !(stat & (NOPOWER|BROKEN))) - dat += "Start the replication process
    " + dat += "Start the replication process
    " if(core) - dat += "Eject the core
    " + dat += "Eject the core
    " else dat += "Please wait..." var/datum/browser/popup = new(user, "Slime Replicator", "Slime Replicator", src) diff --git a/code/modules/xenobio2/tools/xeno_trait_scanner.dm b/code/modules/xenobio2/tools/xeno_trait_scanner.dm index 191aecd6e2a..5b00748eda2 100644 --- a/code/modules/xenobio2/tools/xeno_trait_scanner.dm +++ b/code/modules/xenobio2/tools/xeno_trait_scanner.dm @@ -179,7 +179,7 @@ if(dat) last_data = dat - dat += "

    \[print report\]" + dat += "

    \[print report\]" user << browse(dat,"window=xeno_analyzer") return diff --git a/tgui/packages/tgui/interfaces/StockExchange.tsx b/tgui/packages/tgui/interfaces/StockExchange.tsx index f25499b6ae1..d312c9477d6 100644 --- a/tgui/packages/tgui/interfaces/StockExchange.tsx +++ b/tgui/packages/tgui/interfaces/StockExchange.tsx @@ -224,7 +224,7 @@ const StockExchangeCompactView = (props) => { ); }; -// "
    " +// "
    " const StockExchangeLogs = (props) => { const { act, data } = useBackend(); diff --git a/tools/ci/validate_files.sh b/tools/ci/validate_files.sh index 57c8b332f55..462df7dfdb1 100755 --- a/tools/ci/validate_files.sh +++ b/tools/ci/validate_files.sh @@ -136,6 +136,14 @@ if [ "$pcre2_support" -eq 1 ]; then echo -e "${RED}A broken span tag class is present (check quotes).${NC}" FAILED=1 fi + + part "old style hrefs" + (! $grep -Pn "href[\s='\"\\ ]*\?" $code_files) + retVal=$? + if [ $retVal -ne 0 ]; then + echo -e "${RED}old-style hrefs detected, see ripgrep output.${NC}" + FAILED=1 + fi else echo -e "${RED}pcre2 not supported, skipping checks requiring pcre2" echo -e "if you want to run these checks install ripgrep with pcre2 support.${NC}"