diff --git a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm index 06fe22de2ce..6f8da094151 100644 --- a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm @@ -240,9 +240,9 @@ /obj/machinery/atmospherics/binary/dp_vent_pump/multitool_menu(var/mob/user,var/obj/item/device/multitool/P) return {" "} diff --git a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm index e53c89f787d..4f3c3d65635 100644 --- a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm +++ b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm @@ -89,9 +89,9 @@ return 1 /obj/machinery/atmospherics/binary/passive_gate/interact(mob/user as mob) - var/dat = {"Power: [on?"On":"Off"]
+ var/dat = {"Power: [on?"On":"Off"]
Desirable output pressure: - [round(target_pressure,0.1)]kPa | Change + [round(target_pressure,0.1)]kPa | Change "} var/datum/browser/popup = new(user, "atmo_pump", name, 400, 400) diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm index e6b66d873b0..3b1ca109a81 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm @@ -104,9 +104,9 @@ Thus, the two variables affect pump operation are set in New(): return 1 /obj/machinery/atmospherics/binary/pump/interact(mob/user as mob) - var/dat = {"Power: [on?"On":"Off"]
+ var/dat = {"Power: [on?"On":"Off"]
Desirable output pressure: - [round(target_pressure,0.1)]kPa | Change + [round(target_pressure,0.1)]kPa | Change "} var/datum/browser/popup = new(user, "atmo_pump", name, 400, 400) diff --git a/code/ATMOSPHERICS/components/binary_devices/valve.dm b/code/ATMOSPHERICS/components/binary_devices/valve.dm index b9ab8a4272d..1a2a4ea541f 100644 --- a/code/ATMOSPHERICS/components/binary_devices/valve.dm +++ b/code/ATMOSPHERICS/components/binary_devices/valve.dm @@ -139,7 +139,7 @@ /obj/machinery/atmospherics/binary/valve/digital/multitool_menu(var/mob/user,var/obj/item/device/multitool/P) return {" "} diff --git a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm index 8ae59b54358..80e1ad2e8b9 100644 --- a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm @@ -100,9 +100,9 @@ Thus, the two variables affect pump operation are set in New(): return 1 /obj/machinery/atmospherics/binary/volume_pump/interact(mob/user as mob) - var/dat = {"Power: [on?"On":"Off"]
+ var/dat = {"Power: [on?"On":"Off"]
Desirable output flow: - [round(transfer_rate,1)]l/s | Change + [round(transfer_rate,1)]l/s | Change "} var/datum/browser/popup = new(user, "atmo_pump", name, 400, 400) diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index 833454e51a8..a2c1a80e7ea 100755 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -174,17 +174,17 @@ Filter types: current_filter_type = "ERROR - Report this bug to the admin, please!" dat += {" - Power: [on?"On":"Off"]
+ Power: [on?"On":"Off"]
Filtering: [current_filter_type]

Set Filter Type:

- Toxins
- Oxygen
- Nitrogen
- Carbon Dioxide
- Nitrous Oxide
- Nothing
+ Toxins
+ Oxygen
+ Nitrogen
+ Carbon Dioxide
+ Nitrous Oxide
+ Nothing

Desirable output pressure: - [src.target_pressure]kPa | Change + [src.target_pressure]kPa | Change "} /* user << browse("[src.name] control[dat]","window=atmo_filter") diff --git a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm index 35d031dcf46..bef88fe6f3b 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm @@ -116,23 +116,23 @@ to_chat(user, "Access denied.") return usr.set_machine(src) - var/dat = {"Power: [on?"On":"Off"]
+ var/dat = {"Power: [on?"On":"Off"]
Desirable output pressure: - [target_pressure]kPa | Change + [target_pressure]kPa | Change
Node 1 Concentration: - - - - + - + - [node1_concentration]([node1_concentration*100]%) - + - + + + + +
Node 2 Concentration: - - - - + - + - [node2_concentration]([node2_concentration*100]%) - + - + + + + + "} var/datum/browser/popup = new(user, "atmo_mixer", name, 400, 400) diff --git a/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm b/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm index cdf11742ad8..f30ca5a016c 100644 --- a/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm +++ b/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm @@ -162,7 +162,7 @@ /obj/machinery/atmospherics/unary/outlet_injector/multitool_menu(var/mob/user,var/obj/item/device/multitool/P) return {" "} diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm index 338c1a02e9c..37ce3b19057 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm @@ -397,9 +397,9 @@ /obj/machinery/atmospherics/unary/vent_pump/multitool_menu(var/mob/user,var/obj/item/device/multitool/P) return {" "} diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm index 98d6a0db879..8570977d617 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm @@ -339,9 +339,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/multitool_menu(var/mob/user,var/obj/item/device/multitool/P) return {" "} diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index 5c11daabdba..8e0b22ffc2b 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -1,8 +1,8 @@ /proc/dopage(src,target) var/href_list var/href - href_list = params2list("src=\ref[src]&[target]=1") - href = "src=\ref[src];[target]=1" + href_list = params2list("src=[src:UID()]&[target]=1") + href = "src=[src:UID()];[target]=1" src:temphtml = null src:Topic(href, href_list) return null diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index 15bd69df376..25a9497e0e1 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -324,7 +324,7 @@ proc/add_logs(mob/user, mob/target, what_done, var/object=null, var/addition=nul to_chat(user, "Name = [M.name]; Real_name = [M.real_name]; Mind_name = [M.mind?"[M.mind.name]":""]; Key = [M.key];") to_chat(user, "Location = [location_description];") to_chat(user, "[special_role_description]") - to_chat(user, "(PM) (PP) (VV) (SM) (FLW) (CA)") + to_chat(user, "(PM) (PP) (VV) (SM) (FLW) (CA)") // Gets the first mob contained in an atom, and warns the user if there's not exactly one /proc/get_mob_in_atom_with_warning(atom/A, mob/user = usr) diff --git a/code/controllers/voting.dm b/code/controllers/voting.dm index 451fdbd99e3..55abf2834f1 100644 --- a/code/controllers/voting.dm +++ b/code/controllers/voting.dm @@ -256,7 +256,7 @@ var/global/list/round_voters = list() //Keeps track of the individuals voting fo log_vote(text) to_chat(world, {"[text] - Click here or type vote to place your vote. + Click here or type vote to place your vote. You have [config.vote_period/10] seconds to vote."}) switch(vote_type) if("crew_transfer") @@ -308,34 +308,34 @@ var/global/list/round_voters = list() //Keeps track of the individuals voting fo if(mode) dat += "
[vote_html(C)]

" if(admin) - dat += "(Cancel Vote) " + dat += "(Cancel Vote) " else dat += "

Start a vote:



" var/datum/browser/popup = new(C.mob, "vote", "Voting Panel", nref=src) popup.set_content(dat) @@ -356,9 +356,9 @@ var/global/list/round_voters = list() //Keeps track of the individuals voting fo if(!votes) votes = 0 if(current_votes[C.ckey] == i) - . += "
  • [choices[i]] ([votes] vote\s)
  • " + . += "
  • [choices[i]] ([votes] vote\s)
  • " else - . += "
  • [choices[i]] ([votes] vote\s)
  • " + . += "
  • [choices[i]] ([votes] vote\s)
  • " . += "" diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 9600edf62b9..0fc63dd0ae9 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -134,7 +134,7 @@ var/out = "[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 += "Factions and special roles:
    " var/list/sections = list( @@ -152,9 +152,9 @@ if(istype(current, /mob/living/carbon/human)) /** Impanted**/ if(isloyal(H)) - text = "Mindshield Implant:Remove|Implanted
    " + text = "Mindshield Implant:Remove|Implanted
    " else - text = "Mindshield Implant:No Implant|Implant him!
    " + text = "Mindshield Implant:No Implant|Implant him!
    " sections["implant"] = text /** REVOLUTION ***/ text = "revolution" @@ -164,26 +164,26 @@ if(isloyal(H)) text += "NO|headrev|rev" else if(src in ticker.mode.head_revolutionaries) - text += "no|HEADREV|rev" - text += "
    Flash: give" + text += "no|HEADREV|rev" + text += "
    Flash: give" var/list/L = current.get_contents() var/obj/item/device/flash/flash = locate() in L if(flash) if(!flash.broken) - text += "|take." + text += "|take." else - text += "|take|repair." + text += "|take|repair." else text += "." - text += " Reequip (gives traitor uplink)." + text += " Reequip (gives traitor uplink)." if(objectives.len==0) - text += "
    Objectives are empty! Set to kill all heads." + text += "
    Objectives are empty! Set to kill all heads." else if(src in ticker.mode.revolutionaries) - text += "no|headrev|REV" + text += "no|headrev|REV" else - text += "NO|headrev|rev" + text += "NO|headrev|rev" if(current && current.client && (ROLE_REV in current.client.prefs.be_special)) text += "|Enabled in Prefs" @@ -200,14 +200,14 @@ if(isloyal(H)) text += "NO|cultist" else if(src in ticker.mode.cult) - text += "no|CULTIST" - text += "
    Give tome|equip." + text += "no|CULTIST" + text += "
    Give tome|equip." /* if(objectives.len==0) - text += "
    Objectives are empty! Set to sacrifice and escape or summon." + text += "
    Objectives are empty! Set to sacrifice and escape or summon." */ else - text += "NO|cultist" + text += "NO|cultist" if(current && current.client && (ROLE_CULTIST in current.client.prefs.be_special)) @@ -223,12 +223,12 @@ text = uppertext(text) text = "[text]: " if(src in ticker.mode.wizards) - text += "WIZARD|no" - text += "
    To lair, undress, dress up, let choose name." + text += "WIZARD|no" + text += "
    To lair, undress, dress up, let choose name." if(objectives.len==0) - text += "
    Objectives are empty! Randomize!" + text += "
    Objectives are empty! Randomize!" else - text += "wizard|NO" + text += "wizard|NO" if(current && current.client && (ROLE_WIZARD in current.client.prefs.be_special)) text += "|Enabled in Prefs" @@ -243,13 +243,13 @@ text = uppertext(text) text = "[text]: " if(src in ticker.mode.changelings) - text += "CHANGELING|no" + text += "CHANGELING|no" if(objectives.len==0) - text += "
    Objectives are empty! Randomize!" + text += "
    Objectives are empty! Randomize!" if( changeling && changeling.absorbed_dna.len && (current.real_name != changeling.absorbed_dna[1]) ) - text += "
    Transform to initial appearance." + text += "
    Transform to initial appearance." else - text += "changeling|NO" + text += "changeling|NO" if(current && current.client && (ROLE_CHANGELING in current.client.prefs.be_special)) text += "|Enabled in Prefs" @@ -264,11 +264,11 @@ text = uppertext(text) text = "[text]: " if(src in ticker.mode.vampires) - text += "VAMPIRE|no" + text += "VAMPIRE|no" if(objectives.len==0) - text += "
    Objectives are empty! Randomize!" + text += "
    Objectives are empty! Randomize!" else - text += "vampire|NO" + text += "vampire|NO" if(current && current.client && (ROLE_VAMPIRE in current.client.prefs.be_special)) text += "|Enabled in Prefs" @@ -277,7 +277,7 @@ /** Enthralled ***/ text += "
    enthralled: " if(src in ticker.mode.vampire_enthralled) - text += "THRALL|no" + text += "THRALL|no" else text += "thrall|NO" @@ -290,17 +290,17 @@ text = uppertext(text) text = "[text]: " if(src in ticker.mode.syndicates) - text += "OPERATIVE|no" - text += "
    To shuttle, undress, dress up." + text += "OPERATIVE|no" + text += "
    To shuttle, undress, dress up." var/code for(var/obj/machinery/nuclearbomb/bombue in machines) if(length(bombue.r_code) <= 5 && bombue.r_code != "LOLNO" && bombue.r_code != "ADMIN") code = bombue.r_code break if(code) - text += " Code is [code]. tell the code." + text += " Code is [code]. tell the code." else - text += "operative|NO" + text += "operative|NO" if(current && current.client && (ROLE_OPERATIVE in current.client.prefs.be_special)) text += "|Enabled in Prefs" @@ -315,11 +315,11 @@ text = uppertext(text) text = "[text]: " if(src in ticker.mode.shadows) - text += "SHADOWLING|thrall|no" + text += "SHADOWLING|thrall|no" else if(src in ticker.mode.shadowling_thralls) - text += "Shadowling|THRALL|no" + text += "Shadowling|THRALL|no" else - text += "shadowling|thrall|NO" + text += "shadowling|thrall|NO" if(current && current.client && (ROLE_SHADOWLING in current.client.prefs.be_special)) text += "|Enabled in Prefs" @@ -335,10 +335,10 @@ text = uppertext(text) text = "[text]: " if(src in ticker.mode.abductors) - text += "ABDUCTOR|no" - text += "|undress|equip" + text += "ABDUCTOR|no" + text += "|undress|equip" else - text += "abductor|NO" + text += "abductor|NO" if(current && current.client && (ROLE_ABDUCTOR in current.client.prefs.be_special)) text += "|Enabled in Prefs" @@ -354,11 +354,11 @@ text = uppertext(text) text = "[text]: " if(src in ticker.mode.traitors) - text += "TRAITOR|no" + text += "TRAITOR|no" if(objectives.len==0) - text += "
    Objectives are empty! Randomize!" + text += "
    Objectives are empty! Randomize!" else - text += "traitor|NO" + text += "traitor|NO" if(current && current.client && (ROLE_TRAITOR in current.client.prefs.be_special)) text += "|Enabled in Prefs" @@ -373,14 +373,14 @@ text = "silicon" var/mob/living/silicon/robot/robot = current if(istype(robot) && robot.emagged) - text += "
    Cyborg: Is emagged! Unemag!
    0th law: [robot.laws.zeroth_law]" + text += "
    Cyborg: Is emagged! Unemag!
    0th law: [robot.laws.zeroth_law]" var/mob/living/silicon/ai/ai = current if(istype(ai) && ai.connected_robots.len) var/n_e_robots = 0 for(var/mob/living/silicon/robot/R in ai.connected_robots) if(R.emagged) n_e_robots++ - text += "
    [n_e_robots] of [ai.connected_robots.len] slaved cyborgs are emagged. Unemag" + text += "
    [n_e_robots] of [ai.connected_robots.len] slaved cyborgs are emagged. Unemag" if(ticker.mode.config_tag == "traitorchan") if(sections["traitor"]) @@ -411,15 +411,15 @@ (src in ticker.mode.syndicates)) && \ istype(current,/mob/living/carbon/human) ) - text = "Uplink: give" + text = "Uplink: give" var/obj/item/device/uplink/hidden/suplink = find_syndicate_uplink() var/crystals if(suplink) crystals = suplink.uses if(suplink) - text += "|take" + text += "|take" if(usr.client.holder.rights & (R_SERVER|R_EVENT)) - text += ", [crystals] crystals" + text += ", [crystals] crystals" else text += ", [crystals] crystals" text += "." //hiel grammar @@ -429,18 +429,18 @@ out += "Memory:
    " out += memory - out += "
    Edit memory
    " + out += "
    Edit memory
    " out += "Objectives:
    " if(objectives.len == 0) out += "EMPTY
    " else var/obj_count = 1 for(var/datum/objective/objective in objectives) - out += "[obj_count]: [objective.explanation_text] Edit Delete Toggle Completion
    " + out += "[obj_count]: [objective.explanation_text] Edit Delete Toggle Completion
    " obj_count++ - out += "Add objective

    " + out += "Add objective

    " - out += "Announce objectives

    " + out += "Announce objectives

    " usr << browse(out, "window=edit_memory[src];size=400x500") diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm index 995c494dc14..6d8866640e4 100644 --- a/code/datums/wires/wires.dm +++ b/code/datums/wires/wires.dm @@ -95,9 +95,9 @@ var/list/wireColours = list("red", "blue", "green", "black", "orange", "brown", html += "" html += "[capitalize(colour)]" html += "" - html += "[IsColourCut(colour) ? "Mend" : "Cut"]" - html += " Pulse" - html += " [IsAttached(colour) ? "Detach" : "Attach"] Signaller" + html += "[IsColourCut(colour) ? "Mend" : "Cut"]" + html += " Pulse" + html += " [IsAttached(colour) ? "Detach" : "Attach"] Signaller" html += "" html += "" diff --git a/code/game/gamemodes/changeling/evolution_menu.dm b/code/game/gamemodes/changeling/evolution_menu.dm index 43f08584823..4a6b3a2bd2c 100644 --- a/code/game/gamemodes/changeling/evolution_menu.dm +++ b/code/game/gamemodes/changeling/evolution_menu.dm @@ -95,7 +95,7 @@ var/list/sting_paths if(!ownsthis) { - body += "Evolve" + body += "Evolve" } body += ""; @@ -211,7 +211,7 @@ var/list/sting_paths Hover over a power to see more information
    Current ability choices remaining: [changeling.geneticpoints]
    By rendering a lifeform to a husk, we gain enough power to alter and adapt our evolutions.
    - (Readapt)
    + (Readapt)

    diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index 5e6f63ef2da..e60b7406675 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -289,16 +289,16 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", words[w] = w notedat = {"
    Word translation notes
    - [words[1]] is [words[words[1]]] Clear
    - [words[2]] is [words[words[2]]] Clear
    - [words[3]] is [words[words[3]]] Clear
    - [words[4]] is [words[words[4]]] Clear
    - [words[5]] is [words[words[5]]] Clear
    - [words[6]] is [words[words[6]]] Clear
    - [words[7]] is [words[words[7]]] Clear
    - [words[8]] is [words[words[8]]] Clear
    - [words[9]] is [words[words[9]]] Clear
    - [words[10]] is [words[words[10]]] Clear
    + [words[1]] is [words[words[1]]] Clear
    + [words[2]] is [words[words[2]]] Clear
    + [words[3]] is [words[words[3]]] Clear
    + [words[4]] is [words[words[4]]] Clear
    + [words[5]] is [words[words[5]]] Clear
    + [words[6]] is [words[words[6]]] Clear
    + [words[7]] is [words[words[7]]] Clear
    + [words[8]] is [words[words[8]]] Clear
    + [words[9]] is [words[words[9]]] Clear
    + [words[10]] is [words[words[10]]] Clear
    "} usr << browse("[notedat]", "window=notes") // call(/obj/item/weapon/tome/proc/edit_notes)() @@ -311,16 +311,16 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", // to_chat(world, "its been called! [usr]") // notedat = {" //
    Word translation notes
    -// [words[1]] is [words[words[1]]] Clear
    -// [words[2]] is [words[words[2]]] Clear
    -// [words[3]] is [words[words[3]]] Clear
    -// [words[4]] is [words[words[4]]] Clear
    -// [words[5]] is [words[words[5]]] Clear
    -// [words[6]] is [words[words[6]]] Clear
    -// [words[7]] is [words[words[7]]] Clear
    -// [words[8]] is [words[words[8]]] Clear
    -// [words[9]] is [words[words[9]]] Clear
    -// [words[10]] is [words[words[10]]] Clear
    +// [words[1]] is [words[words[1]]] Clear
    +// [words[2]] is [words[words[2]]] Clear
    +// [words[3]] is [words[words[3]]] Clear
    +// [words[4]] is [words[words[4]]] Clear
    +// [words[5]] is [words[words[5]]] Clear
    +// [words[6]] is [words[words[6]]] Clear
    +// [words[7]] is [words[words[7]]] Clear
    +// [words[8]] is [words[words[8]]] Clear
    +// [words[9]] is [words[words[9]]] Clear
    +// [words[10]] is [words[words[10]]] Clear
    // "} // to_chat(usr, "whatev") // usr << browse(null, "window=tank") @@ -394,16 +394,16 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", return notedat = {"
    Word translation notes
    - [words[1]] is [words[words[1]]] Clear
    - [words[2]] is [words[words[2]]] Clear
    - [words[3]] is [words[words[3]]] Clear
    - [words[4]] is [words[words[4]]] Clear
    - [words[5]] is [words[words[5]]] Clear
    - [words[6]] is [words[words[6]]] Clear
    - [words[7]] is [words[words[7]]] Clear
    - [words[8]] is [words[words[8]]] Clear
    - [words[9]] is [words[words[9]]] Clear
    - [words[10]] is [words[words[10]]] Clear
    + [words[1]] is [words[words[1]]] Clear
    + [words[2]] is [words[words[2]]] Clear
    + [words[3]] is [words[words[3]]] Clear
    + [words[4]] is [words[words[4]]] Clear
    + [words[5]] is [words[words[5]]] Clear
    + [words[6]] is [words[words[6]]] Clear
    + [words[7]] is [words[words[7]]] Clear
    + [words[8]] is [words[words[8]]] Clear
    + [words[9]] is [words[words[9]]] Clear
    + [words[10]] is [words[words[10]]] Clear
    "} // call(/obj/item/weapon/tome/proc/edit_notes)() user << browse("[notedat]", "window=notes") diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm index af678813fae..4f4cd137b80 100644 --- a/code/game/gamemodes/cult/talisman.dm +++ b/code/game/gamemodes/cult/talisman.dm @@ -62,15 +62,15 @@ var/dat = "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/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index c656826dfdb..9842757dc8c 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -570,9 +570,9 @@ Install Module:
    The number afterwards is the amount of processing time it consumes.
    "} for(var/datum/AI_Module/large/module in src.possible_modules) - dat += "[module.module_name]\[?\] ([module.cost])
    " + dat += "[module.module_name]\[?\] ([module.cost])
    " for(var/datum/AI_Module/small/module in src.possible_modules) - dat += "[module.module_name]\[?\] ([module.cost])
    " + dat += "[module.module_name]\[?\] ([module.cost])
    " dat += "
    " if(src.temp) dat += "[src.temp]" diff --git a/code/game/gamemodes/miniantags/abduction/machinery/console.dm b/code/game/gamemodes/miniantags/abduction/machinery/console.dm index cce429c3635..ddac0731249 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/console.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/console.dm @@ -62,19 +62,19 @@ var/points = experiment.points dat += "Collected Samples : [points]
    " dat += "Transfer data in exchange for supplies:
    " - dat += "Advanced Baton
    " - dat += "Agent Helmet
    " - dat += "Radio Silencer
    " - dat += "Science Tool
    " + dat += "Advanced Baton
    " + dat += "Agent Helmet
    " + dat += "Radio Silencer
    " + dat += "Science Tool
    " else dat += "NO EXPERIMENT MACHINE DETECTED
    " if(pad!=null) dat += "Emergency Teleporter System." dat += "Consider using primary observation console first." - dat += "Activate Teleporter
    " + dat += "Activate Teleporter
    " if(gizmo!=null && gizmo.marked!=null) - dat += "Retrieve Mark
    " + dat += "Retrieve Mark
    " else dat += "Retrieve Mark
    " else @@ -84,14 +84,14 @@ dat += "

    Agent Vest Mode


    " var/mode = vest.mode if(mode == VEST_STEALTH) - dat += "Combat" + dat += "Combat" dat += "Stealth" else dat += "Combat" - dat += "Stealth" + dat += "Stealth" dat+="
    " - dat += "Select Agent Vest Disguise
    " + dat += "Select Agent Vest Disguise
    " else dat += "NO AGENT VEST DETECTED" var/datum/browser/popup = new(user, "computer", "Abductor Console", 400, 500) diff --git a/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm b/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm index 065d2a189fb..4ead0232a2f 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm @@ -47,7 +47,7 @@ item_count++ var/g_color = gland_colors[i] var/amount = amounts[i] - dat += "[amount]" + dat += "[amount]" if(item_count == 3) // Three boxes per line dat +="

    " item_count = 0 diff --git a/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm b/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm index 8adf07a60ba..aea520a48cc 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm @@ -65,9 +65,9 @@ dat += "" else dat += "ERR: Unable to retrieve image data for occupant." - dat += "Probe
    " - dat += "Dissect
    " - dat += "Analyze
    " + dat += "Probe
    " + dat += "Dissect
    " + dat += "Analyze
    " dat += "" else dat += "Experiment " @@ -87,8 +87,8 @@ dat += "
    " dat += "[flash]" dat += "
    " - dat += "Scan" - dat += "Eject Occupant" : "unoccupied=1'>Unoccupied"]" + dat += "Scan" + dat += "Eject Occupant" : "unoccupied=1'>Unoccupied"]" var/datum/browser/popup = new(user, "experiment", "Probing Console", 300, 300) popup.set_title_image(user.browse_rsc_icon(icon, icon_state)) popup.set_content(dat) diff --git a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm index b2a4f56ec13..56bb4dd14c5 100644 --- a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm +++ b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm @@ -6,7 +6,7 @@ icon_state = "swarmer_unactivated" /obj/item/unactivated_swarmer/New() - notify_ghosts("An unactivated swarmer has been created in [get_area(src)]!", enter_link = "(Click to enter)", source = src, attack_not_jump = 1) + notify_ghosts("An unactivated swarmer has been created in [get_area(src)]!", enter_link = "(Click to enter)", source = src, attack_not_jump = 1) ..() /obj/item/unactivated_swarmer/Topic(href, href_list) diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index 1865b6db5d2..34886dde2e0 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -21,13 +21,13 @@ dat += "Using this contract, you may summon an apprentice to aid you on your mission.
    " dat += "If you are unable to establish contact with your apprentice, you can feed the contract back to the spellbook to refund your points.
    " dat += "Which school of magic is your apprentice studying?:
    " - dat += "Destruction
    " + dat += "Destruction
    " dat += "Your apprentice is skilled in offensive magic. They know Magic Missile and Fireball.
    " - dat += "Bluespace Manipulation
    " + dat += "Bluespace Manipulation
    " dat += "Your apprentice is able to defy physics, melting through solid objects and travelling great distances in the blink of an eye. They know Teleport and Ethereal Jaunt.
    " - dat += "Healing
    " + dat += "Healing
    " dat += "Your apprentice is training to cast spells that will aid your survival. They know Forcewall and Charge and come with a Staff of Healing.
    " - dat += "Robeless
    " + dat += "Robeless
    " dat += "Your apprentice is training to cast spells without their robes. They know Knock and Mindswap.
    " user << browse(dat, "window=radio") onclose(user, "radio") diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index 8758d61fc1e..a6e973fc536 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -51,9 +51,9 @@ var/dat = "Soul Stone
    " for(var/mob/living/simple_animal/shade/A in src) dat += "Captured Soul: [A.name]
    " - dat += {"Summon Shade"} + dat += {"Summon Shade"} dat += "
    " - dat += {" Close"} + dat += {" Close"} user << browse(dat, "window=aicard") onclose(user, "aicard") return diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index b2d610b3fc6..08a580923f4 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -602,7 +602,7 @@ var/list/cat_dat = list() for(var/category in categories) cat_dat[category] = "
    " - dat += "
  • [category]
  • " + dat += "
  • [category]
  • " dat += "
  • Points remaining : [uses]
  • " dat += "" @@ -613,11 +613,11 @@ E = entries[i] spell_info += E.GetInfo() if(E.CanBuy(user,src)) - spell_info+= "[E.buy_word]
    " + spell_info+= "[E.buy_word]
    " else spell_info+= "Can't [E.buy_word]
    " if(E.CanRefund(user,src)) - spell_info+= "Refund
    " + spell_info+= "Refund
    " spell_info += "
    " if(cat_dat[E.category]) cat_dat[E.category] += spell_info diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index 1be15bef9e9..17def02752f 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -76,7 +76,7 @@ t += "(Swipe ID card to unlock control panel.)
    " else t += text("Dispenser [] - []?
    \n", src.disabled?"deactivated":"activated", src, src.disabled?"Enable":"Disable") - t += text("Uses Left: [uses]. Activate the dispenser?
    \n") + 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/atmo_control.dm b/code/game/machinery/atmo_control.dm index c006eda987f..f534a86f31c 100644 --- a/code/game/machinery/atmo_control.dm +++ b/code/game/machinery/atmo_control.dm @@ -33,15 +33,15 @@ obj/machinery/air_sensor return {" Main "} multitool_topic(var/mob/user, var/list/href_list, var/obj/O) @@ -274,13 +274,13 @@ legend { var/dat= {" Main Sensors: "} + dat += {"
  • [sensors[id_tag]]
  • "} + dat += {"
  • \[+\]
  • "} return dat multitool_topic(var/mob/user,var/list/href_list,var/obj/O) @@ -339,7 +339,7 @@ legend { var/dat="" if(istype(O,/obj/machinery/air_sensor) || istype(O, /obj/machinery/meter)) - dat += " \[New Sensor\] " + dat += " \[New Sensor\] " return dat canLink(var/obj/O, var/list/context) @@ -386,15 +386,15 @@ legend { multitool_menu(var/mob/user, var/obj/item/device/multitool/P) var/dat= {" Sensors: "} + dat += {"
  • [sensors[id_tag]]
  • "} + dat += {"
  • \[+\]
  • "} return dat @@ -433,9 +433,9 @@ legend { linkMenu(var/obj/O) var/dat="" if(canLink(O,list("slot"="input"))) - dat += " \[Link @ Input\] " + dat += " \[Link @ Input\] " if(canLink(O,list("slot"="output"))) - dat += " \[Link @ Output\] " + dat += " \[Link @ Output\] " return dat canLink(var/obj/O, var/list/context) @@ -468,11 +468,11 @@ legend { var/volume_rate = input_info["volume_rate"] output += {"
    - Input (Refresh) + Input (Refresh) - + @@ -483,28 +483,28 @@ legend { "} else - output += "ERROR: Can not find input portSearch
    " + output += "ERROR: Can not find input portSearch
    " if(output_tag) if(output_info) var/power = (output_info["power"]) var/output_pressure = output_info["internal"] output += {"
    - Output (Refresh) + Output (Refresh)
    State:[power?("Injecting"):("On Hold")][power?("Injecting"):("On Hold")]
    Rate:
    - + - +
    State:[power?("Open"):("On Hold")][power?("Open"):("On Hold")]
    Max Output Pressure:[output_pressure] kPa[output_pressure] kPa
    "} else - output += "ERROR: Can not find output port Search
    " + output += "ERROR: Can not find output port Search
    " return output @@ -628,7 +628,7 @@ legend { return_text() var/output = ..() - output += "
    Fuel Injection System (Refresh)" + output += "
    Fuel Injection System (Refresh)" if(device_info) var/power = device_info["power"] var/volume_rate = device_info["volume_rate"] @@ -643,13 +643,13 @@ legend { Automated Fuel Injection: - [automation?"Engaged":"Disengaged"] + [automation?"Engaged":"Disengaged"] "} if(automation) // AUTOFIXED BY fix_string_idiocy.py - // C:\Users\Rob\Documents\Projects\vgstation13\code\game\machinery\atmo_control.dm:372: output += "Automated Fuel Injection: Engaged
    " + // C:\Users\Rob\Documents\Projects\vgstation13\code\game\machinery\atmo_control.dm:372: output += "Automated Fuel Injection: Engaged
    " output += {" Injector Controls Locked Out @@ -658,16 +658,16 @@ legend { else // AUTOFIXED BY fix_string_idiocy.py - // C:\Users\Rob\Documents\Projects\vgstation13\code\game\machinery\atmo_control.dm:375: output += "Automated Fuel Injection: Disengaged
    " + // C:\Users\Rob\Documents\Projects\vgstation13\code\game\machinery\atmo_control.dm:375: output += "Automated Fuel Injection: Disengaged
    " output += {" Injector: - Toggle Power Inject (1 Cycle) + Toggle Power Inject (1 Cycle) "} // END AUTOFIX output += "" else - output += {"

    ERROR: Can not find device. Search

    "} + output += {"

    ERROR: Can not find device. Search

    "} output += "
    " return output diff --git a/code/game/machinery/atmoalter/area_atmos_computer.dm b/code/game/machinery/atmoalter/area_atmos_computer.dm index 36b680f1ebc..79a2a514de5 100644 --- a/code/game/machinery/atmoalter/area_atmos_computer.dm +++ b/code/game/machinery/atmoalter/area_atmos_computer.dm @@ -71,13 +71,13 @@

    Area Air Control

    [status]
    - Scan + Scan "} for(var/obj/machinery/portable_atmospherics/scrubber/huge/scrubber in connectedscrubbers) dat += {" - + "} dat += {" diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm index 2b575f15b65..51d4ebc595c 100644 --- a/code/game/machinery/atmoalter/meter.dm +++ b/code/game/machinery/atmoalter/meter.dm @@ -153,6 +153,6 @@ return {" Main"} diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index b44d51c9b30..d00cbb211b2 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -346,12 +346,12 @@ var/multiplier = L[2] var/list/LL = get_design_cost_as_list(D,multiplier) var/is_stack = (multiplier>1) - output += "[initial(D.name)][is_stack?" (x[multiplier])":null] - [i>1?"":null] [i↓":null] Remove" + output += "[initial(D.name)][is_stack?" (x[multiplier])":null] - [i>1?"":null] [i↓":null] Remove" temp_metal = max(temp_metal-LL[1],1) temp_glass = max(temp_glass-LL[2],1) output += "" - output += "Clear queue" + output += "Clear queue" output += "" return output @@ -402,7 +402,7 @@ dat += "Metal amount: [materials.amount(MAT_METAL)] cm3
    " dat += "Glass amount: [materials.amount(MAT_GLASS)] cm3
    " - dat += "
    \ + dat += " \ \ \ \ @@ -418,7 +418,7 @@ dat += "
    " line_length = 1 - dat += "" + dat += "" line_length++ dat += "
    [scrubber.name]Turn On Turn OffTurn On Turn Off
    [C][C]
    " @@ -430,7 +430,7 @@ /obj/machinery/autolathe/proc/category_win(mob/user,var/selected_category) var/dat = "
    " dat += "
    " - dat += "Return to main menu" + dat += "Return to main menu" dat += "

    Browsing [selected_category]:


    " dat += "Total amount: [materials.total_amount] / [materials.max_amount] cm3
    " dat += "Metal amount: [materials.amount(MAT_METAL)] cm3
    " @@ -443,16 +443,16 @@ if(disabled || !can_build(D)) dat += "[D.name]" else - dat += "[D.name]" + dat += "[D.name]" if(ispath(D.build_path, /obj/item/stack)) var/max_multiplier = min(D.maxstack, D.materials[MAT_METAL] ?round(materials.amount(MAT_METAL)/D.materials[MAT_METAL]):INFINITY,D.materials[MAT_GLASS]?round(materials.amount(MAT_GLASS)/D.materials[MAT_GLASS]):INFINITY) if(max_multiplier>10 && !disabled) - dat += " x10" + dat += " x10" if(max_multiplier>25 && !disabled) - dat += " x25" + dat += " x25" if(max_multiplier > 0 && !disabled) - dat += " x[max_multiplier]" + dat += " x[max_multiplier]" dat += "[get_design_cost(D)]
    " @@ -465,7 +465,7 @@ /obj/machinery/autolathe/proc/search_win(mob/user) var/dat = "
    " dat += "
    " - dat += "Return to main menu" + dat += "Return to main menu" dat += "

    Search results:


    " dat += "Total amount: [materials.total_amount] / [materials.max_amount] cm3
    " dat += "Metal amount: [materials.amount(MAT_METAL)] cm3
    " @@ -475,16 +475,16 @@ if(disabled || !can_build(D)) dat += "[D.name]" else - dat += "[D.name]" + dat += "[D.name]" if(ispath(D.build_path, /obj/item/stack)) var/max_multiplier = min(D.maxstack, D.materials[MAT_METAL] ?round(materials.amount(MAT_METAL)/D.materials[MAT_METAL]):INFINITY,D.materials[MAT_GLASS]?round(materials.amount(MAT_GLASS)/D.materials[MAT_GLASS]):INFINITY) if(max_multiplier>10 && !disabled) - dat += " x10" + dat += " x10" if(max_multiplier>25 && !disabled) - dat += " x25" + dat += " x25" if(max_multiplier > 0 && !disabled) - dat += " x[max_multiplier]" + dat += " x[max_multiplier]" dat += "[get_design_cost(D)]
    " diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index fed2328570a..fa285e5e457 100644 --- a/code/game/machinery/biogenerator.dm +++ b/code/game/machinery/biogenerator.dm @@ -157,44 +157,44 @@ menustat = "menu" if(beaker) dat += "
    Biomass: [points] units.

    " - dat += "ActivateDetach Container
    " - dat += "Put fertilizer in: [in_beaker ? "Beaker" : "Bottle"]" + dat += "ActivateDetach Container
    " + dat += "Put fertilizer in: [in_beaker ? "Beaker" : "Bottle"]" dat += "

    Food:

    " dat += "
    " - dat += "10 milk: Make ([20/efficiency])
    " - dat += "10 cream: Make ([30/efficiency])
    " - dat += "Monkey cube: Make ([250/efficiency])" + dat += "10 milk: Make ([20/efficiency])
    " + dat += "10 cream: Make ([30/efficiency])
    " + dat += "Monkey cube: Make ([250/efficiency])" dat += "
    " dat += "

    Nutrients:

    " dat += "
    " - dat += "E-Z-Nutrient: Makex5 ([10/efficiency])
    " - dat += "Left 4 Zed: Makex5 ([20/efficiency])
    " - dat += "Robust Harvest: Makex5 ([25/efficiency])
    " + dat += "E-Z-Nutrient: Makex5 ([10/efficiency])
    " + dat += "Left 4 Zed: Makex5 ([20/efficiency])
    " + dat += "Robust Harvest: Makex5 ([25/efficiency])
    " dat += "
    " dat += "

    Leather:

    " dat += "
    " - dat += "Wallet: Make ([100/efficiency])
    " - dat += "Book bag: Make ([200/efficiency])
    " - dat += "Plant bag: Make ([200/efficiency])
    " - dat += "Rag: Make ([200/efficiency])
    " - dat += "Mining satchel: Make ([200/efficiency])
    " - dat += "Chemistry bag: Make ([200/efficiency])
    " - dat += "Botanical gloves: Make ([250/efficiency])
    " - dat += "Leather Satchel: Make ([400/efficiency])
    " - dat += "Cash Bag: Make ([400/efficiency])
    " - dat += "Leather Jacket: Make ([500/efficiency])
    " + dat += "Wallet: Make ([100/efficiency])
    " + dat += "Book bag: Make ([200/efficiency])
    " + dat += "Plant bag: Make ([200/efficiency])
    " + dat += "Rag: Make ([200/efficiency])
    " + dat += "Mining satchel: Make ([200/efficiency])
    " + dat += "Chemistry bag: Make ([200/efficiency])
    " + dat += "Botanical gloves: Make ([250/efficiency])
    " + dat += "Leather Satchel: Make ([400/efficiency])
    " + dat += "Cash Bag: Make ([400/efficiency])
    " + dat += "Leather Jacket: Make ([500/efficiency])
    " dat += "
    " dat += "

    Belts

    " dat += "
    " - dat += "Utility belt: Make ([300/efficiency])
    " - dat += "Botanist belt: Make ([300/efficiency])
    " - dat += "Security belt: Make ([300/efficiency])
    " - dat += "Medical belt: Make ([300/efficiency])
    " - dat += "Janitor belt: Make ([300/efficiency])
    " - dat += "Bandolier: Make ([300/efficiency])
    " + dat += "Utility belt: Make ([300/efficiency])
    " + dat += "Botanist belt: Make ([300/efficiency])
    " + dat += "Security belt: Make ([300/efficiency])
    " + dat += "Medical belt: Make ([300/efficiency])
    " + dat += "Janitor belt: Make ([300/efficiency])
    " + dat += "Bandolier: Make ([300/efficiency])
    " dat += "
    " //dat += "

    Other:

    " - //dat += "Monkey: Make ([400/efficiency])
    " + //dat += "Monkey: Make ([400/efficiency])
    " else dat += "
    No container inside. Please insert a container.
    " diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index 5bff1c651ec..a5c65f7cae7 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -78,7 +78,7 @@ return {" "} diff --git a/code/game/machinery/chiller.dm b/code/game/machinery/chiller.dm index 45ec0337fea..adf81a0aff6 100644 --- a/code/game/machinery/chiller.dm +++ b/code/game/machinery/chiller.dm @@ -80,20 +80,20 @@ var/dat dat = "Power cell: " if(cell) - dat += "Installed
    " + dat += "Installed
    " else - dat += "Removed
    " + dat += "Removed
    " // AUTOFIXED BY fix_string_idiocy.py // C:\Users\Rob\Documents\Projects\vgstation13\code\ATMOSPHERICS\chiller.dm:95: dat += "Power Level: [cell ? round(cell.percent(),1) : 0]%

    " dat += {"Power Level: [cell ? round(cell.percent(),1) : 0]%

    Set Temperature: - - - - + - + - [temp]°C - + - +
    "} + + + +
    "} // END AUTOFIX user.set_machine(src) user << browse("Air Conditioner Control Panel[dat]", "window=aircond") diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index 56a1f151876..eafdbe893ab 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -26,35 +26,35 @@ dat += "Holodeck Control System
    " dat += "
    Current Loaded Programs:
    " - dat += "((Empty Court))
    " - dat += "((Boxing Court))
    " - dat += "((Basketball Court))
    " - dat += "((Thunderdome Court))
    " - dat += "((Beach))
    " - dat += "((Desert))
    " - dat += "((Space))
    " - dat += "((Picnic Area))
    " - dat += "((Snow Field))
    " - dat += "((Theatre))
    " - dat += "((Meeting Hall))
    " - dat += "((Knight Arena))
    " -// dat += "((Shutdown System))
    " + dat += "((Empty Court))
    " + dat += "((Boxing Court))
    " + dat += "((Basketball Court))
    " + dat += "((Thunderdome Court))
    " + dat += "((Beach))
    " + dat += "((Desert))
    " + dat += "((Space))
    " + dat += "((Picnic Area))
    " + dat += "((Snow Field))
    " + dat += "((Theatre))
    " + dat += "((Meeting Hall))
    " + dat += "((Knight Arena))
    " +// dat += "((Shutdown System))
    " dat += "Please ensure that only holographic weapons are used in the holodeck if a combat simulation has been loaded.
    " if(emagged) -/* dat += "(Begin Atmospheric Burn Simulation)
    " +/* dat += "(Begin Atmospheric Burn Simulation)
    " dat += "Ensure the holodeck is empty before testing.
    " dat += "
    "*/ - dat += "(Begin Wildlife Simulation)
    " + dat += "(Begin Wildlife Simulation)
    " dat += "Ensure the holodeck is empty before testing.
    " dat += "
    " if(issilicon(user)) - dat += "(Re-Enable Safety Protocols?)
    " + dat += "(Re-Enable Safety Protocols?)
    " dat += "Safety Protocols are DISABLED
    " else if(issilicon(user)) - dat += "(Override Safety Protocols?)
    " + dat += "(Override Safety Protocols?)
    " dat += "
    " dat += "Safety Protocols are ENABLED
    " diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 48b1dadc406..65a1730bacd 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -82,18 +82,18 @@ if(..()) return user.set_machine(src) - var/dat = "Close" + var/dat = "Close" dat += "

    [enemy_name]

    " dat += "

    [temp]

    " dat += "
    Health: [player_hp] | Magic: [player_mp] | Enemy Health: [enemy_hp]
    " if(gameover) - dat += "
    New Game" + dat += "
    New Game" else - dat += "
    Attack | " - dat += "Heal | " - dat += "Recharge Power" + dat += "
    Attack | " + dat += "Heal | " + dat += "Recharge Power" dat += "
    " @@ -376,7 +376,7 @@ M.adjust_fire_stacks(5) M.IgniteMob() //flew into a star, so you're on fire to_chat(user, "You feel an immense wave of heat emanate from the arcade machine. Your skin bursts into flames.") - dat += "

    OK...

    " + dat += "

    OK...

    " if(emagged) to_chat(user, "You're never going to make it to Orion...") @@ -398,16 +398,16 @@ dat += "
    Food: [food] | Fuel: [fuel]" dat += "
    Engine Parts: [engine] | Hull Panels: [hull] | Electronics: [electronics]" if(turns == 7) - dat += "

    Go Around Continue

    " + dat += "

    Go Around Continue

    " else - dat += "

    Continue

    " - dat += "

    Kill a crewmember

    " - dat += "

    Close

    " + dat += "

    Continue

    " + dat += "

    Kill a crewmember

    " + dat += "

    Close

    " else dat = "

    The Orion Trail

    " dat += "

    Experience the journey of your ancestors!



    " - dat += "
    New Game
    " - dat += "

    Close

    " + dat += "
    New Game
    " + dat += "

    Close

    " var/datum/browser/popup = new(user, "arcade", "The Orion Trail",400,700) popup.set_content(dat) popup.set_title_image(user.browse_rsc_icon(icon, icon_state)) @@ -693,39 +693,39 @@ eventdat += "
    [deadname] tried to fight back but was killed." else eventdat += "
    Fortunately you fended them off without any trouble." - eventdat += "

    Continue

    " - eventdat += "

    Close

    " + eventdat += "

    Continue

    " + eventdat += "

    Close

    " if(ORION_TRAIL_FLUX) eventdat += "This region of space is highly turbulent.
    If we go slowly we may avoid more damage, but if we keep our speed we won't waste supplies." eventdat += "
    What will you do?" - eventdat += "

    Slow Down Continue

    " - eventdat += "

    Close

    " + eventdat += "

    Slow Down Continue

    " + eventdat += "

    Close

    " if(ORION_TRAIL_ILLNESS) eventdat += "A deadly illness has been contracted!" var/deadname = remove_crewmember() eventdat += "
    [deadname] was killed by the disease." - eventdat += "

    Continue

    " - eventdat += "

    Close

    " + eventdat += "

    Continue

    " + eventdat += "

    Close

    " if(ORION_TRAIL_BREAKDOWN) eventdat += "Oh no! The engine has broken down!" eventdat += "
    You can repair it with an engine part, or you can make repairs for 3 days." if(engine >= 1) - eventdat += "

    Use PartWait

    " + eventdat += "

    Use PartWait

    " else - eventdat += "

    Wait

    " - eventdat += "

    Close

    " + eventdat += "

    Wait

    " + eventdat += "

    Close

    " if(ORION_TRAIL_MALFUNCTION) eventdat += "The ship's systems are malfunctioning!" eventdat += "
    You can replace the broken electronics with spares, or you can spend 3 days troubleshooting the AI." if(electronics >= 1) - eventdat += "

    Use PartWait

    " + eventdat += "

    Use PartWait

    " else - eventdat += "

    Wait

    " - eventdat += "

    Close

    " + eventdat += "

    Wait

    " + eventdat += "

    Close

    " if(ORION_TRAIL_COLLISION) eventdat += "Something hit us! Looks like there's some hull damage." @@ -740,23 +740,23 @@ eventdat += "
    [deadname] was killed by rapid depressurization." eventdat += "
    You can repair the damage with hull plates, or you can spend the next 3 days welding scrap together." if(hull >= 1) - eventdat += "

    Use PartWait

    " + eventdat += "

    Use PartWait

    " else - eventdat += "

    Wait

    " - eventdat += "

    Close

    " + eventdat += "

    Wait

    " + eventdat += "

    Close

    " if(ORION_TRAIL_BLACKHOLE) eventdat += "You were swept away into the black hole." - eventdat += "

    Oh...

    " - eventdat += "

    Close

    " + eventdat += "

    Oh...

    " + eventdat += "

    Close

    " settlers = list() if(ORION_TRAIL_LING) eventdat += "Strange reports warn of changelings infiltrating crews on trips to Orion..." if(settlers.len <= 2) eventdat += "
    Your crew's chance of reaching Orion is so slim the changelings likely avoided your ship..." - eventdat += "

    Continue

    " - eventdat += "

    Close

    " + eventdat += "

    Continue

    " + eventdat += "

    Close

    " if(prob(10)) // "likely", I didn't say it was guaranteed! lings_aboard = min(++lings_aboard,2) else @@ -766,9 +766,9 @@ else if(prob(70)) lings_aboard = min(++lings_aboard,2) - eventdat += "

    Kill a crewmember

    " - eventdat += "

    Risk it

    " - eventdat += "

    Close

    " + eventdat += "

    Kill a crewmember

    " + eventdat += "

    Risk it

    " + eventdat += "

    Close

    " if(ORION_TRAIL_LING_ATTACK) if(lings_aboard <= 0) //shouldn't trigger, but hey. @@ -808,8 +808,8 @@ else lings_aboard = max(0,--lings_aboard) - eventdat += "

    Continue

    " - eventdat += "

    Close

    " + eventdat += "

    Continue

    " + eventdat += "

    Close

    " if(ORION_TRAIL_SPACEPORT) @@ -817,8 +817,8 @@ eventdat += "The Spaceport is on high alert! they wont let you dock since you tried to attack them!" if(last_spaceport_action) eventdat += "
    Last Spaceport Action: [last_spaceport_action]" - eventdat += "

    Depart Spaceport

    " - eventdat += "

    Close

    " + eventdat += "

    Depart Spaceport

    " + eventdat += "

    Close

    " else eventdat += "You pull the ship up to dock at a nearby Spaceport, lucky find!" eventdat += "
    This Spaceport is home to travellers who failed to reach Orion, but managed to find a different home..." @@ -857,13 +857,13 @@ //Buy crew if(food >= 10 && fuel >= 10) - eventdat += "

    Hire a new Crewmember (-10FU,-10FO)

    " + eventdat += "

    Hire a new Crewmember (-10FU,-10FO)

    " else eventdat += "

    Cant afford a new Crewmember

    " //Sell crew if(settlers.len > 1) - eventdat += "

    Sell crew for Fuel and Food (+15FU,+15FO)

    " + eventdat += "

    Sell crew for Fuel and Food (+15FU,+15FO)

    " else eventdat += "

    Cant afford to sell a Crewmember

    " @@ -872,37 +872,37 @@ //Engine parts if(fuel > 5) - eventdat += "

    Buy Engine Parts (-5FU)

    " + eventdat += "

    Buy Engine Parts (-5FU)

    " else eventdat += "

    Cant afford to buy Engine Parts" //Hull plates if(fuel > 5) - eventdat += "

    Buy Hull Plates (-5FU)

    " + eventdat += "

    Buy Hull Plates (-5FU)

    " else eventdat += "

    Cant afford to buy Hull Plates" //Electronics if(fuel > 5) - eventdat += "

    Buy Spare Electronics (-5FU)

    " + eventdat += "

    Buy Spare Electronics (-5FU)

    " else eventdat += "

    Cant afford to buy Spare Electronics" //Trade if(fuel > 5) - eventdat += "

    Trade Fuel for Food (-5FU,+5FO)

    " + eventdat += "

    Trade Fuel for Food (-5FU,+5FO)

    " else eventdat += "

    Cant afford to Trade Fuel for Food 5) - eventdat += "

    Trade Food for Fuel (+5FU,-5FO)

    " + eventdat += "

    Trade Food for Fuel (+5FU,-5FO)

    " else eventdat += "

    Cant afford to Trade Food for FuelMain Menu | " : ""]Close \]" + dat += "
    \[ [(src.state != STATE_DEFAULT) ? "Main Menu | " : ""]Close \]" user << browse(dat, "window=honkputer;size=400x500") onclose(user, "honkputer") diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 780bdd55f8e..f305b2a2929 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -28,21 +28,21 @@ return var/dat if(src.temp) - dat = text("[src.temp]

    Clear Screen") + dat = text("[src.temp]

    Clear Screen") else dat = text("Confirm Identity: []


    ", src, (src.scan ? text("[]", src.scan.name) : "----------")) if(src.authenticated) switch(src.screen) if(1.0) dat += {" -Search Records -
    List Records +Search Records +
    List Records
    -
    Virus Database -
    Medbot Tracking +
    Virus Database +
    Medbot Tracking
    -
    Record Maintenance -
    {Log Out}
    +
    Record Maintenance +
    {Log Out}
    "} if(2.0) dat += "Record List:
    " @@ -58,11 +58,11 @@ if((istype(src.active1, /datum/data/record) && data_core.general.Find(src.active1))) dat += "
    Name: [active1.fields["name"]] \ ID: [active1.fields["id"]]
    \n \ - Sex: [active1.fields["sex"]]
    \n \ - Age: [active1.fields["age"]]
    \n \ - Fingerprint: [active1.fields["fingerprint"]]
    \n \ - Physical Status: [active1.fields["p_stat"]]
    \n \ - Mental Status: [active1.fields["m_stat"]]
    \ + Sex: [active1.fields["sex"]]
    \n \ + Age: [active1.fields["age"]]
    \n \ + Fingerprint: [active1.fields["fingerprint"]]
    \n \ + Physical Status: [active1.fields["p_stat"]]
    \n \ + Mental Status: [active1.fields["m_stat"]]
    \ Photo:
    \
    " else @@ -77,7 +77,7 @@ dat += text("Delete Record (Medical Only)

    ", src) else dat += "Medical Record Lost!
    " - dat += text("New Record

    ") + dat += text("New Record

    ") dat += text("\nPrint Record
    \nBack
    ", src, src) if(5.0) dat += "
    Virus Database
    " @@ -87,11 +87,11 @@ continue // TODO (tm): Add advance diseases to the virus database which no one uses. if(!Dis.desc) continue - dat += "
    [Dis.name]" - dat += "
    Back" + dat += "
    [Dis.name]" + dat += "
    Back" if(6.0) dat += "
    Medical Robot Monitor
    " - dat += "Back" + dat += "Back" dat += "
    Medical Robots:" var/bdat = null for(var/mob/living/simple_animal/bot/medbot/M in world) diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index 50dc9c19603..12e8acfcf95 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -103,10 +103,10 @@ dat += "

    " if(auth) - dat += "

    \[Authenticated\] /" - dat += " Server Power: [src.linkedServer && src.linkedServer.active ? "\[On\]":"\[Off\]"]

    " + dat += "

    \[Authenticated\] /" + dat += " Server Power: [src.linkedServer && src.linkedServer.active ? "\[On\]":"\[Off\]"]

    " else - dat += "

    \[Unauthenticated\] /" + dat += "

    \[Unauthenticated\] /" dat += " Server Power: [src.linkedServer && src.linkedServer.active ? "\[On\]":"\[Off\]"]

    " if(hacking || emag) @@ -120,24 +120,24 @@ if(0) // = TAB var/i = 0 - dat += "
    [++i]. Link To A Server
    " + dat += "
    [++i]. Link To A Server
    " if(auth) if(!linkedServer || (linkedServer.stat & (NOPOWER|BROKEN))) dat += "
    ERROR: Server not found!
    " else - dat += "
    [++i]. View Message Logs
    " - dat += "
    [++i]. View Request Console Logs
    " - dat += "
    [++i]. Clear Message Logs
    " - dat += "
    [++i]. Clear Request Console Logs
    " - dat += "
    [++i]. Set Custom Key
    " - dat += "
    [++i]. Send Admin Message
    " - dat += "
    [++i]. View Chatrooms
    " + dat += "
    [++i]. View Message Logs
    " + dat += "
    [++i]. View Request Console Logs
    " + dat += "
    [++i]. Clear Message Logs
    " + dat += "
    [++i]. Clear Request Console Logs
    " + dat += "
    [++i]. Set Custom Key
    " + dat += "
    [++i]. Send Admin Message
    " + dat += "
    [++i]. View Chatrooms
    " else for(var/n = ++i; n <= optioncount; n++) dat += "
    [n]. ---------------
    " if((istype(user, /mob/living/silicon/ai) || istype(user, /mob/living/silicon/robot)) && (user.mind.special_role && user.mind.original == user)) //Malf/Traitor AIs can bruteforce into the system to gain the Key. - dat += "
    *&@#. Bruteforce Key
    " + dat += "
    *&@#. Bruteforce Key
    " else dat += "
    " @@ -153,7 +153,7 @@ //var/recipient = "Unspecified" //name of the person //var/sender = "Unspecified" //name of the sender //var/message = "Blank" //transferred message - dat += "
    Back - Refresh

    " + dat += "
    Back - Refresh

    " dat += "" for(var/datum/data_pda_msg/pda in src.linkedServer.pda_msgs) index++ @@ -161,7 +161,7 @@ break // Del - Sender - Recepient - Message // X - Al Green - Your Mom - WHAT UP!? - dat += "" + dat += "" dat += "
    XSenderRecipientMessage
    X
    [pda.sender][pda.recipient][pda.message]
    X
    [pda.sender][pda.recipient][pda.message]
    " //Hacking screen. if(2) @@ -208,13 +208,13 @@ //Fake messages if(3) - dat += "
    Back - Reset

    " + dat += "
    Back - Reset

    " dat += {" - - - - "} + + + + "} //Sender - Sender's Job - Recepient - Message //Al Green- Your Dad - Your Mom - WHAT UP!? @@ -222,7 +222,7 @@ "} - dat += "
    SenderSender's JobRecipientMessage
    SenderSender's JobRecipientMessage
    [customjob] [customrecepient ? customrecepient.owner : "NONE"] [custommessage]

    Send" + dat += "


    Send" //Request Console Logs if(4) @@ -237,7 +237,7 @@ var/id_auth = "Unauthenticated" - 15% var/priority = "Normal" - 10% */ - dat += "
    Back - Refresh

    " + dat += "
    Back - Refresh

    " dat += {""} for(var/datum/data_rc_msg/rc in src.linkedServer.rc_msgs) @@ -246,12 +246,12 @@ break // Del - Sender - Recepient - Message // X - Al Green - Your Mom - WHAT UP!? - dat += {" + dat += {""} dat += "
    XSending Dep.Receiving Dep. MessageStampID Auth.Priority.
    X
    [rc.send_dpt]
    X
    [rc.send_dpt] [rc.rec_dpt][rc.message][rc.stamp][rc.id_auth][rc.priority]
    " //Chat room list if(5) - dat += "
    Back - Refresh

    " + dat += "
    Back - Refresh

    " dat += {" @@ -262,7 +262,7 @@ for(var/datum/chatroom/C in chatrooms) var/list/invites = (C.invites - C.users) dat += {" - + @@ -270,7 +270,7 @@ dat += "
    Room Name
    [C.name][C.name] [C.users.len] [invites.len] [C.logs.len]
    " //View chat room logs if(6) - dat += "
    Back - Refresh

    " + dat += "
    Back - Refresh

    " dat += {" @@ -495,7 +495,7 @@ //Sender isn't faking as someone who exists if(isnull(PDARec)) src.linkedServer.send_pda_message("[customrecepient.owner]", "[customsender]","[custommessage]") - recipient_messenger.notify("Message from [customsender] ([customjob]), \"[custommessage]\" (Reply)") + recipient_messenger.notify("Message from [customsender] ([customjob]), \"[custommessage]\" (Reply)") log_pda("[usr] (PDA: [customsender]) sent \"[custommessage]\" to [customrecepient.owner]") //Sender is faking as someone who exists else diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index 2619e25e4b8..aabcffc7b68 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -119,42 +119,42 @@ if(..()) return - var/dat = "[name](rename)" + var/dat = "[name](rename)" user.set_machine(src) - dat += "
    Reset Connections
    " + dat += "
    Reset Connections
    " if(synced.len) - dat += "
    Fire All Connected Drivers
    " + dat += "
    Fire All Connected Drivers
    " if(istype(src,/obj/machinery/computer/pod/deathsquad)) - dat += "
    Set Teleporter Destination Z-Level
    " + dat += "
    Set Teleporter Destination Z-Level
    " for(var/ident_tag in id_tags) if(!(ident_tag in door_only_tags)) - dat += "

    [ident_tag] remove" + dat += "

    [ident_tag] remove" if(ident_tag in synced) var/d2 = "" if(timings[ident_tag]) //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 = times[ident_tag] % 60 var/minute = (times[ident_tag] - second) / 60 var/maxsecond = maxtimes[ident_tag] % 60 var/maxminute = (maxtimes[ident_tag] - maxsecond) / 60 - dat += "
    \nTimer System: [d2]\nTime Left: [minute ? "[minute]:" : null][second]/[maxminute ? "[maxminute]:" : null][maxsecond] - - + +" - dat += "
    Set timer to loop: [loopings[ident_tag] ? "Yes" : "No"]" + dat += "
    \nTimer System: [d2]\nTime Left: [minute ? "[minute]:" : null][second]/[maxminute ? "[maxminute]:" : null][maxsecond] - - + +" + dat += "
    Set timer to loop: [loopings[ident_tag] ? "Yes" : "No"]" var/temp = "" var/list/L = list( 0.25, 0.5, 1, 2, 4, 8, 16 ) for(var/t in L) if( powers[ident_tag] == t) - temp += "[t] " + temp += "[t] " else - temp += "[t] " - dat += "
    \nPower Level: [temp]
    \nFire Drive!
    \nToggle Pod Doors
    " + temp += "[t] " + dat += "
    \nPower Level: [temp]
    \nFire Drive!
    \nToggle Pod Doors
    " for(var/ident_tag in door_only_tags) - dat += "

    [ident_tag] remove" - dat += "
    \nToggle Pod Doors
    " + dat += "

    [ident_tag] remove" + dat += "
    \nToggle Pod Doors
    " - dat += "
    add another id_tag" + dat += "
    add another id_tag" dat += "

    Close
    " user << browse(dat, "window=computer;size=400x500") diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index fa1ba551728..be35a85b7a4 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -27,17 +27,17 @@ var/dat dat += "Prisoner Implant Manager System
    " if(screen == 0) - dat += "
    Unlock Console" + dat += "
    Unlock Console" else if(screen == 1) if(istype(inserted_id)) var/p = inserted_id:points var/g = inserted_id:goal - dat += text("[inserted_id]
    ") - dat += text("Collected points: [p]. Reset.
    ") - dat += text("Card goal: [g]. Set
    ") + dat += text("[inserted_id]
    ") + dat += text("Collected points: [p]. Reset.
    ") + dat += text("Card goal: [g]. Set
    ") dat += text("Space Law recommends sentences of 100 points per minute they would normally serve in the brig.
    ") else - dat += text("Insert Prisoner ID
    ") + dat += text("Insert Prisoner ID
    ") var/turf/Tr = null dat += "
    Chemical Implants
    " for(var/obj/item/weapon/implant/chem/C in tracked_implants) @@ -47,9 +47,9 @@ // AUTOFIXED BY fix_string_idiocy.py // C:\Users\Rob\Documents\Projects\vgstation13\code\game\machinery\computer\prisoner.dm:41: dat += "[C.imp_in.name] | Remaining Units: [C.reagents.total_volume] | Inject: " dat += {"[C.imp_in.name] | Remaining Units: [C.reagents.total_volume] | Inject: - ((1)) - ((5)) - ((10))
    + ((1)) + ((5)) + ((10))
    ********************************
    "} // END AUTOFIX dat += "
    Tracking Implants
    " @@ -68,9 +68,9 @@ if(is_station_level(M.z) && !istype(M.loc, /turf/space)) loc_display = "[get_area(M)]" dat += "ID: [T.id]
    Subject: [M]
    Location: [loc_display]
    Health: [health_display]
    " - dat += "(Message Holder) |
    " + dat += "(Message Holder) |
    " dat += "********************************
    " - dat += "
    Lock Console" + dat += "
    Lock Console" user << browse(dat, "window=computer;size=400x500") onclose(user, "computer") diff --git a/code/game/machinery/computer/salvage_ship.dm b/code/game/machinery/computer/salvage_ship.dm index c0693c810d3..f9e35c6e602 100644 --- a/code/game/machinery/computer/salvage_ship.dm +++ b/code/game/machinery/computer/salvage_ship.dm @@ -53,18 +53,18 @@ var/dat = {"Location: [curr_location]
    Ready to move[max(lastMove + SALVAGE_SHIP_COOLDOWN - world.time, 0) ? " in [max(round((lastMove + SALVAGE_SHIP_COOLDOWN - world.time) * 0.1), 0)] seconds" : ": now"]
    - Middle of Nowhere
    - Station Auxiliary Docking | - North of the Station | - East of the Station | - South of the Station
    - South-west of the Mining Asteroid | - Trading Post
    - Clown Asteroid | - Derelict Station | - Ruskie DJ Station
    - Communications Satellite | - Abandoned Ship
    + Middle of Nowhere
    + Station Auxiliary Docking | + North of the Station | + East of the Station | + South of the Station
    + South-west of the Mining Asteroid | + Trading Post
    + Clown Asteroid | + Derelict Station | + Ruskie DJ Station
    + Communications Satellite | + Abandoned Ship
    Close"} user << browse(dat, "window=computer;size=575x450") diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index c03ce8ee440..bf33b157706 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -114,10 +114,10 @@
    Name
    - - - - + + + +"} if(!isnull(data_core.general)) @@ -158,18 +158,18 @@ dat += text("{Log Out}",src) if(2.0) dat += "Records Maintenance
    " - dat += "
    Delete All Records

    Back" + dat += "
    Delete All Records

    Back" if(3.0) dat += "
    Security Record

    " if((istype(active1, /datum/data/record) && data_core.general.Find(active1))) dat += {"
    NameIDRankFingerprintsNameIDRankFingerprints Criminal Status
    @@ -177,7 +177,7 @@ Photo:

    - Print Photo + Print Photo
    - Name: [active1.fields["name"]]
    - ID: [active1.fields["id"]]
    - Sex: [active1.fields["sex"]]
    - Age: [active1.fields["age"]]
    - Rank: [active1.fields["rank"]]
    - Fingerprint: [active1.fields["fingerprint"]]
    + Name: [active1.fields["name"]]
    + ID: [active1.fields["id"]]
    + Sex: [active1.fields["sex"]]
    + Age: [active1.fields["age"]]
    + Rank: [active1.fields["rank"]]
    + Fingerprint: [active1.fields["fingerprint"]]
    Physical Status: [active1.fields["p_stat"]]
    Mental Status: [active1.fields["m_stat"]]
    "} else dat += "General Record Lost!
    " @@ -351,8 +351,8 @@ What a mess.*/ if("Delete All Records") temp = "" temp += "Are you sure you wish to delete all Security records?
    " - temp += "Yes
    " - temp += "No" + temp += "Yes
    " + temp += "No" if("Purge All Records") for(var/datum/data/record/R in data_core.security) @@ -374,14 +374,14 @@ What a mess.*/ if("Delete Record (ALL)") if(active1) temp = "
    Are you sure you wish to delete the record (ALL)?
    " - temp += "Yes
    " - temp += "No" + temp += "Yes
    " + temp += "No" if("Delete Record (Security)") if(active2) temp = "
    Are you sure you wish to delete the record (Security Portion Only)?
    " - temp += "Yes
    " - temp += "No" + temp += "Yes
    " + temp += "No" if("Delete Entry") if((istype(active2, /datum/data/record) && active2.fields[text("com_[]", href_list["del_c"])])) @@ -488,11 +488,11 @@ What a mess.*/ if(istype(active2, /datum/data/record)) temp = "
    Criminal Status:
    " temp += "" if("rank") var/list/L = list( "Head of Personnel", "Captain", "AI" ) @@ -501,7 +501,7 @@ What a mess.*/ temp = "
    Rank:
    " temp += "
      " for(var/rank in joblist) - temp += "
    • [rank]
    • " + temp += "
    • [rank]
    • " temp += "
    " else alert(usr, "You do not have the required rank to do this!") diff --git a/code/game/machinery/computer/skills.dm b/code/game/machinery/computer/skills.dm index 81aa33109f0..32e54dc161b 100644 --- a/code/game/machinery/computer/skills.dm +++ b/code/game/machinery/computer/skills.dm @@ -66,10 +66,10 @@
    - - - - + + + +"} if(!isnull(data_core.general)) for(var/datum/data/record/R in sortRecord(data_core.general, sortBy, order)) @@ -84,17 +84,17 @@ dat += text("{Log Out}",src) if(2.0) dat += "Records Maintenance
    " - dat += "
    Delete All Records

    Back" + dat += "
    Delete All Records

    Back" if(3.0) dat += "
    Employment Record

    " if((istype(active1, /datum/data/record) && data_core.general.Find(active1))) dat += text("
    NameIDRankFingerprintsNameIDRankFingerprints
    \ @@ -267,8 +267,8 @@ What a mess.*/ if("Delete All Records") temp = "" temp += "Are you sure you wish to delete all Employment records?
    " - temp += "Yes
    " - temp += "No" + temp += "Yes
    " + temp += "No" if("Purge All Records") if(PDA_Manifest.len) @@ -280,8 +280,8 @@ What a mess.*/ if("Delete Record (ALL)") if(active1) temp = "
    Are you sure you wish to delete the record (ALL)?
    " - temp += "Yes
    " - temp += "No" + temp += "Yes
    " + temp += "No" //RECORD CREATE if("New Record (General)") @@ -342,7 +342,7 @@ What a mess.*/ temp = "
    Rank:
    " temp += "
      " for(var/rank in joblist) - temp += "
    • [rank]
    • " + temp += "
    • [rank]
    • " temp += "
    " else alert(usr, "You do not have the required rank to do this!") diff --git a/code/game/machinery/computer/specops_shuttle.dm b/code/game/machinery/computer/specops_shuttle.dm index a0386fe80c7..5cd8aa53dfd 100644 --- a/code/game/machinery/computer/specops_shuttle.dm +++ b/code/game/machinery/computer/specops_shuttle.dm @@ -276,7 +276,7 @@ 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
    "] + [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") @@ -303,7 +303,7 @@ var/specops_shuttle_timeleft = 0 to_chat(usr, "\blue The Special Operations shuttle will arrive at Central Command in [(SPECOPS_MOVETIME/10)] seconds.") - temp += "Shuttle departing.

    OK" + temp += "Shuttle departing.

    OK" updateUsrDialog() specops_shuttle_moving_to_centcom = 1 @@ -320,7 +320,7 @@ var/specops_shuttle_timeleft = 0 to_chat(usr, "\blue 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/computer/store.dm b/code/game/machinery/computer/store.dm index 168ceb60e36..31cfb8bfa8c 100644 --- a/code/game/machinery/computer/store.dm +++ b/code/game/machinery/computer/store.dm @@ -79,7 +79,7 @@ td.cost.toomuch { -

    Refresh | Balance: $[balance]

    +

    Refresh | Balance: $[balance]

    [command_name()] Merchandise

    Doing your job and not getting any recognition at work? Well, welcome to the @@ -111,7 +111,7 @@ td.cost.toomuch {

    [item.desc]

    "} diff --git a/code/game/machinery/computer/syndicate_specops_shuttle.dm b/code/game/machinery/computer/syndicate_specops_shuttle.dm index f05a600b680..a0cced8a616 100644 --- a/code/game/machinery/computer/syndicate_specops_shuttle.dm +++ b/code/game/machinery/computer/syndicate_specops_shuttle.dm @@ -210,7 +210,7 @@ var/syndicate_elite_shuttle_timeleft = 0 else dat = {"
    Special Operations Shuttle
    \nLocation: [syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership ? "Departing for [station_name] in ([syndicate_elite_shuttle_timeleft] seconds.)":syndicate_elite_shuttle_at_station ? "Station":"Dock"]
    - [syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership ? "\n*The Syndicate Elite shuttle is already leaving.*
    \n
    ":syndicate_elite_shuttle_at_station ? "\nShuttle Offline
    \n
    ":"\nDepart to [station_name]
    \n
    "] + [syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership ? "\n*The Syndicate Elite shuttle is already leaving.*
    \n
    ":syndicate_elite_shuttle_at_station ? "\nShuttle Offline
    \n
    ":"\nDepart to [station_name]
    \n
    "] \nClose"} user << browse(dat, "window=computer;size=575x450") @@ -239,7 +239,7 @@ var/syndicate_elite_shuttle_timeleft = 0 to_chat(usr, "\blue The Syndicate Elite shuttle will arrive on [station_name] in [(SYNDICATE_ELITE_MOVETIME/10)] seconds.") - temp = "Shuttle departing.

    OK" + temp = "Shuttle departing.

    OK" updateUsrDialog() var/area/syndicate_mothership/elite_squad/elite_squad = locate() diff --git a/code/game/machinery/computer/telecrystalconsoles.dm b/code/game/machinery/computer/telecrystalconsoles.dm index cc5934d9808..e2119247409 100644 --- a/code/game/machinery/computer/telecrystalconsoles.dm +++ b/code/game/machinery/computer/telecrystalconsoles.dm @@ -96,8 +96,8 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F if(uplinkholder) dat += "[uplinkholder.hidden_uplink.uses] telecrystals remain in this uplink.
    " if(linkedboss) - dat += "Donate TC: 1 | 5" - dat += "
    Eject Uplink" + dat += "Donate TC: 1 | 5" + dat += "
    Eject Uplink" var/datum/browser/popup = new(user, "computer", "Telecrystal Upload/Recieve Station", 700, 500) @@ -168,7 +168,7 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F var/dat = "" - dat += "Scan for TC stations.
    " + dat += "Scan for TC stations.
    " dat += "This [src] has [storedcrystals] telecrystals available for distribution.
    " dat += "

    " @@ -178,11 +178,11 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F if(A.uplinkholder) dat += "[A.uplinkholder.hidden_uplink.uses] telecrystals." if(storedcrystals) - dat+= "
    Add TC: 1 | 5" + dat+= "
    Add TC: 1 | 5" dat += "
    " if(TCstations.len) - dat += "

    Evenly distribute remaining TC.

    " + dat += "

    Evenly distribute remaining TC.

    " for(var/entry in transferlog) diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 38ac85621db..9ffec3cb02c 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -45,11 +45,11 @@ dat += "

    [storage_name]
    " dat += "Welcome, [user.real_name].


    " - dat += "View storage log.
    " + dat += "View storage log.
    " if(allow_items) - dat += "View objects.
    " - dat += "Recover object.
    " - dat += "Recover all objects.
    " + dat += "View objects.
    " + dat += "Recover object.
    " + dat += "Recover all objects.
    " user << browse(dat, "window=cryopod_console") onclose(user, "cryopod_console") diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm index aca002f58c4..f9377d23494 100644 --- a/code/game/machinery/doors/airlock_electronics.dm +++ b/code/game/machinery/doors/airlock_electronics.dm @@ -29,14 +29,14 @@ t1 += "Operator: [last_configurator]
    " if(locked) - t1 += "Swipe ID
    " + t1 += "Swipe ID
    " else - t1 += "Block
    " + t1 += "Block
    " t1 += "Access requirement is set to " - t1 += one_access ? "ONE
    " : "ALL
    " + t1 += one_access ? "ONE
    " : "ALL
    " - t1 += conf_access == null ? "All
    " : "All
    " + t1 += conf_access == null ? "All
    " : "All
    " t1 += "
    " @@ -45,11 +45,11 @@ var/aname = get_access_desc(acc) if(!conf_access || !conf_access.len || !(acc in conf_access)) - t1 += "[aname]
    " + t1 += "[aname]
    " else if(one_access) - t1 += "[aname]
    " + t1 += "[aname]
    " else - t1 += "[aname]
    " + t1 += "[aname]
    " t1 += text("

    Close

    \n", src) diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index 3d8e7d3e15b..ba40b4aa8a0 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -199,9 +199,9 @@ // Start/Stop timer if(timing) - dat += "Stop Timer and open door
    " + dat += "Stop Timer and open door
    " else - dat += "Activate Timer and close door
    " + dat += "Activate Timer and close door
    " // Time Left display (uses releasetime) dat += "Time Left: [(minute ? text("[minute]:") : null)][second]
    " @@ -209,19 +209,19 @@ // Set Timer display (uses timetoset) if(timing) - dat += "Set Timer: [(setminute ? text("[setminute]:") : null)][setsecond] Set
    " + dat += "Set Timer: [(setminute ? text("[setminute]:") : null)][setsecond] Set
    " else dat += "Set Timer: [(setminute ? text("[setminute]:") : null)][setsecond]
    " // Controls - dat += "--++
    " + dat += "--++
    " // Mounted flash controls for(var/obj/machinery/flasher/F in targets) if(F.last_flash && (F.last_flash + 150) > world.time) - dat += "
    Flash Charging" + dat += "
    Flash Charging" else - dat += "
    Activate Flash" + dat += "
    Activate Flash" dat += "

    Close" diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index 3dffa7dda24..c0f48260305 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -191,7 +191,7 @@ FIRE ALARM d2 = text("Initiate Time Lock", src) var/second = round(src.time) % 60 var/minute = (round(src.time) - second) / 60 - var/dat = "Fire alarm [d1]\n
    The current alert level is: [get_security_level()]

    \nTimer System: [d2]
    \nTime Left: [(minute ? "[minute]:" : null)][second] - - + +\n
    " + var/dat = "Fire alarm [d1]\n
    The current alert level is: [get_security_level()]

    \nTimer System: [d2]
    \nTime Left: [(minute ? "[minute]:" : null)][second] - - + +\n
    " user << browse(dat, "window=firealarm") onclose(user, "firealarm") else @@ -206,7 +206,7 @@ FIRE ALARM d2 = text("[]", src, stars("Initiate Time Lock")) var/second = round(src.time) % 60 var/minute = (round(src.time) - second) / 60 - var/dat = "[stars("Fire alarm")] [d1]\n
    The current alert level is: [stars(get_security_level())]

    \nTimer System: [d2]
    \nTime Left: [(minute ? text("[]:", minute) : null)][second] - - + +\n
    " + var/dat = "[stars("Fire alarm")] [d1]\n
    The current alert level is: [stars(get_security_level())]

    \nTimer System: [d2]
    \nTime Left: [(minute ? text("[]:", minute) : null)][second] - - + +\n
    " user << browse(dat, "window=firealarm") onclose(user, "firealarm")*/ diff --git a/code/game/machinery/guestpass.dm b/code/game/machinery/guestpass.dm index 512ed47263a..a9e7fb72741 100644 --- a/code/game/machinery/guestpass.dm +++ b/code/game/machinery/guestpass.dm @@ -76,23 +76,23 @@ dat += "

    Activity log


    " for(var/entry in internal_log) dat += "[entry]

    " - dat += "Print
    " - dat += "Back
    " + dat += "Print
    " + dat += "Back
    " else dat += "

    Guest pass terminal #[uid]


    " - dat += "View activity log

    " - dat += "Issuing ID: [giver]
    " - dat += "Issued to: [giv_name]
    " - dat += "Reason: [reason]
    " - dat += "Duration (minutes): [duration] m
    " + dat += "View activity log

    " + dat += "Issuing ID: [giver]
    " + dat += "Issued to: [giv_name]
    " + dat += "Reason: [reason]
    " + dat += "Duration (minutes): [duration] m
    " dat += "Access to areas:
    " if(giver && giver.access) for(var/A in get_changeable_accesses()) var/area = get_access_desc(A) if(A in accesses) area = "[area]" - dat += "[area]
    " - dat += "
    Issue pass
    " + dat += "[area]
    " + dat += "
    Issue pass
    " var/datum/browser/popup = new(user, "guestpass", name, 400, 520) popup.set_content(dat) diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm index 08e88b9c8c9..c73cac81669 100644 --- a/code/game/machinery/lightswitch.dm +++ b/code/game/machinery/lightswitch.dm @@ -161,8 +161,8 @@ /obj/machinery/light_switch/multitool_menu(var/mob/user, var/obj/item/device/multitool/P) return {" "} diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm index 370ebb62713..362b9718b3a 100644 --- a/code/game/machinery/magnet.dm +++ b/code/game/machinery/magnet.dm @@ -253,9 +253,9 @@ var/dat = "Magnetic Control Console

    " if(!autolink) dat += {" - Frequency: [frequency]
    - Code: [code]
    - Probe Generators
    + Frequency: [frequency]
    + Code: [code]
    + Probe Generators
    "} if(magnets.len >= 1) @@ -264,11 +264,11 @@ var/i = 0 for(var/obj/machinery/magnetic_module/M in magnets) i++ - dat += "     < \[[i]\] ([M.on ? "On":"Off"]) | Electricity level: - [M.electricity_level] +; Magnetic field: - [M.magnetic_field] +
    " + dat += "     < \[[i]\] ([M.on ? "On":"Off"]) | Electricity level: - [M.electricity_level] +; Magnetic field: - [M.magnetic_field] +
    " - dat += "
    Speed: - [speed] +
    " - dat += "Path: {[path]}
    " - dat += "Moving: [moving ? "Enabled":"Disabled"]" + dat += "
    Speed: - [speed] +
    " + dat += "Path: {[path]}
    " + dat += "Moving: [moving ? "Enabled":"Disabled"]" user << browse(dat, "window=magnet;size=400x500") diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index 162bb8589e5..16f7c047dd2 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -146,14 +146,14 @@ Transponder Codes:
      "} (swipe card to lock controls)

      -Location: [location ? location : "None"]
      +Location: [location ? location : "None"]
      Transponder Codes:
        "} for(var/key in codes) t += "
      • [key] ... [codes[key]]" - t += " Edit" - t += " Delete
        " - t += " Add New
        " + t += " Edit" + t += " Delete
        " + t += " Add New
        " t+= "
          " var/datum/browser/popup = new(user, "navbeacon", "Navigation Beacon", 300, 400) diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index b96f42e4441..fab1fbf1aa8 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -200,16 +200,16 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co dat += {"Welcome to Newscasting Unit #[src.unit_no].
          Interface & News networks Operational.
          Property of Nanotrasen"} if(news_network.wanted_issue) - dat+= "
          Read Wanted Issue" - dat+= {"

          Create Feed Channel -
          View Feed Channels -
          Submit new Feed story -
          Print newspaper"} + dat+= "
          Read Wanted Issue" + dat+= {"

          Create Feed Channel +
          View Feed Channels +
          Submit new Feed story +
          Print newspaper"} if(!silence) - dat+= "
          Silence unit" + dat+= "
          Silence unit" else - dat+= "
          Unsilence unit" - dat+= {"
          Re-scan User + dat+= "
          Unsilence unit" + dat+= {"
          Re-scan User

          Exit"} if(src.securityCaster) var/wanted_already = 0 @@ -217,9 +217,9 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co wanted_already = 1 dat += {"
          Feed Security functions:
          -
          [(wanted_already) ? ("Manage") : ("Publish")] \"Wanted\" Issue -
          Censor Feed Stories -
          Mark Feed Channel with Nanotrasen D-Notice +
          [(wanted_already) ? ("Manage") : ("Publish")] \"Wanted\" Issue +
          Censor Feed Stories +
          Mark Feed Channel with Nanotrasen D-Notice

          The newscaster recognises you as: [src.scanned_user]"} if(1) dat+= "Station Feed Channels
          " @@ -228,9 +228,9 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co else for(var/datum/feed_channel/CHANNEL in news_network.network_channels) if(CHANNEL.is_admin_channel) - dat+="[CHANNEL.channel_name]
          " + dat+="[CHANNEL.channel_name]
          " else - dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ()]
          " + dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ()]
          " /*for(var/datum/feed_channel/CHANNEL in src.channel_list) dat+="[CHANNEL.channel_name]:
          \[created by: [CHANNEL.author]\]

          " if( isemptylist(CHANNEL.messages) ) @@ -239,27 +239,27 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co for(var/datum/feed_message/MESSAGE in CHANNEL.messages) dat+="-[MESSAGE.body]
          \[[MESSAGE.message_type] by [MESSAGE.author]\]
          "*/ - dat+="

          Refresh" - dat+="
          Back" + dat+="

          Refresh" + dat+="
          Back" if(2) dat+={"Creating new Feed Channel... -
          Channel Name: [src.channel_name]
          +
          Channel Name: [src.channel_name]
          Channel Author: [src.scanned_user]
          - Will Accept Public Feeds: [(src.c_locked) ? ("NO") : ("YES")]

          -
          Submit

          Cancel
          "} + Will Accept Public Feeds: [(src.c_locked) ? ("NO") : ("YES")]

          +
          Submit

          Cancel
          "} if(3) dat+={"Creating new Feed Message... -
          Receiving Channel: [src.channel_name]
          +
          Receiving Channel: [src.channel_name]
          Message Author: [src.scanned_user]
          - Message Body: [src.msg]
          - Attach Photo: [(src.photo ? "Photo Attached" : "No Photo")]
          -
          Submit

          Cancel
          "} + Message Body: [src.msg]
          + Attach Photo: [(src.photo ? "Photo Attached" : "No Photo")]
          +
          Submit

          Cancel
          "} if(4) dat+="Feed story successfully submitted to [src.channel_name].

          " - dat+="
          Return
          " + dat+="
          Return
          " if(5) dat+="Feed Channel [src.channel_name] created successfully.

          " - dat+="
          Return
          " + dat+="
          Return
          " if(6) dat+="ERROR: Could not submit Feed story to Network.

          " if(src.channel_name=="") @@ -269,7 +269,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if(src.msg == "" || src.msg == "\[REDACTED\]") dat+="Invalid message body.
          " - dat+="
          Return
          " + dat+="
          Return
          " if(7) dat+="ERROR: Could not submit Feed Channel to Network.

          " //var/list/existing_channels = list() //Let's get dem existing channels - OBSOLETE @@ -293,7 +293,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co dat+="Channel name already in use.
          " if(src.scanned_user=="Unknown") dat+="Channel author unverified.
          " - dat+="
          Return
          " + dat+="
          Return
          " if(8) var/total_num=length(news_network.network_channels) var/active_num=total_num @@ -305,8 +305,8 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co active_num-- dat+="Network currently serves a total of [total_num] Feed channels, [active_num] of which are active, and a total of [message_num] Feed Stories." //TODO: CONTINUE dat+="

          Liquid Paper remaining: [(src.paper_remaining) *100 ] cm^3" - dat+="

          Print Paper" - dat+="
          Cancel" + dat+="

          Print Paper" + dat+="
          Cancel" if(9) dat+="[src.viewing_channel.channel_name]: \[created by: [src.viewing_channel.author]\]
          " dat+="Feed view count: [viewing_channel.total_view_count]
          " @@ -328,8 +328,8 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co dat+="\[[MESSAGE.message_type] by [MESSAGE.author]\]
          " dat+="Message view count: [MESSAGE.view_count]
          " MESSAGE.view_count++ - dat+="

          Refresh" - dat+="
          Back" + dat+="

          Refresh" + dat+="
          Back" if(10) dat+="Nanotrasen Feed Censorship Tool
          " dat+="NOTE: Due to the nature of news Feeds, total deletion of a Feed Story is not possible.
          " @@ -339,8 +339,8 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co dat+="No feed channels found active...
          " else for(var/datum/feed_channel/CHANNEL in news_network.network_channels) - dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ()]
          " - dat+="
          Cancel" + dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ()]
          " + dat+="
          Cancel" if(11) dat+="Nanotrasen D-Notice Handler
          " dat+="A D-Notice is to be bestowed upon the channel if the handling Authority deems it as harmful for the station's" @@ -350,12 +350,12 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co dat+="No feed channels found active...
          " else for(var/datum/feed_channel/CHANNEL in news_network.network_channels) - dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ()]
          " + dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ()]
          " - dat+="
          Back" + dat+="
          Back" if(12) dat+="[src.viewing_channel.channel_name]: \[ created by: [src.viewing_channel.author] \]
          " - dat+="[(src.viewing_channel.author=="\[REDACTED\]") ? ("Undo Author censorship") : ("Censor channel Author")]
          " + dat+="[(src.viewing_channel.author=="\[REDACTED\]") ? ("Undo Author censorship") : ("Censor channel Author")]
          " if( isemptylist(src.viewing_channel.messages) ) @@ -363,11 +363,11 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co else for(var/datum/feed_message/MESSAGE in src.viewing_channel.messages) dat+="-[MESSAGE.body]
          \[[MESSAGE.message_type] by [MESSAGE.author]\]
          " - dat+="[(MESSAGE.body == "\[REDACTED\]") ? ("Undo story censorship") : ("Censor story")] - [(MESSAGE.author == "\[REDACTED\]") ? ("Undo Author Censorship") : ("Censor message Author")]
          " - dat+="
          Back" + dat+="[(MESSAGE.body == "\[REDACTED\]") ? ("Undo story censorship") : ("Censor story")] - [(MESSAGE.author == "\[REDACTED\]") ? ("Undo Author Censorship") : ("Censor message Author")]
          " + dat+="
          Back" if(13) dat+="[src.viewing_channel.channel_name]: \[ created by: [src.viewing_channel.author] \]
          " - dat+="Channel messages listed below. If you deem them dangerous to the station, you can Bestow a D-Notice upon the channel.
          " + dat+="Channel messages listed below. If you deem them dangerous to the station, you can Bestow a D-Notice upon the channel.
          " if(src.viewing_channel.censored) dat+="ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a Nanotrasen D-Notice.
          " dat+="No further feed story additions are allowed while the D-Notice is in effect.


          " @@ -378,7 +378,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co for(var/datum/feed_message/MESSAGE in src.viewing_channel.messages) dat+="-[MESSAGE.body]
          \[[MESSAGE.message_type] by [MESSAGE.author]\]
          " - dat+="
          Back" + dat+="
          Back" if(14) dat+="Wanted Issue Handler:" var/wanted_already = 0 @@ -390,20 +390,20 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if(wanted_already) dat+="
          A wanted issue is already in Feed Circulation. You can edit or cancel it below.
          " dat+="
          " - dat+="Criminal Name: [src.channel_name]
          " - dat+="Description: [src.msg]
          " - dat+="Attach Photo: [(src.photo ? "Photo Attached" : "No Photo")]
          " + dat+="Criminal Name: [src.channel_name]
          " + dat+="Description: [src.msg]
          " + dat+="Attach Photo: [(src.photo ? "Photo Attached" : "No Photo")]
          " if(wanted_already) dat+="Wanted Issue created by: [news_network.wanted_issue.backup_author]
          " else dat+="Wanted Issue will be created under prosecutor: [src.scanned_user]
          " - dat+="
          [(wanted_already) ? ("Edit Issue") : ("Submit")]" + dat+="
          [(wanted_already) ? ("Edit Issue") : ("Submit")]" if(wanted_already) - dat+="
          Take down Issue" - dat+="
          Cancel" + dat+="
          Take down Issue" + dat+="
          Cancel" if(15) dat+="Wanted issue for [src.channel_name] is now in Network Circulation.

          " - dat+="
          Return
          " + dat+="
          Return
          " if(16) dat+="ERROR: Wanted Issue rejected by Network.

          " if(src.channel_name=="" || src.channel_name == "\[REDACTED\]") @@ -412,10 +412,10 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co dat+="Issue author unverified.
          " if(src.msg == "" || src.msg == "\[REDACTED\]") dat+="Invalid description.
          " - dat+="
          Return
          " + dat+="
          Return
          " if(17) dat+="Wanted Issue successfully deleted from Circulation
          " - dat+="
          Return
          " + dat+="
          Return
          " if(18) dat+="-- STATIONWIDE WANTED ISSUE --
          \[Submitted by: [news_network.wanted_issue.backup_author]\]
          " dat+="Criminal: [news_network.wanted_issue.author]
          " @@ -426,16 +426,16 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co dat+="
          " else dat+="None" - dat+="

          Back
          " + dat+="

          Back
          " if(19) dat+="Wanted issue for [src.channel_name] successfully edited.

          " - dat+="
          Return
          " + dat+="
          Return
          " if(20) dat+="Printing successfull. Please receive your newspaper from the bottom of the machine.

          " - dat+="Return" + dat+="Return" if(21) dat+="Unable to print newspaper. Insufficient paper. Please notify maintenance personnell to refill machine storage.

          " - dat+="Return" + dat+="Return" else dat+="I'm sorry to break your immersion. This shit's bugged. Report this bug to Agouri, polyxenitopalidou@gmail.com" @@ -836,7 +836,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co dat+="
        " if(scribble_page==curr_page) dat+="
        There is a small scribble near the end of this page... It reads: \"[src.scribble]\"" - dat+= "
        " + dat+= "
        " if(1) // X channel pages inbetween. for(var/datum/feed_channel/NP in src.news_content) src.pages++ //Let's get it right again. @@ -860,7 +860,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co dat+="
      " if(scribble_page==curr_page) dat+="
      There is a small scribble near the end of this page... It reads: \"[src.scribble]\"" - dat+= "

      " + dat+= "

      " if(2) //Last page for(var/datum/feed_channel/NP in src.news_content) src.pages++ @@ -878,7 +878,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co dat+="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: \"[src.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/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index 7a5ebc784b0..34f41e2a1b5 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -12,50 +12,50 @@ return var/dat = {" Regular pipes:
      -Pipe
      -Bent Pipe
      -Manifold
      -Manual Valve
      -Digital Valve
      -Pipe Cap
      -4-Way Manifold
      -Manual T-Valve
      -Digital T-Valve
      +Pipe
      +Bent Pipe
      +Manifold
      +Manual Valve
      +Digital Valve
      +Pipe Cap
      +4-Way Manifold
      +Manual T-Valve
      +Digital T-Valve
      Supply pipes:
      -Pipe
      -Bent Pipe
      -Manifold
      -Pipe Cap
      -4-Way Manifold
      +Pipe
      +Bent Pipe
      +Manifold
      +Pipe Cap
      +4-Way Manifold
      Scrubbers pipes:
      -Pipe
      -Bent Pipe
      -Manifold
      -Pipe Cap
      -4-Way Manifold
      +Pipe
      +Bent Pipe
      +Manifold
      +Pipe Cap
      +4-Way Manifold
      Devices:
      -Universal Pipe Adapter
      -Connector
      -Unary Vent
      -Gas Pump
      -Passive Gate
      -Volume Pump
      -Scrubber
      -Meter
      -Gas Sensor
      -Gas Filter
      -Gas Mixer
      -Air Injector
      -Dual-Port Vent Pump
      -Passive Vent
      +Universal Pipe Adapter
      +Connector
      +Unary Vent
      +Gas Pump
      +Passive Gate
      +Volume Pump
      +Scrubber
      +Meter
      +Gas Sensor
      +Gas Filter
      +Gas Mixer
      +Air Injector
      +Dual-Port Vent Pump
      +Passive Vent
      Heat exchange:
      -Pipe
      -Bent Pipe
      -Junction
      -Heat Exchanger
      +Pipe
      +Bent Pipe
      +Junction
      +Heat Exchanger
      Insulated pipes:
      -Pipe
      -Bent Pipe
      +Pipe
      +Bent Pipe
      "} //What number the make points to is in the define # at the top of construction.dm in same folder @@ -170,14 +170,14 @@ Nah return var/dat = {"Disposal Pipes

      -Pipe
      -Bent Pipe
      -Junction
      -Y-Junction
      -Trunk
      -Bin
      -Outlet
      -Chute
      +Pipe
      +Bent Pipe
      +Junction
      +Y-Junction
      +Trunk
      +Bin
      +Outlet
      +Chute
      "} var/datum/browser/popup = new(user, "pipedispenser", name, 400, 400) diff --git a/code/game/machinery/programmable_unloader.dm b/code/game/machinery/programmable_unloader.dm index a095d1cc93c..4cd09d6f8a4 100644 --- a/code/game/machinery/programmable_unloader.dm +++ b/code/game/machinery/programmable_unloader.dm @@ -113,19 +113,19 @@ /obj/machinery/programmable/proc/printlist(var/list/L) var/dat for(var/datum/cargoprofile/p in L) - dat += "[p.name]: [p.enabled?"YES":"NO"]
      " + dat += "[p.name]: [p.enabled?"YES":"NO"]
      " return dat /obj/machinery/programmable/proc/buildMenu() var/dat dat += "PROGRAMMABLE UNLOADER
      " - dat += "POWER: [on ? "ON" : "OFF"]
      " - dat += "INLET: [capitalize(dir2text(indir))] " - dat += "OUTLET: [capitalize(dir2text(outdir))]" - dat += " (SWAP)

      " + dat += "POWER: [on ? "ON" : "OFF"]
      " + dat += "INLET: [capitalize(dir2text(indir))] " + dat += "OUTLET: [capitalize(dir2text(outdir))]" + dat += " (SWAP)
      " if(default) dat += "MAIN PROGRAM: " - dat += "[default.name]: [default.enabled ? "YES" : "NO"]
      " + dat += "[default.name]: [default.enabled ? "YES" : "NO"]
      " if(profiles.len) if(!default || !default.enabled) dat += printlist(profiles) @@ -439,11 +439,11 @@ buildMenu() var/dat dat += "PROGRAMMABLE PROCESSOR
      " - dat += "POWER: [on ? "ON" : "OFF"]
      " - dat += "INLET: [capitalize(dir2text(indir))]
      " + dat += "POWER: [on ? "ON" : "OFF"]
      " + dat += "INLET: [capitalize(dir2text(indir))]
      " if(default) dat += "MAIN PROGRAM: " - dat += "[default.name]: [default.enabled ? "YES" : "NO"]
      " + dat += "[default.name]: [default.enabled ? "YES" : "NO"]
      " if(profiles.len) if(!default || !default.enabled) dat += printlist(profiles) @@ -608,10 +608,10 @@ return "NONE
      " var/dat = "[P.name]" if(level == 0 || (level == 1 && !default)) - dat += " PROMOTE" + dat += " PROMOTE" if(level > 0) - dat += " DEMOTE" - dat += " REMOVE" + dat += " DEMOTE" + dat += " REMOVE" dat += "
      " return dat @@ -619,20 +619,20 @@ var/dat dat = "MAIN FUNCTION
      " dat += format(default,2) - dat += "- CAUTION -
      \[DELETE NON-MAIN ALGORITHMS\]
      " - dat += "\[MASTER RESET\]
      " + dat += "
      - CAUTION -
      \[DELETE NON-MAIN ALGORITHMS\]
      " + dat += "\[MASTER RESET\]
      " dat += "OVERRIDES:
      " for(var/datum/cargoprofile/P in overrides) dat += format(P,1) dat += "
      " - dat += "- CAUTION -
      \[DELETE ALL OVERRIDES\]
      " + dat += "- CAUTION -
      \[DELETE ALL OVERRIDES\]
      " dat += "
      TERTIARY PROFILES:
      " for(var/datum/cargoprofile/P in profiles) dat += format(P,0) dat += "
      " - dat += "- CAUTION -
      \[DELETE TERTIARY PROFILES\]" + dat += "- CAUTION -
      \[DELETE TERTIARY PROFILES\]" user << browse("Circuit Reprogramming[dat]", "window=progcircuit") onclose(user, "progcircuit") diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index c0e8f7ac20d..7bf9b661a24 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -266,7 +266,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() var/linkedSender if(istype(source, /obj/machinery/requests_console)) var/obj/machinery/requests_console/sender = source - linkedSender = "" + linkedSender = "" else capitalize(source) linkedSender = source diff --git a/code/game/machinery/robot_fabricator.dm b/code/game/machinery/robot_fabricator.dm index 78b873e6ca1..70a623982af 100644 --- a/code/game/machinery/robot_fabricator.dm +++ b/code/game/machinery/robot_fabricator.dm @@ -55,13 +55,13 @@ Please wait until completion...
      dat = {" Metal Amount: [min(150000, src.metal_amount)] cm3 (MAX: 150,000)


      -
      Left Arm (25,000 cc metal.)
      -
      Right Arm (25,000 cc metal.)
      -
      Left Leg (25,000 cc metal.)
      -
      Right Leg (25,000 cc metal).
      -
      Chest (50,000 cc metal).
      -
      Head (50,000 cc metal).
      -
      Robot Frame (75,000 cc metal).
      +
      Left Arm (25,000 cc metal.)
      +
      Right Arm (25,000 cc metal.)
      +
      Left Leg (25,000 cc metal.)
      +
      Right Leg (25,000 cc metal).
      +
      Chest (50,000 cc metal).
      +
      Head (50,000 cc metal).
      +
      Robot Frame (75,000 cc metal).
      "} user << browse("Robotic Fabricator Control Panel[dat]", "window=robot_fabricator") diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index 68c4ab10a34..91e60dfaec5 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -88,18 +88,18 @@ var/dat dat = "Power cell: " if(cell) - dat += "
      Installed
      " + dat += "Installed
      " else - dat += "Removed
      " + dat += "Removed
      " dat += "Power Level: [cell ? round(cell.percent(),1) : 0]%

      " dat += "Set Temperature: " - dat += "-" + dat += "-" dat += " [set_temperature]°C " - dat += "+
      " + dat += "+
      " user.set_machine(src) user << browse("Space Heater Control Panel[dat]", "window=spaceheater") diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 325977b44df..f3415f6896d 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -162,7 +162,7 @@ dat+=text("Dispense mask
      ",src) if(src.OCCUPANT) dat+= "
      WARNING: Biological entity detected inside the Unit's storage. Please remove.
      " - dat+= "Eject extra load" + dat+= "Eject extra load" dat+= text("
      Unit is: [] - [] Unit ",(src.isopen ? "Open" : "Closed"),src,(src.isopen ? "Close" : "Open")) if(src.isopen) dat+="
      " @@ -796,25 +796,25 @@ else if(locked) dat += "
      The [model_text ? "[model_text] " : ""]suit cycler is currently locked. Please contact your system administrator." if(src.allowed(usr)) - dat += "
      \[unlock unit\]" + dat += "
      \[unlock unit\]" else dat += "

      Suit cycler

      " - dat += "Welcome to the [model_text ? "[model_text] " : ""]suit cycler control panel. \[lock unit\]
      " + dat += "Welcome to the [model_text ? "[model_text] " : ""]suit cycler control panel. \[lock unit\]
      " dat += "

      Maintenance

      " - dat += "Helmet: [helmet ? "\the [helmet]" : "no helmet stored" ]. \[eject\]
      " - dat += "Suit: [suit ? "\the [suit]" : "no suit stored" ]. \[eject\]" + dat += "Helmet: [helmet ? "\the [helmet]" : "no helmet stored" ]. \[eject\]
      " + dat += "Suit: [suit ? "\the [suit]" : "no suit stored" ]. \[eject\]" if(suit && istype(suit)) - dat += "[(suit.damage ? " \[repair\]" : "")]" + dat += "[(suit.damage ? " \[repair\]" : "")]" dat += "
      UV decontamination systems: SYSTEM ERROR" : "green'>READY"]
      " dat += "Output level: [radiation_level]
      " - dat += "\[select power level\] \[begin decontamination cycle\]

      " + dat += "\[select power level\] \[begin decontamination cycle\]

      " dat += "

      Customisation

      " - dat += "Target product: [target_department], [target_species]." - dat += "
      \[apply customisation routine\]


      " + dat += "Target product: [target_department], [target_species]." + dat += "
      \[apply customisation routine\]


      " /* if(panel_open) var/list/vendwires = list( @@ -827,10 +827,10 @@ var/is_uncut = src.wires & APCWireColorToFlag[vendwires[wiredesc]] dat += "[wiredesc] wire: " if(!is_uncut) - dat += "Mend" + dat += "Mend" else - dat += "Cut " - dat += "Pulse " + dat += "Cut " + dat += "Pulse " dat += "
      " dat += "
      " diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index 1a17dec0aed..45046b7473f 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -33,7 +33,7 @@ honorific = "Ms." dat += "Identity not found in operative database. What can the Syndicate do for you today, [honorific] [user.name]?
      " if(!selfdestructing) - dat += "

      \"[pick("I want to switch teams.", "I want to work for you.", "Let me join you.", "I can be of use to you.", "You want me working for you, and here's why...", "Give me an objective.", "How's the 401k over at the Syndicate?")]\"
      " + dat += "

      \"[pick("I want to switch teams.", "I want to work for you.", "Let me join you.", "I can be of use to you.", "You want me working for you, and here's why...", "Give me an objective.", "How's the 401k over at the Syndicate?")]\"
      " dat += temptext user << browse(dat, "window=syndbeacon") onclose(user, "syndbeacon") diff --git a/code/game/machinery/telecomms/logbrowser.dm b/code/game/machinery/telecomms/logbrowser.dm index a97e5a7d4c2..ae0b2738d1b 100644 --- a/code/game/machinery/telecomms/logbrowser.dm +++ b/code/game/machinery/telecomms/logbrowser.dm @@ -33,23 +33,23 @@ if(0) dat += "
      [temp]
      " - dat += "
      Current Network: [network]
      " + dat += "
      Current Network: [network]
      " if(servers.len) dat += "
      Detected Telecommunication Servers:" - dat += "
      \[Flush Buffer\]" + dat += "
      \[Flush Buffer\]" else - dat += "
      No servers detected. Scan for servers: \[Scan\]" + dat += "
      No servers detected. Scan for servers: \[Scan\]" // --- Viewing Server --- if(1) dat += "
      [temp]
      " - dat += "
      \[Main Menu\] \[Refresh\]
      " + dat += "
      \[Main Menu\] \[Refresh\]
      " dat += "
      Current Network: [network]" dat += "
      Selected Server: [SelectedServer.id]" @@ -68,7 +68,7 @@ // If the log is a speech file if(C.input_type == "Speech File") - dat += "
    • [C.name] \[X\]
      " + dat += "
    • [C.name] \[X\]
      " // -- Determine race of orator -- @@ -127,7 +127,7 @@ else if(C.input_type == "Execution Error") - dat += "
    • [C.name] \[X\]
      " + dat += "
    • [C.name] \[X\]
      " dat += "Output: \"[C.parameters["message"]]\"
      " dat += "

    • " diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index 347f4ebc685..c1a10cacd48 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -94,7 +94,7 @@ var/value = vars[varname] if(!value || value=="") value="-----" - return "[label]: [value]" + return "[label]: [value]" /obj/machinery/telecomms/attack_ai(var/mob/user as mob) attack_hand(user) @@ -116,7 +116,7 @@ dat = {"

      [temp]

      -

      Power Status: [src.toggled ? "On" : "Off"]

      "} +

      Power Status: [src.toggled ? "On" : "Off"]

      "} if(on && toggled) dat += {"

      [formatInput("Identification String","id","id")]

      @@ -135,7 +135,7 @@ i++ if(T.hide && !src.hide) continue - dat += "
    • \ref[T] [T.name] ([T.id]) \[X\]
    • " + dat += "
    • \ref[T] [T.name] ([T.id]) \[X\]
    • " // AUTOFIXED BY fix_string_idiocy.py // C:\Users\Rob\Documents\Projects\vgstation13\code\game\machinery\telecomms\machine_interactions.dm:140: dat += "" @@ -146,15 +146,15 @@ if(length(freq_listening)) dat += "
        " for(var/x in freq_listening) - dat += "
      • [format_frequency(x)] GHz\[X\]
      • " + dat += "
      • [format_frequency(x)] GHz\[X\]
      • " dat += "
      " else dat += "
    • NONE
    • " // AUTOFIXED BY fix_string_idiocy.py - // C:\Users\Rob\Documents\Projects\vgstation13\code\game\machinery\telecomms\machine_interactions.dm:155: dat += "
      \[Add Filter\]" - dat += {"

      \[Add Filter\]

      + // C:\Users\Rob\Documents\Projects\vgstation13\code\game\machinery\telecomms\machine_interactions.dm:155: dat += "
      \[Add Filter\]" + dat += {"

      \[Add Filter\]


      "} // END AUTOFIX @@ -214,7 +214,7 @@ /* // Add an option to the processor to switch processing mode. (COMPRESS -> UNCOMPRESS or UNCOMPRESS -> COMPRESS) /obj/machinery/telecomms/processor/Options_Menu() - var/dat = "
      Processing Mode: [process_mode ? "UNCOMPRESS" : "COMPRESS"]" + var/dat = "
      Processing Mode: [process_mode ? "UNCOMPRESS" : "COMPRESS"]" return dat */ // The topic for Additional Options. Use this for checking href links for your specific option. @@ -235,9 +235,9 @@ /obj/machinery/telecomms/relay/Options_Menu() var/dat = "" if(level_boosts_signal(src.z)) - dat += "
      Signal Locked to Station: [is_station_level(listening_level) ? "TRUE" : "FALSE"]" - dat += "
      Broadcasting: [broadcasting ? "YES" : "NO"]" - dat += "
      Receiving: [receiving ? "YES" : "NO"]" + dat += "
      Signal Locked to Station: [is_station_level(listening_level) ? "TRUE" : "FALSE"]" + dat += "
      Broadcasting: [broadcasting ? "YES" : "NO"]" + dat += "
      Receiving: [receiving ? "YES" : "NO"]" return dat /obj/machinery/telecomms/relay/Options_Topic(href, href_list) @@ -260,7 +260,7 @@ // BUS /obj/machinery/telecomms/bus/Options_Menu() - var/dat = "
      Change Signal Frequency: [change_frequency ? "YES ([change_frequency])" : "NO"]" + var/dat = "
      Change Signal Frequency: [change_frequency ? "YES ([change_frequency])" : "NO"]" return dat /obj/machinery/telecomms/bus/Options_Topic(href, href_list) diff --git a/code/game/machinery/telecomms/telemonitor.dm b/code/game/machinery/telecomms/telemonitor.dm index 57136b46dc9..9baa2a1a12f 100644 --- a/code/game/machinery/telecomms/telemonitor.dm +++ b/code/game/machinery/telecomms/telemonitor.dm @@ -35,28 +35,28 @@ if(0) dat += "
      [temp]

      " - dat += "
      Current Network: [network]
      " + dat += "
      Current Network: [network]
      " if(machinelist.len) dat += "
      Detected Network Entities:" - dat += "
      \[Flush Buffer\]" + dat += "
      \[Flush Buffer\]" else - dat += "\[Probe Network\]" + dat += "\[Probe Network\]" // --- Viewing Machine --- if(1) dat += "
      [temp]
      " - dat += "
      \[Main Menu\]
      " + dat += "
      \[Main Menu\]
      " dat += "
      Current Network: [network]
      " dat += "Selected Network Entity: [SelectedMachine.name] ([SelectedMachine.id])
      " dat += "Linked Entities:
        " for(var/obj/machinery/telecomms/T in SelectedMachine.links) if(!T.hide) - dat += "
      1. \ref[T.id] [T.name] ([T.id])
      2. " + dat += "
      3. \ref[T.id] [T.name] ([T.id])
      4. " dat += "
      " diff --git a/code/game/machinery/telecomms/traffic_control.dm b/code/game/machinery/telecomms/traffic_control.dm index dbbf6682e4e..3d065f2f753 100644 --- a/code/game/machinery/telecomms/traffic_control.dm +++ b/code/game/machinery/telecomms/traffic_control.dm @@ -39,44 +39,44 @@ if(screen == 0) //main menu dat += "
      [temp]
      " - dat += "
      Current Network: [network]
      " + dat += "
      Current Network: [network]
      " if(servers.len) dat += "
      Detected Telecommunication Servers:" - dat += "
      \[Flush Buffer\]" + dat += "
      \[Flush Buffer\]" else - dat += "
      No servers detected. Scan for servers: \[Scan\]" + dat += "
      No servers detected. Scan for servers: \[Scan\]" if(screen == 1) //server menu dat += "
      [temp]
      " - dat += "
      \[Main Menu\] \[Refresh\]
      " + dat += "
      \[Main Menu\] \[Refresh\]
      " dat += "
      Current Network: [network]" if(allservers) dat += "
      Selected Server: All Servers

      " else dat += "
      Selected Server: [SelectedServer.id]

      " - dat += "
      \[Edit Code\]" + dat += "
      \[Edit Code\]" dat += "
      Signal Execution: " if(allservers) - dat += "ALWAYS NEVER" + dat += "ALWAYS NEVER" else if(SelectedServer.autoruncode) - dat += "ALWAYS" + dat += "ALWAYS" else - dat += "NEVER" + dat += "NEVER" if(screen == 2) //code editor if(editingcode == user) dat += {"
      [temp]
      - \[Back\] - \[Main Menu\] - \[Refresh\] + \[Back\] + \[Main Menu\] + \[Refresh\]
      - [add_req_access?"Edit operation keycodes":null] - [maint_access?"Initiate maintenance protocol":null] - [(state>0) ?"Set Cabin Air Pressure":null] + [add_req_access?"Edit operation keycodes":null] + [maint_access?"Initiate maintenance protocol":null] + [(state>0) ?"Set Cabin Air Pressure":null] "} user << browse(output, "window=exosuit_maint_console") diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm index c2ddd11d787..f26e34834fb 100644 --- a/code/game/mecha/working/ripley.dm +++ b/code/game/mecha/working/ripley.dm @@ -145,7 +145,7 @@ output += "Cargo Compartment Contents:
      " if(cargo.len) for(var/obj/O in cargo) - output += "Unload : [O]
      " + output += "Unload : [O]
      " else output += "Nothing" output += "
      " diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index 5f46a2a5cb0..198c6ce45aa 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -29,7 +29,7 @@ switch(get_area_type()) if(AREA_SPACE) text += "

      According to the [src.name], you are now in outer space. Hold your breath.

      \ -

      Mark this place as new area.

      " +

      Mark this place as new area.

      " if(AREA_SPECIAL) text += "

      This place is not noted on the [src.name].

      " return text @@ -90,12 +90,12 @@ var/area/A = get_area() if(get_area_type() == AREA_STATION) . += "

      According to the [src], you are now in \"[sanitize(A.name)]\".

      " - . += "

      You may move an amendment to the drawing.

      " + . += "

      You may move an amendment to the drawing.

      " if(!viewing) - . += "

      View structural data

      " + . += "

      View structural data

      " else - . += "

      Refresh structural data

      " - . += "

      Hide structural data

      " + . += "

      Refresh structural data

      " + . += "

      Hide structural data

      " var/datum/browser/popup = new(user, "blueprints", "[src]", 700, 500) popup.set_content(.) popup.open() diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 9c03d164bb2..a91c4e2ebe3 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -34,21 +34,21 @@ /obj/item/toy/crayon/proc/update_window(mob/living/user as mob) dat += "

      Currently selected: [drawtype]


      " - dat += "Random letterPick letter" + dat += "Random letterPick letter" dat += "
      " dat += "

      Runes:


      " - dat += "Random rune" + dat += "Random rune" for(var/i = 1; i <= 10; i++) - dat += "Rune[i]" + dat += "Rune[i]" if(!((i + 1) % 3)) //3 buttons in a row dat += "
      " dat += "
      " graffiti.Find() dat += "

      Graffiti:


      " - dat += "Random graffiti" + dat += "Random graffiti" var/c = 1 for(var/T in graffiti) - dat += "[T]" + dat += "[T]" if(!((c + 1) % 3)) //3 buttons in a row dat += "
      " c++ @@ -156,7 +156,7 @@ update_window(user) /obj/item/toy/crayon/mime/update_window(mob/living/user as mob) - dat += "
         Change color
      " + dat += "
         Change color
      " ..() /obj/item/toy/crayon/mime/Topic(href,href_list) @@ -181,7 +181,7 @@ update_window(user) /obj/item/toy/crayon/rainbow/update_window(mob/living/user as mob) - dat += "
         Change color
      " + dat += "
         Change color
      " ..() /obj/item/toy/crayon/rainbow/Topic(href,href_list[]) diff --git a/code/game/objects/items/devices/camera_bug.dm b/code/game/objects/items/devices/camera_bug.dm index e50f26bcf4f..26078a6dc3e 100644 --- a/code/game/objects/items/devices/camera_bug.dm +++ b/code/game/objects/items/devices/camera_bug.dm @@ -90,15 +90,15 @@ var/html switch(track_mode) if(BUGMODE_LIST) - html = "

      Select a camera:

      \[Cancel camera view\]
    \ - Name: [active1.fields["name"]]
    \ - ID: [active1.fields["id"]]
    \n \ - Sex: [active1.fields["sex"]]
    \n \ - Age: [active1.fields["age"]]
    \n \ - Rank: [active1.fields["rank"]]
    \n \ - Fingerprint: [active1.fields["fingerprint"]]
    \n \ + Name: [active1.fields["name"]]
    \ + ID: [active1.fields["id"]]
    \n \ + Sex: [active1.fields["sex"]]
    \n \ + Age: [active1.fields["age"]]
    \n \ + Rank: [active1.fields["rank"]]
    \n \ + Fingerprint: [active1.fields["fingerprint"]]
    \n \ Physical Status: [active1.fields["p_stat"]]
    \n \ Mental Status: [active1.fields["m_stat"]]

    \n \ Employment/skills summary:
    [active1.fields["notes"]]
    - $[item.cost] + $[item.cost]
    " + html = "

    Select a camera:

    \[Cancel camera view\]
    " for(var/entry in cameras) var/obj/machinery/camera/C = cameras[entry] var/functions = "" if(C.bug == src) - functions = " - \[Monitor\] \[Disable\]" + functions = " - \[Monitor\] \[Disable\]" else - functions = " - \[Monitor\]" - html += "" + functions = " - \[Monitor\]" + html += "" if(BUGMODE_MONITOR) if(current) @@ -109,7 +109,7 @@ return .(cameras) if(BUGMODE_TRACK) if(tracking) - html = "Tracking '[tracked_name]' \[Cancel Tracking\] \[Cancel camera view\]
    " + html = "Tracking '[tracked_name]' \[Cancel Tracking\] \[Cancel camera view\]
    " if(last_found) var/time_diff = round((world.time - last_seen) / 150) var/obj/machinery/camera/C = bugged_cameras[last_found] @@ -127,7 +127,7 @@ if(!s) s = "00" html += "Last seen near [outstring] ([m]:[s] minute\s ago)
    " if( C && (C.bug == src)) //Checks to see if the camera has a bug - html += "\[Disable\]" + html += "\[Disable\]" else html += "Not yet seen." diff --git a/code/game/objects/items/devices/floor_painter.dm b/code/game/objects/items/devices/floor_painter.dm index 7fa9759e330..c278a1be72a 100644 --- a/code/game/objects/items/devices/floor_painter.dm +++ b/code/game/objects/items/devices/floor_painter.dm @@ -51,13 +51,13 @@ user << browse_rsc(floor_icon, "floor.png") var/dat = {"
    - <- + <- - -> + ->
    - Choose Style + Choose Style
    Style: [floor_state]
    - Choose Direction + Choose Direction
    Direction: [dir2text(floor_dir)]
    "} diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index f6f39504390..826299b2a01 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -155,7 +155,7 @@ dat += {"
    [entry][functions]
    [entry][functions]
    - Configure Directives + Configure Directives
    "} @@ -163,7 +163,7 @@ dat += {"
    - Imprint Master DNA + Imprint Master DNA
    "} @@ -174,13 +174,13 @@ - - @@ -192,7 +192,7 @@ dat += "Radio firmware not loaded. Please install a pAI personality to load firmware.
    " dat += {"
    Transmit:[radio.broadcasting ? "En" : "Dis" ]abled + [radio.broadcasting ? "En" : "Dis" ]abled
    Receive:[radio.listening ? "En" : "Dis" ]abled + [radio.listening ? "En" : "Dis" ]abled
    -
    Wipe current pAI personality + Wipe current pAI personality
    @@ -207,7 +207,7 @@
    - Refresh available personalities + Refresh available personalities

    @@ -218,7 +218,7 @@

    No personality is installed.

    -
    Request personality + Request personality
    diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index b838b05c3c0..0b38b3f9e18 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -118,8 +118,8 @@ effective or pretty fucking useless. var/cooldown = round(max(10,((intensity*8)-(wavelength/2))+(intensity*2))) var/dat = {" - Radiation Intensity: -- [intensity] ++
    - Radiation Wavelength: -- [(wavelength+(intensity*4))] ++
    + Radiation Intensity: -- [intensity] ++
    + Radiation Wavelength: -- [(wavelength+(intensity*4))] ++
    Laser Cooldown: [cooldown] Seconds
    "} diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm index 7760df16dcd..b019e2a9d95 100644 --- a/code/game/objects/items/devices/uplinks.dm +++ b/code/game/objects/items/devices/uplinks.dm @@ -69,10 +69,10 @@ var/list/world_uplinks = list() if(I.job && I.job.len) if(!(I.job.Find(job))) continue - dat += "[I.name] ([I.cost])
    " + dat += "[I.name] ([I.cost])
    " category_items++ - dat += "Random Item (??)
    " + dat += "Random Item (??)
    " dat += "
    " return dat diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 753cc9f9de8..852be314b1c 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -61,7 +61,7 @@ if(istype(E, /datum/stack_recipe_list)) var/datum/stack_recipe_list/srl = E if(amount >= srl.req_amount) - t1 += "[srl.title] ([srl.req_amount] [singular_name]\s)" + t1 += "[srl.title] ([srl.req_amount] [singular_name]\s)" else t1 += "[srl.title] ([srl.req_amount] [singular_name]\s)
    " @@ -83,7 +83,7 @@ title += "[R.title]" title += " ([R.req_amount] [src.singular_name]\s)" if(can_build) - t1 += "[title] " + t1 += "[title] " else t1 += "[title]" continue @@ -93,9 +93,9 @@ var/list/multipliers = list(5,10,25) for(var/n in multipliers) if(max_multiplier>=n) - t1 += " [n * R.res_amount]x" + t1 += " [n * R.res_amount]x" if(!(max_multiplier in multipliers)) - t1 += " [max_multiplier * R.res_amount]x" + t1 += " [max_multiplier * R.res_amount]x" var/datum/browser/popup = new(user, "stack", name, 400, 400) popup.set_content(t1) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 7e38c7a6e4e..295a1538a65 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -560,7 +560,7 @@ obj/item/toy/cards/cardhand/attack_self(mob/user as mob) obj/item/toy/cards/cardhand/interact(mob/user) var/dat = "You have:
    " for(var/t in currenthand) - dat += "A [t].
    " + dat += "A [t].
    " dat += "Which card will you remove next?" var/datum/browser/popup = new(user, "cardhand", "Hand of Cards", 400, 240) popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index bc8ab270ee2..71dafff99ff 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -129,7 +129,7 @@ if(!ptank) to_chat(user, "Attach a plasma tank first!") return - var/dat = text("Flamethrower ([lit ? "Lit" : "Unlit"])
    \n Tank Pressure: [ptank.air_contents.return_pressure()]
    \nAmount to throw: - - - [throw_amount] + + +
    \nRemove plasmatank - Close
    ") + var/dat = text("Flamethrower ([lit ? "Lit" : "Unlit"])
    \n Tank Pressure: [ptank.air_contents.return_pressure()]
    \nAmount to throw: - - - [throw_amount] + + +
    \nRemove plasmatank - Close
    ") user << browse(dat, "window=flamethrower;size=600x300") onclose(user, "flamethrower") return diff --git a/code/game/objects/items/weapons/implants/implantchair.dm b/code/game/objects/items/weapons/implants/implantchair.dm index 92e58b5af82..a464e5914ef 100644 --- a/code/game/objects/items/weapons/implants/implantchair.dm +++ b/code/game/objects/items/weapons/implants/implantchair.dm @@ -45,9 +45,9 @@ var/dat ="Implanter Status
    " dat +="Current occupant: [src.occupant ? "
    Name: [src.occupant]
    Health: [health_text]
    " : "None"]
    " - dat += "Implants: [src.implant_list.len ? "[implant_list.len]" : "Replenish"]
    " + dat += "Implants: [src.implant_list.len ? "[implant_list.len]" : "Replenish"]
    " if(src.occupant) - dat += "[src.ready ? "Implant" : "Recharging"]
    " + dat += "[src.ready ? "Implant" : "Recharging"]
    " user.set_machine(src) user << browse(dat, "window=implant") onclose(user, "implant") diff --git a/code/game/objects/items/weapons/implants/implantpad.dm b/code/game/objects/items/weapons/implants/implantpad.dm index b9a84c8a6d5..cd988d6310e 100644 --- a/code/game/objects/items/weapons/implants/implantpad.dm +++ b/code/game/objects/items/weapons/implants/implantpad.dm @@ -73,15 +73,15 @@ if(case) if(case.imp) if(istype(case.imp, /obj/item/weapon/implant)) - dat += "Remove Case
    " + dat += "Remove Case
    " dat += case.imp.get_data() if(istype(case.imp, /obj/item/weapon/implant/tracking)) var/obj/item/weapon/implant/tracking/T = case.imp dat += {"ID (1-100): - - - - [T.id] - + - +
    "} + - + - [T.id] + + + +
    "} else dat += "The implant casing is empty." else diff --git a/code/game/objects/items/weapons/scrolls.dm b/code/game/objects/items/weapons/scrolls.dm index de419dc1b7d..0b45cd4a42e 100644 --- a/code/game/objects/items/weapons/scrolls.dm +++ b/code/game/objects/items/weapons/scrolls.dm @@ -22,7 +22,7 @@ dat += "Number of uses: [src.uses]
    " dat += "
    " dat += "Four uses use them wisely:
    " - dat += "Teleport
    " + dat += "Teleport
    " dat += "Kind regards,
    Wizards Federation

    P.S. Don't forget to bring your gear, you'll need it to cast most spells.
    " user << browse(dat, "window=scroll") onclose(user, "scroll") diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm index 15650f188d9..87309c5927c 100644 --- a/code/game/objects/items/weapons/teleportation.dm +++ b/code/game/objects/items/weapons/teleportation.dm @@ -28,17 +28,17 @@ add_fingerprint(usr) var/dat if(temp) - dat = "[src.temp]

    Clear" + dat = "[src.temp]

    Clear" else dat = {" Persistent Signal Locator
    Frequency: -- -- [format_frequency(src.frequency)] -+ -+
    +- +- [format_frequency(src.frequency)] ++ ++
    -Refresh"} +Refresh"} user << browse(dat, "window=radio") onclose(user, "radio") return @@ -74,7 +74,7 @@ Frequency: temp += "[T.id]: [T.imp_in.x], [T.imp_in.y], [T.imp_in.z]
    " temp += "You are at \[[sr.x],[sr.y],[sr.z]\]." - temp += "

    Refresh
    " + temp += "

    Refresh
    " else temp += "Processing error: Unable to locate orbital position.
    " else diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 7c5fe09dd06..9a75e9e3950 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -203,14 +203,14 @@ /obj/proc/linkMenu(var/obj/O) var/dat="" if(canLink(O, list())) - dat += " \[Link\] " + dat += " \[Link\] " return dat /obj/proc/format_tag(var/label,var/varname, var/act="set_tag") var/value = vars[varname] if(!value || value=="") value="-----" - return "[label]: [value]" + return "[label]: [value]" /obj/proc/update_multitool_menu(mob/user as mob) @@ -253,10 +253,10 @@ a { dat += linkMenu(P.buffer) if(P.buffer) - dat += "\[Flush\]" + dat += "\[Flush\]" dat += "

    " else - dat += "

    MULTITOOL BUFFER: \[Add Machine\]

    " + dat += "

    MULTITOOL BUFFER: \[Add Machine\]

    " else dat += "ACCESS DENIED" dat += "" diff --git a/code/game/objects/structures/engicart.dm b/code/game/objects/structures/engicart.dm index cce6c1c1bdb..742664b68b0 100644 --- a/code/game/objects/structures/engicart.dm +++ b/code/game/objects/structures/engicart.dm @@ -101,21 +101,21 @@ user.set_machine(src) var/dat if(myglass) - dat += "[myglass.name]
    " + dat += "[myglass.name]
    " if(mymetal) - dat += "[mymetal.name]
    " + dat += "[mymetal.name]
    " if(myplasteel) - dat += "[myplasteel.name]
    " + dat += "[myplasteel.name]
    " if(myflashlight) - dat += "[myflashlight.name]
    " + dat += "[myflashlight.name]
    " if(mybluetoolbox) - dat += "[mybluetoolbox.name]
    " + dat += "[mybluetoolbox.name]
    " if(myredtoolbox) - dat += "[myredtoolbox.name]
    " + dat += "[myredtoolbox.name]
    " if(myyellowtoolbox) - dat += "[myyellowtoolbox.name]
    " + dat += "[myyellowtoolbox.name]
    " if(myengitape) - dat += "[myengitape.name]
    " + dat += "[myengitape.name]
    " var/datum/browser/popup = new(user, "engicart", name, 240, 160) popup.set_content(dat) popup.open() diff --git a/code/game/objects/structures/foodcart.dm b/code/game/objects/structures/foodcart.dm index 071200c8ca0..de103cc5d57 100644 --- a/code/game/objects/structures/foodcart.dm +++ b/code/game/objects/structures/foodcart.dm @@ -76,29 +76,29 @@ user.set_machine(src) var/dat if(food_slots[1]) - dat += "[food_slots[1]]
    " + dat += "[food_slots[1]]
    " if(food_slots[2]) - dat += "[food_slots[2]]
    " + dat += "[food_slots[2]]
    " if(food_slots[3]) - dat += "[food_slots[3]]
    " + dat += "[food_slots[3]]
    " if(food_slots[4]) - dat += "[food_slots[4]]
    " + dat += "[food_slots[4]]
    " if(food_slots[5]) - dat += "[food_slots[5]]
    " + dat += "[food_slots[5]]
    " if(food_slots[6]) - dat += "[food_slots[6]]
    " + dat += "[food_slots[6]]
    " if(drink_slots[1]) - dat += "[drink_slots[1]]
    " + dat += "[drink_slots[1]]
    " if(drink_slots[2]) - dat += "[drink_slots[2]]
    " + dat += "[drink_slots[2]]
    " if(drink_slots[3]) - dat += "[drink_slots[3]]
    " + dat += "[drink_slots[3]]
    " if(drink_slots[4]) - dat += "[drink_slots[4]]
    " + dat += "[drink_slots[4]]
    " if(drink_slots[5]) - dat += "[drink_slots[5]]
    " + dat += "[drink_slots[5]]
    " if(drink_slots[6]) - dat += "[drink_slots[6]]
    " + dat += "[drink_slots[6]]
    " var/datum/browser/popup = new(user, "foodcart", name, 240, 160) popup.set_content(dat) popup.open() diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index e51a7e3aac2..c5abbad1c96 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -113,15 +113,15 @@ user.set_machine(src) var/dat if(mybag) - dat += "[mybag.name]
    " + dat += "[mybag.name]
    " if(mymop) - dat += "[mymop.name]
    " + dat += "[mymop.name]
    " if(myspray) - dat += "[myspray.name]
    " + dat += "[myspray.name]
    " if(myreplacer) - dat += "[myreplacer.name]
    " + dat += "[myreplacer.name]
    " if(signs) - dat += "[signs] sign\s
    " + dat += "[signs] sign\s
    " var/datum/browser/popup = new(user, "janicart", name, 240, 160) popup.set_content(dat) popup.open() diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm index adc6fa4a4fa..bbad94dd174 100644 --- a/code/game/objects/structures/noticeboard.dm +++ b/code/game/objects/structures/noticeboard.dm @@ -32,7 +32,7 @@ /obj/structure/noticeboard/attack_hand(user as mob) var/dat = "Noticeboard
    " for(var/obj/item/weapon/paper/P in src) - dat += "[P.name] Write Remove
    " + dat += "[P.name] Write Remove
    " user << browse("Notices[dat]","window=noticeboard") onclose(user, "noticeboard") diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm index ec2ebc8848a..315728ddc16 100644 --- a/code/game/objects/structures/safe.dm +++ b/code/game/objects/structures/safe.dm @@ -75,12 +75,12 @@ FLOOR SAFES /obj/structure/safe/attack_hand(mob/user) user.set_machine(src) var/dat = "
    " - dat += "[open ? "Close" : "Open"] [src] | - [dial * 5] +" + dat += "[open ? "Close" : "Open"] [src] | - [dial * 5] +" if(open) dat += "" for(var/i = contents.len, i>=1, i--) var/obj/item/P = contents[i] - dat += "" + dat += "" dat += "
    [P.name]
    [P.name]
    " user << browse("[name][dat]", "window=safe;size=350x300") diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index ab1c2830933..8d0962857f5 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -35,8 +35,8 @@ /obj/structure/dispenser/attack_hand(mob/user as mob) user.set_machine(src) var/dat = "[src]

    " - dat += "Oxygen tanks: [oxygentanks] - [oxygentanks ? "Dispense" : "empty"]
    " - dat += "Plasma tanks: [plasmatanks] - [plasmatanks ? "Dispense" : "empty"]" + dat += "Oxygen tanks: [oxygentanks] - [oxygentanks ? "Dispense" : "empty"]
    " + dat += "Plasma tanks: [plasmatanks] - [plasmatanks ? "Dispense" : "empty"]" user << browse(dat, "window=dispenser") onclose(user, "dispenser") return diff --git a/code/modules/admin/DB ban/functions.dm b/code/modules/admin/DB ban/functions.dm index c22a019addb..6cd03894699 100644 --- a/code/modules/admin/DB ban/functions.dm +++ b/code/modules/admin/DB ban/functions.dm @@ -354,7 +354,7 @@ datum/admins/proc/DB_ban_unban_by_id(var/id) output += "" - output += "Add custom ban: (ONLY use this if you can't ban through any other method)" + output += "Add custom ban: (ONLY use this if you can't ban through any other method)" output += "" output += "" output += "" output += "
    Ban type:
    " - output += " @@ -377,16 +377,16 @@ dat += {" - + "} switch(is_special_character(M)) if(0) - dat += {""} + dat += {""} if(1) - dat += {""} + dat += {""} if(2) - dat += {""} + dat += {""} dat += "
    Search:" + output += "" output += "" output += "" @@ -512,7 +512,7 @@ datum/admins/proc/DB_ban_unban_by_id(var/id) if("PERMABAN") typedesc = "PERMABAN" if("TEMPBAN") - typedesc = "TEMPBAN
    ([duration] minutes [(unbanned) ? "" : "(Edit))"]
    Expires [expiration]
    " + typedesc = "TEMPBAN
    ([duration] minutes [(unbanned) ? "" : "(Edit))"]
    Expires [expiration]
    " if("JOB_PERMABAN") typedesc = "JOBBAN
    ([job])" if("JOB_TEMPBAN") @@ -522,21 +522,21 @@ datum/admins/proc/DB_ban_unban_by_id(var/id) if("ADMIN_PERMABAN") typedesc = "ADMIN PERMABAN" if("ADMIN_TEMPBAN") - typedesc = "ADMIN TEMPBAN
    ([duration] minutes [(unbanned) ? "" : "(Edit))"]
    Expires [expiration]
    " + typedesc = "ADMIN TEMPBAN
    ([duration] minutes [(unbanned) ? "" : "(Edit))"]
    Expires [expiration]
    " output += "
    " output += "" output += "" output += "" output += "" - output += "" + output += "" output += "" output += "" output += "" output += "" output += "" output += "" - output += "" + output += "" output += "" if(edits) output += "" diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 30b8c8bb8e9..67a06ec3787 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -257,11 +257,11 @@ var/global/nologevent = 0
    Note that this panel allows full freedom over the news network, there are no constrictions except the few basic ones. Don't break things!
    "} if(news_network.wanted_issue) - dat+= "
    Read Wanted Issue" + dat+= "
    Read Wanted Issue" - dat+= {"

    Create Feed Channel -
    View Feed Channels -
    Submit new Feed story + dat+= {"

    Create Feed Channel +
    View Feed Channels +
    Submit new Feed story

    Exit "} @@ -270,10 +270,10 @@ var/global/nologevent = 0 wanted_already = 1 dat+={"
    Feed Security functions:
    -
    [(wanted_already) ? ("Manage") : ("Publish")] \"Wanted\" Issue -
    Censor Feed Stories -
    Mark Feed Channel with Nanotrasen D-Notice (disables and locks the channel. -

    The newscaster recognises you as:
    [src.admincaster_signature]
    +
    [(wanted_already) ? ("Manage") : ("Publish")] \"Wanted\" Issue +
    Censor Feed Stories +
    Mark Feed Channel with Nanotrasen D-Notice (disables and locks the channel. +

    The newscaster recognises you as:
    [src.admincaster_signature]
    "} if(1) dat+= "Station Feed Channels
    " @@ -282,38 +282,38 @@ var/global/nologevent = 0 else for(var/datum/feed_channel/CHANNEL in news_network.network_channels) if(CHANNEL.is_admin_channel) - dat+="[CHANNEL.channel_name]
    " + dat+="[CHANNEL.channel_name]
    " else - dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ()]
    " - dat+={"

    Refresh -
    Back + dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ()]
    " + dat+={"

    Refresh +
    Back "} if(2) dat+={" Creating new Feed Channel... -
    Channel Name: [src.admincaster_feed_channel.channel_name]
    - Channel Author:[src.admincaster_signature]
    - Will Accept Public Feeds: [(src.admincaster_feed_channel.locked) ? ("NO") : ("YES")]

    -
    Submit

    Cancel
    +
    Channel Name: [src.admincaster_feed_channel.channel_name]
    + Channel Author:[src.admincaster_signature]
    + Will Accept Public Feeds: [(src.admincaster_feed_channel.locked) ? ("NO") : ("YES")]

    +
    Submit

    Cancel
    "} if(3) dat+={" Creating new Feed Message... -
    Receiving Channel: [src.admincaster_feed_channel.channel_name]
    +
    Receiving Channel: [src.admincaster_feed_channel.channel_name]
    Message Author:[src.admincaster_signature]
    - Message Body: [src.admincaster_feed_message.body]
    -
    Submit

    Cancel
    + Message Body: [src.admincaster_feed_message.body]
    +
    Submit

    Cancel
    "} if(4) dat+={" Feed story successfully submitted to [src.admincaster_feed_channel.channel_name].

    -
    Return
    +
    Return
    "} if(5) dat+={" Feed Channel [src.admincaster_feed_channel.channel_name] created successfully.

    -
    Return
    +
    Return
    "} if(6) dat+="ERROR: Could not submit Feed story to Network.

    " @@ -321,7 +321,7 @@ var/global/nologevent = 0 dat+="•Invalid receiving channel name.
    " if(src.admincaster_feed_message.body == "" || src.admincaster_feed_message.body == "\[REDACTED\]") dat+="•Invalid message body.
    " - dat+="
    Return
    " + dat+="
    Return
    " if(7) dat+="ERROR: Could not submit Feed Channel to Network.

    " if(src.admincaster_feed_channel.channel_name =="" || src.admincaster_feed_channel.channel_name == "\[REDACTED\]") @@ -333,7 +333,7 @@ var/global/nologevent = 0 break if(check) dat+="•Channel name already in use.
    " - dat+="
    Return
    " + dat+="
    Return
    " if(9) dat+="[src.admincaster_feed_channel.channel_name]: \[created by: [src.admincaster_feed_channel.author]\]
    " if(src.admincaster_feed_channel.censored) @@ -354,8 +354,8 @@ var/global/nologevent = 0 dat+="

    " dat+="\[Story by [MESSAGE.author]\]
    " dat+={" -

    Refresh -
    Back +

    Refresh +
    Back "} if(10) dat+={" @@ -368,8 +368,8 @@ var/global/nologevent = 0 dat+="No feed channels found active...
    " else for(var/datum/feed_channel/CHANNEL in news_network.network_channels) - dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ()]
    " - dat+="
    Cancel" + dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ()]
    " + dat+="
    Cancel" if(11) dat+={" Nanotrasen D-Notice Handler
    @@ -381,13 +381,13 @@ var/global/nologevent = 0 dat+="No feed channels found active...
    " else for(var/datum/feed_channel/CHANNEL in news_network.network_channels) - dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ()]
    " + dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ()]
    " - dat+="
    Back" + dat+="
    Back" if(12) dat+={" [src.admincaster_feed_channel.channel_name]: \[ created by: [src.admincaster_feed_channel.author] \]
    - [(src.admincaster_feed_channel.author=="\[REDACTED\]") ? ("Undo Author censorship") : ("Censor channel Author")]
    + [(src.admincaster_feed_channel.author=="\[REDACTED\]") ? ("Undo Author censorship") : ("Censor channel Author")]
    "} if( isemptylist(src.admincaster_feed_channel.messages) ) dat+="No feed messages found in channel...
    " @@ -395,13 +395,13 @@ var/global/nologevent = 0 for(var/datum/feed_message/MESSAGE in src.admincaster_feed_channel.messages) dat+={" -[MESSAGE.body]
    \[Story by [MESSAGE.author]\]
    - [(MESSAGE.body == "\[REDACTED\]") ? ("Undo story censorship") : ("Censor story")] - [(MESSAGE.author == "\[REDACTED\]") ? ("Undo Author Censorship") : ("Censor message Author")]
    + [(MESSAGE.body == "\[REDACTED\]") ? ("Undo story censorship") : ("Censor story")] - [(MESSAGE.author == "\[REDACTED\]") ? ("Undo Author Censorship") : ("Censor message Author")]
    "} - dat+="
    Back" + dat+="
    Back" if(13) dat+={" [src.admincaster_feed_channel.channel_name]: \[ created by: [src.admincaster_feed_channel.author] \]
    - Channel messages listed below. If you deem them dangerous to the station, you can Bestow a D-Notice upon the channel.
    + Channel messages listed below. If you deem them dangerous to the station, you can Bestow a D-Notice upon the channel.
    "} if(src.admincaster_feed_channel.censored) dat+={" @@ -415,7 +415,7 @@ var/global/nologevent = 0 for(var/datum/feed_message/MESSAGE in src.admincaster_feed_channel.messages) dat+="-[MESSAGE.body]
    \[Story by [MESSAGE.author]\]
    " - dat+="
    Back" + dat+="
    Back" if(14) dat+="Wanted Issue Handler:" var/wanted_already = 0 @@ -427,21 +427,21 @@ var/global/nologevent = 0 dat+="
    A wanted issue is already in Feed Circulation. You can edit or cancel it below.
    " dat+={"
    - Criminal Name: [src.admincaster_feed_message.author]
    - Description: [src.admincaster_feed_message.body]
    + Criminal Name: [src.admincaster_feed_message.author]
    + Description: [src.admincaster_feed_message.body]
    "} if(wanted_already) dat+="Wanted Issue created by: [news_network.wanted_issue.backup_author]
    " else dat+="Wanted Issue will be created under prosecutor: [src.admincaster_signature]
    " - dat+="
    [(wanted_already) ? ("Edit Issue") : ("Submit")]" + dat+="
    [(wanted_already) ? ("Edit Issue") : ("Submit")]" if(wanted_already) - dat+="
    Take down Issue" - dat+="
    Cancel" + dat+="
    Take down Issue" + dat+="
    Cancel" if(15) dat+={" Wanted issue for [src.admincaster_feed_message.author] is now in Network Circulation.

    -
    Return
    +
    Return
    "} if(16) dat+="ERROR: Wanted Issue rejected by Network.

    " @@ -449,11 +449,11 @@ var/global/nologevent = 0 dat+="•Invalid name for person wanted.
    " if(src.admincaster_feed_message.body == "" || src.admincaster_feed_message.body == "\[REDACTED\]") dat+="•Invalid description.
    " - dat+="
    Return
    " + dat+="
    Return
    " if(17) dat+={" Wanted Issue successfully deleted from Circulation
    -
    Return
    +
    Return
    "} if(18) dat+={" @@ -467,11 +467,11 @@ var/global/nologevent = 0 dat+="
    " else dat+="None" - dat+="
    Back
    " + dat+="
    Back
    " if(19) dat+={" Wanted issue for [src.admincaster_feed_message.author] successfully edited.

    -
    Return
    +
    Return
    "} else dat+="I'm sorry to break your immersion. This shit's bugged. Report this bug to Agouri, polyxenitopalidou@gmail.com" @@ -490,7 +490,7 @@ var/global/nologevent = 0 var/r = t if( findtext(r,"##") ) r = copytext( r, 1, findtext(r,"##") )//removes the description - dat += text("") + dat += text("") dat += "
    Search:" output += "
    Ckey: Admin ckey:
    [typedesc][ckey][bantime][ackey][(unbanned) ? "" : "Unban"][(unbanned) ? "" : "Unban"]
    IP: [ip]CIP: [cid]
    Reason: [(unbanned) ? "" : "(Edit)"] \"[reason]\"Reason: [(unbanned) ? "" : "(Edit)"] \"[reason]\"
    [t] (unban)
    [t] (unban)
    " usr << browse(dat, "window=ban;size=400x400") @@ -500,17 +500,17 @@ var/global/nologevent = 0 var/dat = {"
    Game Panel

    \n - Change Game Mode
    + Change Game Mode
    "} if(master_mode == "secret") - dat += "(Force Secret Mode)
    " + dat += "(Force Secret Mode)
    " dat += {"
    - Create Object
    - Quick Create Object
    - Create Turf
    - Create Mob
    + Create Object
    + Quick Create Object
    + Create Turf
    + Create Mob
    "} usr << browse(dat, "window=admin2;size=210x280") diff --git a/code/modules/admin/permissionverbs/permissionedit.dm b/code/modules/admin/permissionverbs/permissionedit.dm index b840cad783d..f1232cd4e78 100644 --- a/code/modules/admin/permissionverbs/permissionedit.dm +++ b/code/modules/admin/permissionverbs/permissionedit.dm @@ -20,7 +20,7 @@
    - + "} @@ -32,15 +32,15 @@ var/rights = rights2text(D.rights," ") if(!rights) rights = "*none*" output += {" - - - + + +"} /*output += "" - output += "" - output += "" - output += "" + output += "" + output += "" + output += "" output += ""*/ output += {" diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm index 4234ea2773c..618f11cef2c 100644 --- a/code/modules/admin/player_panel.dm +++ b/code/modules/admin/player_panel.dm @@ -75,18 +75,18 @@ body += "
    CKEY \[+\]CKEY \[+\] RANKPERMISSIONS
    [adm_ckey] \[-\][rank][rights][adm_ckey] \[-\][rank][rights]
    [adm_ckey] \[-\][rank][rights][adm_ckey] \[-\][rank][rights]
    "; - body += "PP - " - body += "N - " + body += "PP - " + body += "N - " body += "VV - " - body += "TP - " + body += "TP - " body += "PM - " - body += "SM - " - body += "FLW" + body += "SM - " + body += "FLW" if(eyeref) - body += "|EYE" + body += "|EYE" body += "
    " if(antagonist > 0) - body += "Antagonist"; + body += "Antagonist"; body += "
    "; @@ -197,7 +197,7 @@
    Player panel
    - Hover over a line to see more information | [check_rights(R_ADMIN,0) ? "Check antagonists | Kick everyone/AFKers in lobby" : "" ] + Hover over a line to see more information | [check_rights(R_ADMIN,0) ? "Check antagonists | Kick everyone/AFKers in lobby" : "" ]

    [(M.client ? "[M.client]" : "No client")]XX PMTraitor?Traitor?Traitor?Traitor?Traitor?Traitor?
    " @@ -401,7 +401,7 @@ else logout_status = M.client ? "" : " (logged out)" - return {"[M.real_name][caption][logout_status][M.stat == 2 ? " (DEAD)" : ""] + return {"[M.real_name][caption][logout_status][M.stat == 2 ? " (DEAD)" : ""] PM[close ? "" : ""]"} /datum/admins/proc/check_antagonists() @@ -412,7 +412,7 @@ dat += "Round Duration: [round(ROUND_TIME / 36000)]:[add_zero(num2text(ROUND_TIME / 600 % 60), 2)]:[add_zero(num2text(ROUND_TIME / 10 % 60), 2)]
    " dat += "Emergency shuttle
    " if(shuttle_master.emergency.mode < SHUTTLE_CALL) - dat += "Call Shuttle
    " + dat += "Call Shuttle
    " else var/timeleft = shuttle_master.emergency.timeLeft() if(shuttle_master.emergency.mode < SHUTTLE_DOCKED) @@ -421,7 +421,7 @@ else dat += "ETA: [(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]
    " - dat += "[ticker.delay_end ? "End Round Normally" : "Delay Round End"]
    " + dat += "[ticker.delay_end ? "End Round Normally" : "Delay Round End"]
    " if(ticker.mode.syndicates.len) dat += "
    " for(var/datum/mind/N in ticker.mode.syndicates) @@ -437,7 +437,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] " @@ -551,7 +551,7 @@ if(show_objectives) txt += {" "} diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm index 65721c2bb26..c5004b9dd12 100644 --- a/code/modules/admin/secrets.dm +++ b/code/modules/admin/secrets.dm @@ -7,9 +7,9 @@ if(!check_rights(0)) return var/dat = "
    " - dat += "Debug" - dat += "IC Events" - dat += "OOC Events" + dat += "Debug" + dat += "IC Events" + dat += "OOC Events" dat += "
    " dat += "
    " @@ -19,44 +19,44 @@ dat += {"

    Admin Secrets

    Game
    - Show AI Laws   - Show Game Mode   - Show Crew Manifest
    - Show current traitors and objectives
    + Show AI Laws   + Show Game Mode   + Show Crew Manifest
    + Show current traitors and objectives
    Bombs
    - Bombing List   - Remove all bombs currently in existence - [check_rights(R_SERVER, 0) ? "  Toggle bomb cap
    " : "
    "] + Bombing List   + Remove all bombs currently in existence + [check_rights(R_SERVER, 0) ? "  Toggle bomb cap
    " : "
    "] Lists
    - Show last [length(lastsignalers)] signalers   - Show last [length(lawchanges)] law changes
    - List DNA (Blood)   - List Fingerprints
    + Show last [length(lastsignalers)] signalers   + Show last [length(lawchanges)] law changes
    + List DNA (Blood)   + List Fingerprints
    Power
    - Break all lights   - Fix all lights
    - Make all areas powered   - Make all areas unpowered   - Power all SMES
    + Break all lights   + Fix all lights
    + Make all areas powered   + Make all areas unpowered   + Power all SMES
    "} else if(check_rights(R_SERVER,0)) //only add this if admin secrets are unavailiable; otherwise, it's added inline - dat += "
    Bomb cap: Toggle bomb cap
    " + dat += "
    Bomb cap: Toggle bomb cap
    " dat += "
    " if(check_rights(R_DEBUG,0)) dat += {"
    Security Level Elevated

    - Change all maintenance doors to engie/brig access only
    - Change all maintenance doors to brig access only
    - Remove cap on security officers   + Change all maintenance doors to engie/brig access only
    + Change all maintenance doors to brig access only
    + Remove cap on security officers  
    Coder Secrets

    - Show Job Debug   - Admin Log
    + Show Job Debug   + Admin Log

    "} @@ -67,20 +67,20 @@

    IC Events

    Teams
    - Send SIT - Syndicate Infiltration Team   -
    Send in the Deathsquad   - Send in a Syndie Strike Team   - Send in a HONKsquad
    + Send SIT - Syndicate Infiltration Team   +
    Send in the Deathsquad   + Send in a Syndie Strike Team   + Send in a HONKsquad
    Change Security Level
    - Security Level - Green   - Security Level - Blue   - Security Level - Red
    - Security Level - Gamma   - Security Level - Epsilon   - Security Level - Delta
    + Security Level - Green   + Security Level - Blue   + Security Level - Red
    + Security Level - Gamma   + Security Level - Epsilon   + Security Level - Delta
    Create Weather
    - Weather - Ash Storm   - Weather - Advanced Darkness   + Weather - Ash Storm   + Weather - Advanced Darkness  
    "} @@ -90,38 +90,38 @@

    OOC Events

    Thunderdome
    - Start a Thunderdome match   - Reset Thunderdome to default state

    + Start a Thunderdome match   + Reset Thunderdome to default state

    Clothing
    - Remove 'internal' clothing   - Remove ALL clothing
    + Remove 'internal' clothing   + Remove ALL clothing
    TDM
    - Everyone is the traitor   - There can only be one!   - There can only be me!   - Dodgeball (TDM)!
    + Everyone is the traitor   + There can only be one!   + There can only be me!   + Dodgeball (TDM)!
    Round-enders
    - The floor is lava! (DANGEROUS: extremely lame)
    - The floor is fake-lava! (non-harmful)
    - Turn all humans into monkeys
    - Make all items look like guns
    - Warp all Players to Prison
    - Make all players retarded
    + The floor is lava! (DANGEROUS: extremely lame)
    + The floor is fake-lava! (non-harmful)
    + Turn all humans into monkeys
    + Make all items look like guns
    + Warp all Players to Prison
    + Make all players retarded
    Misc
    - Remove firesuits, grilles, and pods   - Triple AI mode (needs to be used in the lobby)
    - Ghost Mode   - Japanese Animes Mode   - Egalitarian Station Mode
    - Summon Guns   - Summon Magic + Remove firesuits, grilles, and pods   + Triple AI mode (needs to be used in the lobby)
    + Ghost Mode   + Japanese Animes Mode   + Egalitarian Station Mode
    + Summon Guns   + Summon Magic
    - Roll the Dice
    + Roll the Dice


    - Move Ferry
    - Move Mining Shuttle
    - Move Labor Shuttle
    + Move Ferry
    + Move Mining Shuttle
    + Move Labor Shuttle

    "} dat += "" diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 0f971300225..f8cdfeb8596 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -488,17 +488,17 @@ //Regular jobs //Command (Blue) jobs += "
    Syndicates
    - Show Objective + Show Objective
    " - jobs += "" + jobs += "" for(var/jobPos in command_positions) if(!jobPos) continue var/datum/job/job = job_master.GetJob(jobPos) if(!job) continue if(jobban_isbanned(M, job.title)) - jobs += "" + jobs += "" counter++ else - jobs += "" + jobs += "" counter++ if(counter >= 6) //So things dont get squiiiiished! @@ -509,17 +509,17 @@ //Security (Red) counter = 0 jobs += "
    Command Positions
    Command Positions
    [replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")]
    " - jobs += "" + jobs += "" for(var/jobPos in security_positions) if(!jobPos) continue var/datum/job/job = job_master.GetJob(jobPos) if(!job) continue if(jobban_isbanned(M, job.title)) - jobs += "" + jobs += "" counter++ else - jobs += "" + jobs += "" counter++ if(counter >= 5) //So things dont get squiiiiished! @@ -530,17 +530,17 @@ //Engineering (Yellow) counter = 0 jobs += "
    Security Positions
    Security Positions
    [replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")]
    " - jobs += "" + jobs += "" for(var/jobPos in engineering_positions) if(!jobPos) continue var/datum/job/job = job_master.GetJob(jobPos) if(!job) continue if(jobban_isbanned(M, job.title)) - jobs += "" + jobs += "" counter++ else - jobs += "" + jobs += "" counter++ if(counter >= 5) //So things dont get squiiiiished! @@ -551,17 +551,17 @@ //Medical (White) counter = 0 jobs += "
    Engineering Positions
    Engineering Positions
    [replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")]
    " - jobs += "" + jobs += "" for(var/jobPos in medical_positions) if(!jobPos) continue var/datum/job/job = job_master.GetJob(jobPos) if(!job) continue if(jobban_isbanned(M, job.title)) - jobs += "" + jobs += "" counter++ else - jobs += "" + jobs += "" counter++ if(counter >= 5) //So things dont get squiiiiished! @@ -572,17 +572,17 @@ //Science (Purple) counter = 0 jobs += "
    Medical Positions
    Medical Positions
    [replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")]
    " - jobs += "" + jobs += "" for(var/jobPos in science_positions) if(!jobPos) continue var/datum/job/job = job_master.GetJob(jobPos) if(!job) continue if(jobban_isbanned(M, job.title)) - jobs += "" + jobs += "" counter++ else - jobs += "" + jobs += "" counter++ if(counter >= 5) //So things dont get squiiiiished! @@ -593,17 +593,17 @@ //Support (Grey) counter = 0 jobs += "
    Science Positions
    Science Positions
    [replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")]
    " - jobs += "" + jobs += "" for(var/jobPos in support_positions) if(!jobPos) continue var/datum/job/job = job_master.GetJob(jobPos) if(!job) continue if(jobban_isbanned(M, job.title)) - jobs += "" + jobs += "" counter++ else - jobs += "" + jobs += "" counter++ if(counter >= 5) //So things dont get squiiiiished! @@ -614,17 +614,17 @@ //Non-Human (Green) counter = 0 jobs += "
    Support Positions
    Support Positions
    [replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")]
    " - jobs += "" + jobs += "" for(var/jobPos in nonhuman_positions) if(!jobPos) continue var/datum/job/job = job_master.GetJob(jobPos) if(!job) continue if(jobban_isbanned(M, job.title)) - jobs += "" + jobs += "" counter++ else - jobs += "" + jobs += "" counter++ if(counter >= 5) //So things dont get squiiiiished! @@ -633,29 +633,29 @@ //Drone if(jobban_isbanned(M, "Drone")) - jobs += "" + jobs += "" else - jobs += "" + jobs += "" //pAI if(jobban_isbanned(M, "pAI")) - jobs += "" + jobs += "" else - jobs += "" + jobs += "" jobs += "
    Non-human Positions
    Non-human Positions
    [replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")]DroneDroneDroneDronepAIpAIpAIpAI
    " //Antagonist (Orange) var/isbanned_dept = jobban_isbanned(M, "Syndicate") jobs += "" - jobs += "" + jobs += "" counter = 0 for(var/role in antag_roles) if(jobban_isbanned(M, role) || isbanned_dept) - jobs += "" + jobs += "" else - jobs += "" + jobs += "" counter++ if(counter >= 5) //So things dont get squiiiiished! @@ -670,9 +670,9 @@ counter = 0 for(var/role in other_roles) if(jobban_isbanned(M, role) || isbanned_dept) - jobs += "" + jobs += "" else - jobs += "" + jobs += "" counter++ if(counter >= 5) //So things dont get squiiiiished! @@ -683,17 +683,17 @@ //Whitelisted positions counter = 0 jobs += "
    Antagonist Positions
    Antagonist Positions
    [replacetext(role, " ", " ")][replacetext(role, " ", " ")][replacetext(role, " ", " ")][replacetext(role, " ", " ")][replacetext(role, " ", " ")][replacetext(role, " ", " ")][replacetext(role, " ", " ")][replacetext(role, " ", " ")]
    " - jobs += "" + jobs += "" for(var/jobPos in whitelisted_positions) if(!jobPos) continue var/datum/job/job = job_master.GetJob(jobPos) if(!job) continue if(jobban_isbanned(M, job.title)) - jobs += "" + jobs += "" counter++ else - jobs += "" + jobs += "" counter++ if(counter >= 5) //So things dont get squiiiiished! @@ -1067,9 +1067,9 @@ return alert(usr, "The game has already started.", null, null, null, null) var/dat = {"What mode do you wish to play?
    "} for(var/mode in config.modes) - dat += {"[config.mode_names[mode]]
    "} - dat += {"Secret
    "} - dat += {"Random
    "} + dat += {"[config.mode_names[mode]]
    "} + dat += {"Secret
    "} + dat += {"Random
    "} dat += {"Now: [master_mode]"} usr << browse(dat, "window=c_mode") @@ -1082,8 +1082,8 @@ return alert(usr, "The game mode has to be secret!", null, null, null, null) var/dat = {"What game mode do you want to force secret to be? Use this if you want to change the game mode, but want the players to believe it's secret. This will only work if the current game mode is secret.
    "} for(var/mode in config.modes) - dat += {"[config.mode_names[mode]]
    "} - dat += {"Random (default)
    "} + dat += {"[config.mode_names[mode]]
    "} + dat += {"Random (default)
    "} dat += {"Now: [secret_force_mode]"} usr << browse(dat, "window=f_secret") @@ -1837,7 +1837,7 @@ for(var/page = 1, page <= B.amount + 1, page++) var/obj/pageobj = B.contents[page] - data += "Page [page] - [pageobj.name]
    " + data += "Page [page] - [pageobj.name]
    " usr << browse(data, "window=[B.name]") else diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index 33c33c2ab6d..b8ab9c23853 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -13,14 +13,14 @@ client/proc/one_click_antag() /datum/admins/proc/one_click_antag() var/dat = {"One-click Antagonist
    - Make Traitors
    - Make Changelings
    - Make Revolutionaries
    - Make Cult
    - Make Wizard (Requires Ghosts)
    - Make Vampires
    - Make Vox Raiders (Requires Ghosts)
    - Make Abductor Team (Requires Ghosts)
    + Make Traitors
    + Make Changelings
    + Make Revolutionaries
    + Make Cult
    + Make Wizard (Requires Ghosts)
    + Make Vampires
    + Make Vox Raiders (Requires Ghosts)
    + Make Abductor Team (Requires Ghosts)
    "} usr << browse(dat, "window=oneclickantag;size=400x400") return diff --git a/code/modules/arcade/prize_counter.dm b/code/modules/arcade/prize_counter.dm index e45d3d1bfe0..e1636fa4e33 100644 --- a/code/modules/arcade/prize_counter.dm +++ b/code/modules/arcade/prize_counter.dm @@ -116,7 +116,7 @@ td.cost.toomuch { -

    Tickets: [tickets] | Eject Tickets

    +

    Tickets: [tickets] | Eject Tickets

    Arcade Ticket Exchange

    Exchange that pile of tickets for a pile of cool prizes! @@ -148,7 +148,7 @@ td.cost.toomuch { "} dat += {"

    "} diff --git a/code/modules/assembly/health.dm b/code/modules/assembly/health.dm index 5c67f780a5f..2598c1aae72 100644 --- a/code/modules/assembly/health.dm +++ b/code/modules/assembly/health.dm @@ -73,7 +73,7 @@ if(!secured) user.show_message("The [name] is unsecured!") return 0 - var/dat = text("Health Sensor [scanning?"On":"Off"]") + var/dat = text("Health Sensor [scanning?"On":"Off"]") if(scanning && health_scan) dat += "
    Health: [health_scan]" var/datum/browser/popup = new(user, "hscan", name, 400, 400) diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index baf1a9a950d..7f9181ca937 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -133,12 +133,12 @@ if(!secured) return user.set_machine(src) var/dat = {"Infrared Laser - Status: [on ? "On" : "Off"]
    - Visibility: [visible ? "Visible" : "Invisible"]
    - Current Direction: [capitalize(dir2text(dir))]
    + Status: [on ? "On" : "Off"]
    + Visibility: [visible ? "Visible" : "Invisible"]
    + Current Direction: [capitalize(dir2text(dir))]
    -

    Refresh -

    Close"} +

    Refresh +

    Close"} var/datum/browser/popup = new(user, "infra", name, 400, 400) popup.set_content(dat) popup.open(0) diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index 3b1e5b3a6c7..da81b00683a 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -114,9 +114,9 @@ var/second = time % 60 var/minute = (time - second) / 60 var/dat = text("Proximity Sensor\n[] []:[]\n- - + +\n", (timing ? text("Arming", src) : text("Not Arming", src)), minute, second, src, src, src, src) - dat += "
    [scanning?"Armed":"Unarmed"] (Movement sensor active when armed!)" - dat += "

    Refresh" - dat += "

    Close" + dat += "
    [scanning?"Armed":"Unarmed"] (Movement sensor active when armed!)" + dat += "

    Refresh" + dat += "

    Close" var/datum/browser/popup = new(user, "prox", name, 400, 400) popup.set_content(dat) popup.open(0) diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index c021fec7ef9..ca597bd1207 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -54,30 +54,30 @@ // if((src.b_stat && !( flag1 ))) // t1 = text("-------
    \nGreen Wire: []
    \nRed Wire: []
    \nBlue Wire: []
    \n", (src.wires & 4 ? text("Cut Wire", src) : text("Mend Wire", src)), (src.wires & 2 ? text("Cut Wire", src) : text("Mend Wire", src)), (src.wires & 1 ? text("Cut Wire", src) : text("Mend Wire", src))) // else -// t1 = "-------" Speaker: [src.listening ? "Engaged" : "Disengaged"]
    +// t1 = "-------" Speaker: [src.listening ? "Engaged" : "Disengaged"]
    var/dat = {" "} if(!flag1) dat += {" - Send Signal
    - Reciever is [receiving?"on":"off"]
    + Send Signal
    + Reciever is [receiving?"on":"off"]
    "} dat += {" Frequency/Code for signaler:
    Frequency: - - - - + - + - [format_frequency(src.frequency)] - + - +
    + + + +
    Code: - - - - + - + - [src.code] - + - +
    + + + +
    [t1]
    "} diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index b5a197d6dd4..179d7df2347 100644 --- a/code/modules/assembly/timer.dm +++ b/code/modules/assembly/timer.dm @@ -86,16 +86,16 @@ var/dat = {"

    Timing Unit

    - [minute]:[second] [timing?"Stop":"Start"] Reset
    - Repeat: [repeat?"On":"Off"]
    + [minute]:[second] [timing?"Stop":"Start"] Reset
    + Repeat: [repeat?"On":"Off"]
    Timer set for - - - [set_minute]:[set_second] + + + - - [set_minute]:[set_second] + +


    - Refresh + Refresh

    - Close"} + Close"} var/datum/browser/popup = new(user, "timer", name, 400, 400) popup.set_content(dat) popup.open(0) diff --git a/code/modules/atmos_automation/console.dm b/code/modules/atmos_automation/console.dm index 201a6f63e4d..2d361689eca 100644 --- a/code/modules/atmos_automation/console.dm +++ b/code/modules/atmos_automation/console.dm @@ -73,31 +73,31 @@ var/out=..() if(on) - out += "RUNNING" + out += "RUNNING" else - out += "STOPPED" + out += "STOPPED" out += {"

    Automations

    \[ - + Add | - + Reset All | - + Clear \]

    \[ - + Export | - + Import \]

    "} @@ -108,9 +108,9 @@ out += {"
    - [A.label] - (Reset | - ×) + [A.label] + (Reset | + ×) [A.GetText()]
    diff --git a/code/modules/atmos_automation/implementation/digital_valves.dm b/code/modules/atmos_automation/implementation/digital_valves.dm index ce778a58aa1..a143c0e9869 100644 --- a/code/modules/atmos_automation/implementation/digital_valves.dm +++ b/code/modules/atmos_automation/implementation/digital_valves.dm @@ -22,7 +22,7 @@ return 0 GetText() - return "Set digital valve [fmtString(valve)] to [state?"open":"closed"]." + return "Set digital valve [fmtString(valve)] to [state?"open":"closed"]." Topic(href,href_list) if(..()) diff --git a/code/modules/atmos_automation/implementation/emitters.dm b/code/modules/atmos_automation/implementation/emitters.dm index c0b04399385..10469de1db8 100644 --- a/code/modules/atmos_automation/implementation/emitters.dm +++ b/code/modules/atmos_automation/implementation/emitters.dm @@ -20,7 +20,7 @@ return 0 GetText() - return "Set emitter [fmtString(emitter)] to [on?"on":"off"]." + return "Set emitter [fmtString(emitter)] to [on?"on":"off"]." Topic(href,href_list) if(..()) diff --git a/code/modules/atmos_automation/implementation/injectors.dm b/code/modules/atmos_automation/implementation/injectors.dm index 32bc06551f0..fee6cf1e33c 100644 --- a/code/modules/atmos_automation/implementation/injectors.dm +++ b/code/modules/atmos_automation/implementation/injectors.dm @@ -24,7 +24,7 @@ return 0 GetText() - return "Set injector [fmtString(injector)] power to [state ? "on" : "off"]." + return "Set injector [fmtString(injector)] power to [state ? "on" : "off"]." Topic(href,href_list) if(..()) @@ -64,7 +64,7 @@ return 0 GetText() - return "Set injector [fmtString(injector)] transfer rate to [rate] L/s." + return "Set injector [fmtString(injector)] transfer rate to [rate] L/s." Topic(href,href_list) if(..()) diff --git a/code/modules/atmos_automation/implementation/scrubbers.dm b/code/modules/atmos_automation/implementation/scrubbers.dm index eb6f13f83bf..158ac1d835f 100644 --- a/code/modules/atmos_automation/implementation/scrubbers.dm +++ b/code/modules/atmos_automation/implementation/scrubbers.dm @@ -25,7 +25,7 @@ return 0 GetText() - return "Set Scrubber [fmtString(scrubber)] mode to [mode?"Scrubbing":"Syphoning"]." + return "Set Scrubber [fmtString(scrubber)] mode to [mode?"Scrubbing":"Syphoning"]." Topic(href,href_list) if(..()) return @@ -67,7 +67,7 @@ parent.send_signal(list ("tag" = scrubber, "sigtype"="command", "power"=state),filter = RADIO_FROM_AIRALARM) GetText() - return "Set Scrubber [fmtString(scrubber)] power to [state ? "on" : "off"]." + return "Set Scrubber [fmtString(scrubber)] power to [state ? "on" : "off"]." Topic(href,href_list) if(..()) return @@ -129,9 +129,9 @@ var/global/list/gas_labels=list( parent.send_signal(data,filter = RADIO_FROM_AIRALARM) GetText() - var/txt = "Set Scrubber [fmtString(scrubber)] to scrub " + var/txt = "Set Scrubber [fmtString(scrubber)] to scrub " for(var/gas in gasses) - txt += " [gas_labels[gas]] ([gasses[gas] ? "on" : "off"])," + txt += " [gas_labels[gas]] ([gasses[gas] ? "on" : "off"])," return txt Topic(href,href_list) diff --git a/code/modules/atmos_automation/implementation/sensors.dm b/code/modules/atmos_automation/implementation/sensors.dm index 57a36e2999b..8b3b1ece5b5 100644 --- a/code/modules/atmos_automation/implementation/sensors.dm +++ b/code/modules/atmos_automation/implementation/sensors.dm @@ -27,7 +27,7 @@ return 0 GetText() - return "[fmtString(field)] from sensor [fmtString(sensor)]" + return "[fmtString(field)] from sensor [fmtString(sensor)]" Topic(href,href_list) if(..()) diff --git a/code/modules/atmos_automation/implementation/vent_pump.dm b/code/modules/atmos_automation/implementation/vent_pump.dm index 7601d89f0c3..9a8949ccde2 100644 --- a/code/modules/atmos_automation/implementation/vent_pump.dm +++ b/code/modules/atmos_automation/implementation/vent_pump.dm @@ -27,7 +27,7 @@ return 0 GetText() - return "Set [vent_type ? "Dual-Port" : "Unary"] vent pump [fmtString(vent_pump)] mode to [mode]." + return "Set [vent_type ? "Dual-Port" : "Unary"] vent pump [fmtString(vent_pump)] mode to [mode]." Topic(href,href_list) if(..()) @@ -84,7 +84,7 @@ parent.send_signal(list ("tag" = vent_pump, "power" = state), filter = (mode ? RADIO_ATMOSIA : RADIO_FROM_AIRALARM)) GetText() - return "Set [mode ? "Dual-Port" : "Unary"] vent pump [fmtString(vent_pump)] power to [state ? "on" : "off"]." + return "Set [mode ? "Dual-Port" : "Unary"] vent pump [fmtString(vent_pump)] power to [state ? "on" : "off"]." Topic(href,href_list) if(..()) @@ -168,15 +168,15 @@ GetText() if(mode)//DP vent - return {"Set dual-port vent pump [fmtString(vent_pump)] - pressure bounds: internal outwards: [fmtString(intpressureout)] - internal inwards: [fmtString(intpressurein)] - external: [fmtString(extpressure)] + return {"Set dual-port vent pump [fmtString(vent_pump)] + pressure bounds: internal outwards: [fmtString(intpressureout)] + internal inwards: [fmtString(intpressurein)] + external: [fmtString(extpressure)] "}//well that was a lot to type else - return {"Set unary vent pump [fmtString(vent_pump)] - pressure bounds: internal: [fmtString(intpressureout)] - external: [fmtString(extpressure)] + return {"Set unary vent pump [fmtString(vent_pump)] + pressure bounds: internal: [fmtString(intpressureout)] + external: [fmtString(extpressure)] "}//copy paste FTW Topic(href, href_list) @@ -260,15 +260,15 @@ checks bitflags GetText() if(mode) - return {"Set dual-port vent pump [fmtString(vent_pump)] pressure checks to: - external [checks&1 ? "Enabled" : "Disabled"] - internal inwards [checks&2 ? "Enabled" : "Disabled"] - internal outwards [checks&4 ? "Enabled" : "Disabled"] + return {"Set dual-port vent pump [fmtString(vent_pump)] pressure checks to: + external [checks&1 ? "Enabled" : "Disabled"] + internal inwards [checks&2 ? "Enabled" : "Disabled"] + internal outwards [checks&4 ? "Enabled" : "Disabled"] "} else - return {"Set unary vent pump [fmtString(vent_pump)] pressure checks to: - external: [checks&1 ? "Enabled" : "Disabled"], - internal: [checks&2 ? "Enabled" : "Disabled"] + return {"Set unary vent pump [fmtString(vent_pump)] pressure checks to: + external: [checks&1 ? "Enabled" : "Disabled"], + internal: [checks&2 ? "Enabled" : "Disabled"] "} Topic(href, href_list) diff --git a/code/modules/atmos_automation/statements.dm b/code/modules/atmos_automation/statements.dm index 6cac14dc375..ddc9fc04834 100644 --- a/code/modules/atmos_automation/statements.dm +++ b/code/modules/atmos_automation/statements.dm @@ -159,13 +159,13 @@ var/global/automation_types = subtypesof(/datum/automation) return 1 GetText() - var/out="AND (Add)" + var/out="AND (Add)" if(children.len>0) out += "
      " for(var/datum/automation/stmt in children) out += {"
    • - \[Reset | - ×\] + \[Reset | + ×\] [stmt.GetText()]
    • "} out += "
    " @@ -190,13 +190,13 @@ var/global/automation_types = subtypesof(/datum/automation) return 0 GetText() - var/out="OR (Add)" + var/out="OR (Add)" if(children.len>0) out += "
      " for(var/datum/automation/stmt in children) out += {"
    • - \[Reset | - ×\] + \[Reset | + ×\] [stmt.GetText()]
    • "} out += "
    " @@ -244,31 +244,31 @@ var/global/automation_types = subtypesof(/datum/automation) condition = unpackChild(json["condition"]) GetText() - var/out="IF (SET):
    " + var/out="IF (SET):
    " if(condition) out += condition.GetText() else out += "Not set" out += "
    " - out += "THEN: (Add)" + out += "THEN: (Add)" if(children_then.len>0) out += "
      " for(var/datum/automation/stmt in children_then) out += {"
    • - \[Reset | - ×\] + \[Reset | + ×\] [stmt.GetText()]
    • "} out += "
    " else out += "
    (No statements to run)
    " - out += "ELSE: (Add)" + out += "ELSE: (Add)" if(children_then.len>0) out += "
      " for(var/datum/automation/stmt in children_else) out += {"
    • - \[Reset | - ×\] + \[Reset | + ×\] [stmt.GetText()]
    • "} out += "
    " @@ -395,13 +395,13 @@ var/global/automation_types = subtypesof(/datum/automation) var/datum/automation/left =children[1] var/datum/automation/right=children[2] - var/out = "(Set Left) (" + var/out = "(Set Left) (" if(left==null) out += "-----" else out += left.GetText() - out += ") is [comparator]: (Set Right) (" + out += ") is [comparator]: (Set Right) (" if(right==null) out += "-----" @@ -448,7 +448,7 @@ var/global/automation_types = subtypesof(/datum/automation) value = text2num(json["value"]) GetText() - return "[value]" + return "[value]" Topic(href,href_list) if(href_list["set_value"]) diff --git a/code/modules/computer3/NTOS.dm b/code/modules/computer3/NTOS.dm index bc70c49cbac..eed2163e0ac 100644 --- a/code/modules/computer3/NTOS.dm +++ b/code/modules/computer3/NTOS.dm @@ -32,7 +32,7 @@ continue dat += {"
    Whitelisted Positions
    Whitelisted Positions
    [replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")] - [item.cost] Tickets + [item.cost] Tickets
    -
    +

    [F.name]
    @@ -60,7 +60,7 @@ continue dat += {"
    - + [bicon(C)]
    [C.name]
    @@ -73,7 +73,7 @@ /datum/file/program/ntos/proc/window(var/title,var/buttonbar,var/content) return {"
    -
    [title]
    +
    [title]
    [buttonbar]
    [content]
    "} diff --git a/code/modules/computer3/computers/HolodeckControl.dm b/code/modules/computer3/computers/HolodeckControl.dm index 2b59985bc83..dc4c71a0f90 100644 --- a/code/modules/computer3/computers/HolodeckControl.dm +++ b/code/modules/computer3/computers/HolodeckControl.dm @@ -26,28 +26,28 @@ if(!interactable()) return var/dat = "

    Current Loaded Programs

    " - dat += "((Empty Court))
    " - dat += "((Boxing Court))
    " - dat += "((Basketball Court))
    " - dat += "((Thunderdome Court))
    " - dat += "((Beach))
    " -// dat += "((Shutdown System))
    " + dat += "((Empty Court))
    " + dat += "((Boxing Court))
    " + dat += "((Basketball Court))
    " + dat += "((Thunderdome Court))
    " + dat += "((Beach))
    " +// dat += "((Shutdown System))
    " dat += "Please ensure that only holographic weapons are used in the holodeck if a combat simulation has been loaded.
    " if(emagged) - dat += "(Begin Atmospheric Burn Simulation)
    " + dat += "(Begin Atmospheric Burn Simulation)
    " dat += "Ensure the holodeck is empty before testing.
    " dat += "
    " - dat += "(Begin Wildlife Simulation)
    " + dat += "(Begin Wildlife Simulation)
    " dat += "Ensure the holodeck is empty before testing.
    " dat += "
    " if(issilicon(usr)) - dat += "(Re-Enable Safety Protocols?)
    " + dat += "(Re-Enable Safety Protocols?)
    " dat += "Safety Protocols are DISABLED
    " else if(issilicon(usr)) - dat += "(Override Safety Protocols?)
    " + dat += "(Override Safety Protocols?)
    " dat += "
    " dat += "Safety Protocols are ENABLED
    " diff --git a/code/modules/computer3/computers/card.dm b/code/modules/computer3/computers/card.dm index 1a6fe38a46e..2e7af8bf27c 100644 --- a/code/modules/computer3/computers/card.dm +++ b/code/modules/computer3/computers/card.dm @@ -36,8 +36,8 @@ jobs_all += "" jobs_all += ""//Captain 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 = {"
    Command
    SpecialCaptainCustomCaptainCustom
    Security
    [replacetext(job, " ", " ")][replacetext(job, " ", " ")]
    Engineering
    [replacetext(job, " ", " ")][replacetext(job, " ", " ")]
    Medical
    [replacetext(job, " ", " ")][replacetext(job, " ", " ")]
    Science
    [replacetext(job, " ", " ")][replacetext(job, " ", " ")]
    Support
    [replacetext(job, " ", " ")][replacetext(job, " ", " ")]