"
- dat += "Return to main menu"
+ dat += "Return to main menu"
dat += "
" dat += "Total amount: [materials.total_amount] / [materials.max_amount] cm3
" dat += "Metal amount: [materials.amount(MAT_METAL)] cm3
" dat += "Glass amount: [materials.amount(MAT_GLASS)] cm3
" - for(var/datum/design/D in files.known_designs) + for(var/v in files.known_designs) + var/datum/design/D = files.known_designs[v] if(!(selected_category in D.category)) continue 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 +476,7 @@ /obj/machinery/autolathe/proc/search_win(mob/user) var/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 += {"
"
//Chat room list
if(5)
- dat += "Back - Refresh
" + dat += "Back - Refresh
" dat += {"
"
//View chat room logs
if(6)
- dat += "Back - Refresh
" + dat += "Back - Refresh
" dat += {"
Browsing [selected_category]:
" dat += "Total amount: [materials.total_amount] / [materials.max_amount] cm3
" dat += "Metal amount: [materials.amount(MAT_METAL)] cm3
" dat += "Glass amount: [materials.amount(MAT_GLASS)] cm3
" - for(var/datum/design/D in files.known_designs) + for(var/v in files.known_designs) + var/datum/design/D = files.known_designs[v] if(!(selected_category in D.category)) continue 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 +476,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 +486,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)] " @@ -509,8 +520,8 @@ if(hack) for(var/datum/design/D in files.possible_designs) if((D.build_type & AUTOLATHE) && ("hacked" in D.category)) - files.known_designs += D + files.AddDesign2Known(D) else for(var/datum/design/D in files.known_designs) if("hacked" in D.category) - files.known_designs -= D + files.known_designs -= D.id diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index fed2328570a..bde30cd92d4 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 += "" - 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 += " Nutrients:" dat += ""
- dat += "E-Z-Nutrient: Makex5 ([10/efficiency]) "
dat += "" - 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 += " Leather:" dat += ""
- dat += "Wallet: Make ([100/efficiency]) "
dat += "" - 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 += " Belts" dat += ""
- dat += "Utility belt: Make ([300/efficiency]) "
//dat += "" - 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 += " Other:" - //dat += "Monkey: Make ([400/efficiency])" + //dat += "Monkey: Make ([400/efficiency]) " else dat += " No container inside. Please insert a container. "
@@ -274,7 +274,7 @@
if(check_container_volume(10)) return 0
else beaker.reagents.add_reagent("eznutrient",10)
else
- new/obj/item/weapon/reagent_containers/glass/fertilizer/ez(src.loc)
+ new/obj/item/weapon/reagent_containers/glass/bottle/fertilizer/ez(src.loc)
if(check_cost(10/efficiency)) return 0
if("l4z")
if(check_cost(20/efficiency, 1)) return 0
@@ -282,7 +282,7 @@
if(check_container_volume(10)) return 0
else beaker.reagents.add_reagent("left4zed",10)
else
- new/obj/item/weapon/reagent_containers/glass/fertilizer/l4z(src.loc)
+ new/obj/item/weapon/reagent_containers/glass/bottle/fertilizer/l4z(src.loc)
if(check_cost(20/efficiency)) return 0
if("rh")
if(check_cost(25/efficiency, 1)) return 0
@@ -290,7 +290,7 @@
if(check_container_volume(10)) return 0
else beaker.reagents.add_reagent("robustharvest",10)
else
- new/obj/item/weapon/reagent_containers/glass/fertilizer/rh(src.loc)
+ new/obj/item/weapon/reagent_containers/glass/bottle/fertilizer/rh(src.loc)
if(check_cost(25/efficiency)) return 0
//Leather
if("wallet")
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 {"
" + 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(" " 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/Operating.dm b/code/game/machinery/computer/Operating.dm index 81753797b57..08e3677b039 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -57,7 +57,7 @@ // // user.set_machine(src) // var/dat = " " //| Update" +// dat += "Close " //| Update" // if(src.table && (src.table.check_victim())) // src.victim = src.table.victim // dat += {" 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][temp]" + dat += " " 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 += "" + dat += "" else - dat += "" - dat += "" - dat += "" + dat += "" + dat += "" + dat += "" else dat = " The Orion TrailExperience the journey of your ancestors!" - dat += " [deadname] tried to fight back but was killed." else eventdat += " Fortunately you fended them off without any trouble." - eventdat += "" - eventdat += "" + eventdat += "" + eventdat += "" 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 += "" - eventdat += "" + eventdat += "" + eventdat += "" if(ORION_TRAIL_ILLNESS) eventdat += "A deadly illness has been contracted!" var/deadname = remove_crewmember() eventdat += " [deadname] was killed by the disease." - eventdat += "" - eventdat += "" + eventdat += "" + eventdat += "" 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 += "" + eventdat += "" else - eventdat += "" - eventdat += "" + eventdat += "" + eventdat += "" 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 += "" + eventdat += "" else - eventdat += "" - eventdat += "" + eventdat += "" + eventdat += "" 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 += "" + eventdat += "" else - eventdat += "" - eventdat += "" + eventdat += "" + eventdat += "" if(ORION_TRAIL_BLACKHOLE) eventdat += "You were swept away into the black hole." - eventdat += "" - eventdat += "" + eventdat += "" + eventdat += "" 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 += "" - eventdat += "" + eventdat += "" + eventdat += "" 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 += "" - eventdat += "" - eventdat += "" + eventdat += "" + eventdat += "" + eventdat += "" 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 += "" - eventdat += "" + eventdat += "" + eventdat += "" 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 += "" - eventdat += "" + eventdat += "" + eventdat += "" 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 += "" + eventdat += "" else eventdat += "Cant afford to buy Engine Parts" //Hull plates if(fuel > 5) - eventdat += " " + eventdat += "" else eventdat += "Cant afford to buy Hull Plates" //Electronics if(fuel > 5) - eventdat += " " + eventdat += "" 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 Fuel \nPower: [] \nHologram Control: \nColor Luminosity: []/220 \[Reset\] \nLighten: 1 10 \nDarken: 1 10 \n \nHair Color: ([],[],[]) \[Reset\] \nRed (0-255): \[0\] -10 -1 [] 1 10 \[255\] \nGreen (0-255): \[0\] -10 -1 [] 1 10 \[255\] \nBlue (0-255): \[0\] -10 -1 [] 1 10 \[255\] ", src, (src.projector.hologram ? "On" : "Off"), -src.lumens + 35, src, src, src, src, src, src.h_r, src.h_g, src.h_b, src, src, src, src, src.h_r, src, src, src, src, src, src, src.h_g, src, src, src, src, src, src, src.h_b, src, src, src) + dat = text({"Hologram Status: \n + Power: [] \n + Hologram Control: \n + Color Luminosity: []/220 \[Reset\] \n + Lighten: 1 10 \n + Darken: 1 10 \n + \nHair Color: ([],[],[]) \[Reset\] \n + Red (0-255): \[0\] -10 -1 [] 1 10 \[255\] \n + Green (0-255): \[0\] -10 -1 [] 1 10 \[255\] \n + Blue (0-255): \[0\] -10 -1 [] 1 10 \[255\] + "}, (src.projector.hologram ? "On" : "Off"), -src.lumens + 35, src.h_r, src.h_g, src.h_b, src.h_r, src.h_g, src.h_b) user << browse(dat, "window=hologram_console") onclose(user, "hologram_console") return diff --git a/code/game/machinery/computer/honkputer.dm b/code/game/machinery/computer/honkputer.dm index b20821d24c2..13f07773404 100644 --- a/code/game/machinery/computer/honkputer.dm +++ b/code/game/machinery/computer/honkputer.dm @@ -82,13 +82,13 @@ switch(src.state) if(STATE_DEFAULT) if(src.authenticated) - dat += " \[ Log Out \]" - dat += " \[ Send an emergency message to Honkplanet \]" + dat += " \[ Log Out \]" + dat += " \[ Send an emergency message to Honkplanet \]" else - dat += " \[ Log In \]" + dat += " \[ Log In \]" - dat += " \[ [(src.state != STATE_DEFAULT) ? "Main 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..1b8004f88cc 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -28,57 +28,57 @@ 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) : "----------")) + dat = text("Confirm Identity: [] ", (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: " if(!isnull(data_core.general)) for(var/datum/data/record/R in sortRecord(data_core.general)) - dat += text("[]: [] ", src, R, R.fields["id"], R.fields["name"]) + dat += text("[]: [] ", R, R.fields["id"], R.fields["name"]) //Foreach goto(132) - dat += text(" Back", src) + dat += " Back" if(3.0) - dat += text("Records Maintenance \nBackup To Disk \nUpload From disk \nDelete All Records \n \nBack", src, src, src, src) + dat += "Records Maintenance \nBackup To Disk \nUpload From disk \nDelete All Records \n \nBack" if(4.0) dat += " " if((istype(src.active1, /datum/data/record) && data_core.general.Find(src.active1))) dat += "
" if((istype(src.active2, /datum/data/record) && data_core.medical.Find(src.active2))) - dat += text(" \n \nBlood Type: [] \nDNA: [] \n \nMinor Disabilities: [] \nDetails: [] \n \nMajor Disabilities: [] \nDetails: [] \n \nAllergies: [] \nDetails: [] \n \nCurrent Diseases: [] (per disease info placed in log/comment section) \nDetails: [] \n \nImportant Notes: \n\t[] \n \n ", src, src.active2.fields["b_type"], src, src.active2.fields["b_dna"], src, src.active2.fields["mi_dis"], src, src.active2.fields["mi_dis_d"], src, src.active2.fields["ma_dis"], src, src.active2.fields["ma_dis_d"], src, src.active2.fields["alg"], src, src.active2.fields["alg_d"], src, src.active2.fields["cdi"], src, src.active2.fields["cdi_d"], src, src.active2.fields["notes"]) + dat += text(" \n \nBlood Type: [] \nDNA: [] \n \nMinor Disabilities: [] \nDetails: [] \n \nMajor Disabilities: [] \nDetails: [] \n \nAllergies: [] \nDetails: [] \n \nCurrent Diseases: [] (per disease info placed in log/comment section) \nDetails: [] \n \nImportant Notes: \n\t[] \n \n ", src.active2.fields["b_type"], src.active2.fields["b_dna"], src.active2.fields["mi_dis"], src.active2.fields["mi_dis_d"], src.active2.fields["ma_dis"], src.active2.fields["ma_dis_d"], src.active2.fields["alg"], src.active2.fields["alg_d"], src.active2.fields["cdi"], src.active2.fields["cdi_d"], src.active2.fields["notes"]) var/counter = 1 while(src.active2.fields[text("com_[]", counter)]) - dat += text("[] Delete Entry ", src.active2.fields[text("com_[]", counter)], src, counter) + dat += text("[] Delete Entry ", src.active2.fields[text("com_[]", counter)], counter) counter++ - dat += text("Add Entry ", src) - dat += text("Delete Record (Medical Only) ", src) + dat += "Add Entry " + dat += "Delete Record (Medical Only) " else dat += "Medical Record Lost! " - dat += text("New Record ") - dat += text("\nPrint Record \nBack ", src, src) + dat += text("New Record ") + dat += "\nPrint Record \nBack " if(5.0) dat += " [Dis.name]" - dat += " Back" + dat += " [Dis.name]" + dat += " Back" if(6.0) dat += " Medical Robots:" var/bdat = null for(var/mob/living/simple_animal/bot/medbot/M in world) @@ -111,7 +111,7 @@ else else - dat += text("{Log In}", src) + dat += "{Log In}" var/datum/browser/popup = new(user, "med_rec", name, 400, 400) popup.set_content(dat) popup.open(0) @@ -215,7 +215,7 @@ Severity: [Dis.severity]"} if(href_list["del_all"]) - src.temp = text("Are you sure you wish to delete all records? \n\tYes \n\tNo ", src, src) + src.temp = "Are you sure you wish to delete all records? \n\tYes \n\tNo " if(href_list["del_all2"]) for(var/datum/data/record/R in data_core.medical) @@ -302,13 +302,13 @@ src.active2.fields["notes"] = t1 if("p_stat") if(istype(src.active1, /datum/data/record)) - src.temp = text("Physical Condition: \n\t*Deceased* \n\t*SSD* \n\tActive \n\tPhysically Unfit \n\tDisabled ", src, src, src, src, src) + src.temp = "Physical Condition: \n\t*Deceased* \n\t*SSD* \n\tActive \n\tPhysically Unfit \n\tDisabled " if("m_stat") if(istype(src.active1, /datum/data/record)) - src.temp = text("Mental Condition: \n\t*Insane* \n\t*Unstable* \n\t*Watch* \n\tStable ", src, src, src, src) + src.temp = "Mental Condition: \n\t*Insane* \n\t*Unstable* \n\t*Watch* \n\tStable " if("b_type") if(istype(src.active2, /datum/data/record)) - src.temp = text("Blood Type: \n\tA- A+ \n\tB- B+ \n\tAB- AB+ \n\tO- O+ ", src, src, src, src, src, src, src, src) + src.temp = "Blood Type: \n\tA- A+ \n\tB- B+ \n\tAB- AB+ \n\tO- O+ " if("b_dna") if(istype(src.active1, /datum/data/record)) var/t1 = copytext(trim(sanitize(input("Please input DNA hash:", "Med. records", src.active1.fields["dna"], null) as text)),1,MAX_MESSAGE_LEN) @@ -381,7 +381,7 @@ if(href_list["del_r"]) if(src.active2) - src.temp = text("Are you sure you wish to delete the record (Medical Portion Only)? \n\tYes \n\tNo ", src, src) + src.temp = "Are you sure you wish to delete the record (Medical Portion Only)? \n\tYes \n\tNo " if(href_list["del_r2"]) if(src.active2) diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index 50dc9c19603..a3bd840750e 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -103,10 +103,10 @@ dat += "
"
+ dat += " |
| X | Sender | Recipient | Message |
|---|---|---|---|
| [pda.sender] | [pda.recipient] | [pda.message] | |
| [pda.sender] | [pda.recipient] | [pda.message] |
" + dat += "
" dat += {"
| Sender | -Sender's Job | -Recipient | -Message |
| Sender | +Sender's Job | +Recipient | +Message | [customjob] | [customrecepient ? customrecepient.owner : "NONE"] | [custommessage] | "} - dat += "
" + dat += "
" dat += {"
| X | Sending Dep. | Receiving Dep. | Message | Stamp | ID Auth. | Priority. |
|---|---|---|---|---|---|---|
| [rc.send_dpt] | + dat += {"||||||
| [rc.send_dpt] | [rc.rec_dpt] | [rc.message] | [rc.stamp] | [rc.id_auth] | [rc.priority] |
" + dat += "
" dat += {"
| Room Name | @@ -262,7 +262,7 @@ for(var/datum/chatroom/C in chatrooms) var/list/invites = (C.invites - C.users) dat += {"||||
|---|---|---|---|---|
| [C.name] | +[C.name] | [C.users.len] | [invites.len] | [C.logs.len] | @@ -270,7 +270,7 @@ dat += "
" + dat += "
" dat += {"
| Name | @@ -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 @@ -505,7 +505,7 @@ if(!recipient_messenger.conversations.Find("\ref[PDARec]")) recipient_messenger.conversations.Add("\ref[PDARec]") - recipient_messenger.notify("Message from [PDARec.owner] ([customjob]), \"[custommessage]\" (Reply)") + recipient_messenger.notify("Message from [PDARec.owner] ([customjob]), \"[custommessage]\" (Reply)") log_pda("[usr] (PDA: [PDARec.owner]) sent \"[custommessage]\" to [customrecepient.owner]") //Finally.. ResetMessage() diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index 2619e25e4b8..66b3cc5b8f4 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -119,44 +119,44 @@ if(..()) return - var/dat = "[name](rename)" + var/dat = "[name](rename)" user.set_machine(src) - dat += "
|---|
| Name | -ID | -Rank | -Fingerprints | +Name | +ID | +Rank | +Fingerprints | Criminal Status | ||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| [] | ", R.fields["name"], R.fields["id"], R.fields["rank"], R.fields["fingerprint"], src, R, R.fields["name"]) + dat += text("[] | ", R.fields["name"], R.fields["id"], R.fields["rank"], R.fields["fingerprint"], R, R.fields["name"]) dat += text("[] | ", R.fields["id"]) dat += text("[] | ", R.fields["rank"]) dat += text("[] | ", R.fields["fingerprint"]) @@ -154,22 +154,22 @@ var complete_list = maintable.innerHTML;
|
- 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"]] |
@@ -177,25 +177,25 @@
Photo:
" if((istype(active2, /datum/data/record) && data_core.security.Find(active2))) - dat += text("
\n
\nCriminal Status: []
\n
\nMinor Crimes: []
\nDetails: []
\n
\nMajor Crimes: []
\nDetails: []
\n
\nImportant Notes:
\n\t[]
\n
\n
", src, active2.fields["criminal"], src, active2.fields["mi_crim"], src, active2.fields["mi_crim_d"], src, active2.fields["ma_crim"], src, active2.fields["ma_crim_d"], src, active2.fields["notes"]) + dat += text("
\n
\nCriminal Status: []
\n
\nMinor Crimes: []
\nDetails: []
\n
\nMajor Crimes: []
\nDetails: []
\n
\nImportant Notes:
\n\t[]
\n
\n
", active2.fields["criminal"], active2.fields["mi_crim"], active2.fields["mi_crim_d"], active2.fields["ma_crim"], active2.fields["ma_crim_d"], active2.fields["notes"]) var/counter = 1 while(active2.fields[text("com_[]", counter)]) - dat += text("[]
Delete Entry
", active2.fields[text("com_[]", counter)], src, counter) + dat += text("[]
Delete Entry
", active2.fields[text("com_[]", counter)], counter) counter++ - dat += text("Add Entry
", src) - dat += text("Delete Record (Security Only)
", src) + dat += "Add Entry
" + dat += "Delete Record (Security Only)
" else dat += "Security Record Lost!
" - dat += text("New Security Record
", src) - dat += text("\nDelete Record (ALL)
\nPrint Record
\nBack
", src, src, src) + dat += "New Security Record
" + dat += "\nDelete Record (ALL)
\nPrint Record
\nBack
" else else - dat += text("{Log In}", src) + dat += "{Log In}" var/datum/browser/popup = new(user, "secure_rec", name, 600, 400) popup.set_content(dat) popup.add_head_content(head_content) @@ -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 += "- "
- temp += "
- None " - temp += "
- *Arrest* " - temp += "
- Incarcerated " - temp += "
- Parolled " - temp += "
- Released " + temp += "
- None " + temp += "
- *Arrest* " + temp += "
- Incarcerated " + temp += "
- Parolled " + temp += "
- Released " 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..027b182e0c0 100644 --- a/code/game/machinery/computer/skills.dm +++ b/code/game/machinery/computer/skills.dm @@ -47,16 +47,16 @@ var/dat if(temp) - dat = text("[]Clear Screen", temp, src) + dat = "[temp]
Clear Screen" else - dat = text("Confirm Identity: []
", src, (scan ? text("[]", scan.name) : "----------")) + dat = text("Confirm Identity: []
", (scan ? text("[]", scan.name) : "----------")) if(authenticated) switch(screen) if(1.0) dat += {"
"}
- dat += text("Search Records
", src)
- dat += text("New Record
", src)
+ dat += "Search Records
"
+ dat += "New Record
"
dat += {"
| Name | -ID | -Rank | -Fingerprints | +Name | +ID | +Rank | +Fingerprints |
|---|---|---|---|---|---|---|---|
| [] | ", background, src, R, R.fields["name"]) + dat += text("|||||||
| [] | ", background, R, R.fields["name"]) dat += text("[] | ", R.fields["id"]) dat += text("[] | ", R.fields["rank"]) dat += text("[] | ", R.fields["fingerprint"]) dat += "
" - dat += text("Record Maintenance
", src) - dat += text("{Log Out}",src) + dat += "Record Maintenance
" + dat += "{Log Out}" if(2.0) dat += "Records Maintenance
" - dat += "
Delete All Records
Back" + dat += "
Delete All Records
Back" if(3.0) dat += "
" if((istype(active1, /datum/data/record) && data_core.general.Find(active1))) dat += text("
| \
- 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"]] | \
@@ -102,10 +102,10 @@
" - dat += text("\nDelete Record (ALL)
\nPrint Record
\nBack
", src, src, src) + dat += "\nDelete Record (ALL)
\nPrint Record
\nBack
" if(4.0) if(!Perp.len) - dat += text("ERROR. String could not be located.
Back", src) + dat += "ERROR. String could not be located.
Back" else dat += {"
| [] | ", background, src, R, R.fields["name"]) + dat += text("||||
| [] | ", background, R, R.fields["name"]) dat += text("[] | ", R.fields["id"]) dat += text("[] | ", R.fields["rank"]) dat += text("[] | ", R.fields["fingerprint"]) dat += text("[] |
" - dat += text("
Return to index.", src) + dat += "
Return to index." else else - dat += text("{Log In}", src) + dat += "{Log In}" user << browse(text("
" - 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 += "" 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..b586fd4194a 100644 --- a/code/game/machinery/computer/specops_shuttle.dm +++ b/code/game/machinery/computer/specops_shuttle.dm @@ -276,8 +276,8 @@ var/specops_shuttle_timeleft = 0 else dat += {"Special Operations Shuttle
\nLocation: [specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom ? "Departing for [station_name] in ([specops_shuttle_timeleft] seconds.)":specops_shuttle_at_station ? "Station":"Dock"]
- [specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom ? "\n*The Special Ops. shuttle is already leaving.*
\n
":specops_shuttle_at_station ? "\nShuttle standing by...
\n
":"\nDepart to [station_name]
\n
"] - \nClose"} + [specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom ? "\n*The Special Ops. shuttle is already leaving.*
\n
":specops_shuttle_at_station ? "\nShuttle standing by...
\n
":"\nDepart to [station_name]
\n
"] + \nClose"} user << browse(dat, "window=computer;size=575x450") onclose(user, "computer") @@ -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]
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
"] - \nClose"} + [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") onclose(user, "computer") @@ -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.dm b/code/game/machinery/doors/airlock.dm index 4cb724c1a01..23e25bb836a 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -254,14 +254,14 @@ /obj/machinery/door/airlock/plasma/BlockSuperconductivity() //we don't stop the heat~ return 0 -/obj/machinery/door/airlock/clown +/obj/machinery/door/airlock/bananium name = "Bananium Airlock" icon = 'icons/obj/doors/Doorbananium.dmi' mineral = "bananium" doorOpen = 'sound/items/bikehorn.ogg' doorClose = 'sound/items/bikehorn.ogg' -/obj/machinery/door/airlock/mime +/obj/machinery/door/airlock/tranquillite name = "Tranquillite Airlock" icon = 'icons/obj/doors/Doorfreezer.dmi' mineral = "tranquillite" diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm index aca002f58c4..30e5cac609f 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,13 +45,13 @@ 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("\n", src) + t1 += "\n" var/datum/browser/popup = new(user, "airlock_electronics", name, 400, 400) popup.set_content(t1) diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index 3d8e7d3e15b..0be61cde4b6 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,21 +209,21 @@ // 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" + dat += "
Close" var/datum/browser/popup = new(user, "door_timer", name, 400, 500) popup.set_content(dat) diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index 3dffa7dda24..fcf9d56b355 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -173,43 +173,6 @@ FIRE ALARM ui_interact(user) -/* - user.set_machine(src) - var/area/A = src.loc - var/d1 - var/d2 - if(ishuman(user) || issilicon(user) || isobserver(user)) - A = A.loc - - if(A.fire) - d1 = text("Reset - Lockdown", src) - else - d1 = text("Alarm - Lockdown", src) - if(src.timing) - d2 = text("Stop Time Lock", src) - else - 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" - user << browse(dat, "window=firealarm") - onclose(user, "firealarm") - else - A = A.loc - if(A.fire) - d1 = text("[]", src, stars("Reset - Lockdown")) - else - d1 = text("[]", src, stars("Alarm - Lockdown")) - if(src.timing) - d2 = text("[]", src, stars("Stop Time Lock")) - else - 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" - user << browse(dat, "window=firealarm") - onclose(user, "firealarm")*/ - /obj/machinery/firealarm/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, var/master_ui = null, var/datum/topic_state/state = default_state) var/data[0] @@ -350,30 +313,30 @@ Just a object used in constructing fire alarms if(istype(user, /mob/living/carbon/human) || istype(user, /mob/living/silicon/ai)) if(A.party) - d1 = text("No Party :(", src) + d1 = "No Party :(" else - d1 = text("PARTY!!!", src) + d1 = "PARTY!!!" if(timing) - d2 = text("Stop Time Lock", src) + d2 = "Stop Time Lock" else - d2 = text("Initiate Time Lock", src) + d2 = "Initiate Time Lock" var/second = time % 60 var/minute = (time - second) / 60 - var/dat = text("Party Button []\n
\nTimer System: []
\nTime Left: [][] - - + +\n", d1, d2, (minute ? text("[]:", minute) : null), second, src, src, src, src) + var/dat = text("Party Button []\n
\nTimer System: []
\nTime Left: [][] - - + +\n", d1, d2, (minute ? text("[]:", minute) : null), second) user << browse(dat, "window=partyalarm") onclose(user, "partyalarm") else if(A.fire) - d1 = text("[]", src, stars("No Party :(")) + d1 = text("[]", stars("No Party :(")) else - d1 = text("[]", src, stars("PARTY!!!")) + d1 = text("[]", stars("PARTY!!!")) if(timing) - d2 = text("[]", src, stars("Stop Time Lock")) + d2 = text("[]", stars("Stop Time Lock")) else - d2 = text("[]", src, stars("Initiate Time Lock")) + d2 = text("[]", stars("Initiate Time Lock")) var/second = time % 60 var/minute = (time - second) / 60 - var/dat = text("[] []\n
\nTimer System: []
\nTime Left: [][] - - + +\n", stars("Party Button"), d1, d2, (minute ? text("[]:", minute) : null), second, src, src, src, src) + var/dat = text("[] []\n
\nTimer System: []
\nTime Left: [][] - - + +\n", stars("Party Button"), d1, d2, (minute ? text("[]:", minute) : null), second) user << browse(dat, "window=partyalarm") onclose(user, "partyalarm") return diff --git a/code/game/machinery/gameboard.dm b/code/game/machinery/gameboard.dm index a19f34af99b..0c5b8eeef56 100644 --- a/code/game/machinery/gameboard.dm +++ b/code/game/machinery/gameboard.dm @@ -50,7 +50,7 @@ return var/dat - dat = replacetext(file2text('html/chess.html'), "\[hsrc]", "\ref[src]") + dat = replacetext(file2text('html/chess.html'), "\[hsrc]", UID()) var/datum/asset/simple/chess/assets = get_asset_datum(/datum/asset/simple/chess) assets.send(user) 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/hologram.dm b/code/game/machinery/hologram.dm index 53e85ba72c4..8120bae4216 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -76,7 +76,7 @@ var/const/HOLOPAD_MODE = 0 var/area/area = get_area(src) for(var/mob/living/silicon/ai/AI in living_mob_list) if(!AI.client) continue - to_chat(AI, "Your presence is requested at \the [area].") + to_chat(AI, "Your presence is requested at \the [area].") else to_chat(user, "A request for AI presence was already sent recently.") 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 {"
-
-
- Light Circuit Connection: [light_connect ? "On" : "Off"] -
- Logic Connection: [logic_connect ? "On" : "Off"] +
- Light Circuit Connection: [light_connect ? "On" : "Off"] +
- Logic Connection: [logic_connect ? "On" : "Off"]
- Logic ID Tag: [format_tag("Logic ID Tag", "logic_id_tag")]
" 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)
- [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..f7e78ffad2e 100644
--- a/code/game/machinery/newscaster.dm
+++ b/code/game/machinery/newscaster.dm
@@ -200,26 +200,26 @@ 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 -
Exit"} + dat+= "
Unsilence unit" + dat+= {"
Re-scan User +
Exit"} if(src.securityCaster) var/wanted_already = 0 if(news_network.wanted_issue) 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+="
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+=" - \ref[T] [T.name] ([T.id]) " + dat += "
- \ref[T] [T.name] ([T.id]) " 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 += " - \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 += "
- [format_frequency(x)] GHz\[X\] " + dat += "
- [format_frequency(x)] GHz\[X\] " dat += "
- NONE " // AUTOFIXED BY fix_string_idiocy.py - // C:\Users\Rob\Documents\Projects\vgstation13\code\game\machinery\telecomms\machine_interactions.dm:155: dat += "
- \ref[T] [T.name] ([T.id]) " + dat += "
- \ref[T] [T.name] ([T.id]) " dat += "
- \ref[T.id] [T.name] ([T.id]) " + dat += "
- \ref[T.id] [T.name] ([T.id]) " dat += "
- \ref[T] [T.name] ([T.id]) " - dat += "
- Modify All Detected Servers " + dat += "
- \ref[T] [T.name] ([T.id]) " + dat += "
- Modify All Detected Servers " dat += "
-Location: [location ? location : "None"]
+Location: [location ? location : "None"]
Transponder Codes:
- "}
for(var/key in codes)
t += "
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("
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("
" + 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("
" dat+= "The panel is ridden with controls, button and meters, labeled in strange signs and symbols that
you cannot understand. Probably the manufactoring world's language.
Among other things, a few controls catch your eye.
" - dat+= text("A small dial with a \"�\" symbol embroidded on it. It's pointing towards a gauge that reads [].
Turn towards []
",(src.issuperUV ? "15nm" : "185nm"),src,(src.issuperUV ? "185nm" : "15nm") ) - dat+= text("A thick old-style button, with 2 grimy LED lights next to it. The [] LED is on.
Press button",(src.safetieson? "GREEN" : "RED"),src) - dat+= text("
Close panel", user) + dat+= text("A small dial with a \"�\" symbol embroidded on it. It's pointing towards a gauge that reads [].
Turn towards []
",(src.issuperUV ? "15nm" : "185nm"),(src.issuperUV ? "185nm" : "15nm") ) + dat+= text("A thick old-style button, with 2 grimy LED lights next to it. The [] LED is on.
Press button",(src.safetieson? "GREEN" : "RED")) + dat+= "
Close panel" //user << browse(dat, "window=ssu_m_panel;size=400x500") //onclose(user, "ssu_m_panel") else if(src.isUV) //The thing is running its cauterisation cycle. You have to wait. @@ -153,30 +153,30 @@ dat+= "Welcome to the Unit control panel.
" dat+= text("Helmet storage compartment: []
",(src.HELMET ? HELMET.name : "No helmet detected.") ) if(HELMET && src.isopen) - dat+=text("Dispense helmet
",src) + dat+="Dispense helmet
" dat+= text("Suit storage compartment: []
",(src.SUIT ? SUIT.name : "No exosuit detected.") ) if(SUIT && src.isopen) - dat+=text("Dispense suit
",src) + dat+="Dispense suit
" dat+= text("Breathmask storage compartment: []
",(src.MASK ? MASK.name : "No breathmask detected.") ) if(MASK && src.isopen) - dat+=text("Dispense mask
",src) + dat+="Dispense mask
" if(src.OCCUPANT) dat+= "
WARNING: Biological entity detected inside the Unit's storage. Please remove.
" - dat+= "Eject extra load" - dat+= text("
Unit is: [] - [] Unit ",(src.isopen ? "Open" : "Closed"),src,(src.isopen ? "Close" : "Open")) + dat+= "Eject extra load" + dat+= text("
Unit is: [] - [] Unit ",(src.isopen ? "Open" : "Closed"),(src.isopen ? "Close" : "Open")) if(src.isopen) dat+="
" else - dat+= text(" - *[] Unit*
",src,(src.islocked ? "Unlock" : "Lock") ) + dat+= text(" - *[] Unit*
",(src.islocked ? "Unlock" : "Lock") ) dat+= text("Unit status: []",(src.islocked? "**LOCKED**
" : "**UNLOCKED**
") ) - dat+= text("Start Disinfection cycle
",src) - dat += text("
Close control panel", user) + dat+= "Start Disinfection cycle
" + dat += "
Close control panel" //user << browse(dat, "window=Suit Storage Unit;size=400x500") //onclose(user, "Suit Storage Unit") else //Ohhhh shit it's dirty or broken! Let's inform the guy. dat+= "
" - dat+= text("
Close control panel", user) + dat+= "
Close control panel" //user << browse(dat, "window=suit_storage_unit;size=400x500") //onclose(user, "suit_storage_unit") @@ -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/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm index 34be5ed1c67..44a3181b8b9 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -373,6 +373,8 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept blackbox.msg_deathsquad += blackbox_msg if(SYND_FREQ) blackbox.msg_syndicate += blackbox_msg + if(SYNDTEAM_FREQ) + blackbox.msg_syndteam += blackbox_msg if(SUP_FREQ) blackbox.msg_cargo += blackbox_msg if(SRV_FREQ) @@ -558,6 +560,8 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept blackbox.msg_deathsquad += blackbox_msg if(SYND_FREQ) blackbox.msg_syndicate += blackbox_msg + if(SYNDTEAM_FREQ) + blackbox.msg_syndteam += blackbox_msg if(SUP_FREQ) blackbox.msg_cargo += blackbox_msg if(SRV_FREQ) 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:
- "
for(var/obj/machinery/telecomms/T in 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 += "
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 += "
" 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 += "- "
for(var/x in freq_listening)
- dat += "
\[Add Filter\]" - dat += {" + // C:\Users\Rob\Documents\Projects\vgstation13\code\game\machinery\telecomms\machine_interactions.dm:155: dat += "
\[Add Filter\]" + dat += {"
"} // 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:
- "
for(var/obj/machinery/telecomms/T in machinelist)
- dat += "
\[Flush Buffer\]" + dat += "
\[Flush Buffer\]" else - dat += "\[Probe Network\]" + dat += "\[Probe Network\]" // --- Viewing Machine --- if(1) dat += "
[temp]
" - 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 += "
[temp]" - dat += "
Current Network: [network]
" + dat += "
Current Network: [network]
" if(servers.len) dat += "
Detected Telecommunication Servers:
- "
for(var/obj/machinery/telecomms/T in 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 += "
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]
"
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 += "" + output += "Unload : [O]
" else output += "Nothing" output += "
According to the [src.name], you are now in outer space. Hold your breath.
\ - " + " 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) - . += "" + . += "" else - . += "" - . += "" + . += "" + . += "" 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 += "
Select a camera:
\[Cancel camera view\]| [entry] | [functions] | |
| [entry] | [functions] |
- | - Configure Directives + Configure Directives |
| - Imprint Master DNA + Imprint Master DNA |
| 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 |
| - Refresh available personalities + Refresh available personalities |
@@ -218,7 +218,7 @@
No personality is installed.
| Request personality + | Request personality |
- 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/devices/violin.dm b/code/game/objects/items/devices/violin.dm index c0cc320fdc3..7a3d304309d 100644 --- a/code/game/objects/items/devices/violin.dm +++ b/code/game/objects/items/devices/violin.dm @@ -6,6 +6,7 @@ icon = 'icons/obj/musician.dmi' icon_state = "violin" item_state = "violin" + attack_verb = list("strung", "fiddled", "tuned", "pitched") force = 10 burn_state = FLAMMABLE burntime = 20 @@ -38,4 +39,4 @@ song.ui_interact(user, ui_key, ui, force_open) /obj/item/device/violin/Topic(href, href_list) - song.Topic(href, href_list) \ No newline at end of file + song.Topic(href, href_list) diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index a79350c4cd0..f8ca693bf9c 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -286,13 +286,13 @@ return /obj/item/robot_parts/robot_suit/proc/Interact(mob/user) - var/t1 = text("Designation: [(created_name ? "[created_name]" : "Default Cyborg")]
\n",src) - t1 += text("Master AI: [(forced_ai ? "[forced_ai.name]" : "Automatic")]
\n",src) + var/t1 = "Designation: [(created_name ? "[created_name]" : "Default Cyborg")]
\n" + t1 += "Master AI: [(forced_ai ? "[forced_ai.name]" : "Automatic")]
\n" - t1 += text("LawSync Port: [(lawsync ? "Open" : "Closed")]
\n",src) - t1 += text("AI Connection Port: [(aisync ? "Open" : "Closed")]
\n",src) - t1 += text("Servo Motor Functions: [(locomotion ? "Unlocked" : "Locked")]
\n",src) - t1 += text("Panel Lock: [(panel_locked ? "Engaged" : "Disengaged")]
\n",src) + t1 += "LawSync Port: [(lawsync ? "Open" : "Closed")]
\n" + t1 += "AI Connection Port: [(aisync ? "Open" : "Closed")]
\n" + t1 += "Servo Motor Functions: [(locomotion ? "Unlocked" : "Locked")]
\n" + t1 += "Panel Lock: [(panel_locked ? "Engaged" : "Disengaged")]
\n" var/datum/browser/popup = new(user, "robotdebug", "Cyborg Boot Debug", 310, 220) popup.set_content(t1) popup.open() diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 307c4d53f29..3afb9b21eab 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -65,7 +65,7 @@ var/global/list/datum/stack_recipe/bananium_recipes = list ( \ new/datum/stack_recipe("bananium grenade casing", /obj/item/weapon/grenade/bananade/casing, 4, on_floor = 1), \ ) -var/global/list/datum/stack_recipe/mime_recipes = list ( \ +var/global/list/datum/stack_recipe/tranquillite_recipes = list ( \ new/datum/stack_recipe("silent tile", /obj/item/stack/tile/silent, 1, 4, 20), \ new/datum/stack_recipe("invisible wall", /obj/structure/barricade/mime, 5, one_per_turf = 1, on_floor = 1, time = 50), \ ) @@ -184,7 +184,7 @@ var/global/list/datum/stack_recipe/mime_recipes = list ( \ name = "bananium" icon_state = "sheet-clown" origin_tech = "materials=4" - sheettype = "clown" + sheettype = "bananium" materials = list(MAT_BANANIUM=MINERAL_MATERIAL_AMOUNT) /obj/item/stack/sheet/mineral/bananium/New(var/loc, var/amount=null) @@ -196,12 +196,12 @@ var/global/list/datum/stack_recipe/mime_recipes = list ( \ singular_name = "beret" icon_state = "sheet-mime" origin_tech = "materials=4" - sheettype = "mime" + sheettype = "tranquillite" materials = list(MAT_TRANQUILLITE=MINERAL_MATERIAL_AMOUNT) /obj/item/stack/sheet/mineral/tranquillite/New(var/loc, var/amount=null) ..() - recipes = mime_recipes + recipes = tranquillite_recipes /obj/item/stack/sheet/mineral/enruranium name = "enriched uranium" 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/dnascrambler.dm b/code/game/objects/items/weapons/dnascrambler.dm index fe102f0cbe5..24c977ddb2d 100644 --- a/code/game/objects/items/weapons/dnascrambler.dm +++ b/code/game/objects/items/weapons/dnascrambler.dm @@ -3,14 +3,14 @@ desc = "An illegal genetic serum designed to randomize the user's identity." icon = 'icons/obj/hypo.dmi' item_state = "syringe_0" - icon_state = "lepopen1" + icon_state = "lepopen" var/used = null update_icon() if(used) icon_state = "lepopen0" else - icon_state = "lepopen1" + icon_state = "lepopen" attack(mob/M as mob, mob/user as mob) if(!M || !user) 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/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index f130f61b7a8..c49b2341f29 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -273,7 +273,7 @@ var/mob/last = get_mob_by_ckey(nadeassembly.fingerprintslast) var/turf/T = get_turf(src) var/area/A = get_area(T) - message_admins("grenade primed by an assembly, attached by [key_name_admin(M)](?) ([admin_jump_link(M, "holder")]) and last touched by [key_name_admin(last)](?) ([admin_jump_link(last, "holder")]) ([nadeassembly.a_left.name] and [nadeassembly.a_right.name]) at [A.name] (JMP).") + message_admins("grenade primed by an assembly, attached by [key_name_admin(M)](?) ([admin_jump_link(M)]) and last touched by [key_name_admin(last)](?) ([admin_jump_link(last)]) ([nadeassembly.a_left.name] and [nadeassembly.a_right.name]) at [A.name] (JMP).") log_game("grenade primed by an assembly, attached by [key_name(M)] and last touched by [key_name(last)] ([nadeassembly.a_left.name] and [nadeassembly.a_right.name]) at [A.name] ([T.x], [T.y], [T.z])") playsound(loc, 'sound/effects/bamf.ogg', 50, 1) 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/misc.dm b/code/game/objects/items/weapons/misc.dm index c230c033437..ffd021aae4b 100644 --- a/code/game/objects/items/weapons/misc.dm +++ b/code/game/objects/items/weapons/misc.dm @@ -32,7 +32,7 @@ throwforce = 7.0 w_class = 2 materials = list(MAT_METAL=50) - attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed") + attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed", "Vaudevilled") /obj/item/weapon/cane/is_crutch() return 1 @@ -53,7 +53,7 @@ name = "desk fan" icon = 'icons/obj/decorations.dmi' icon_state = "fan" - desc = "A smal desktop fan. Button seems to be stuck in the 'on' position." + desc = "A small desktop fan. The button seems to be stuck in the 'on' position." /* /obj/item/weapon/game_kit @@ -114,7 +114,7 @@ name = "newton cradle" icon = 'icons/obj/decorations.dmi' icon_state = "newton" - desc = "A device bored paper pushers use to remind themselves that the time did not stop yet. Contains gravity." + desc = "A device bored paper pushers use to remind themselves that time did not stop yet. Contains gravity." /obj/item/weapon/pai_cable desc = "A flexible coated cable with a universal jack on one end." @@ -142,4 +142,4 @@ /obj/item/weapon/phone/attack_self(mob/user) if(cooldown < world.time - 20) playsound(user.loc, 'sound/weapons/ring.ogg', 50, 1) - cooldown = world.time \ No newline at end of file + cooldown = world.time 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/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 96699998193..fc5318bff2f 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -142,7 +142,6 @@ "/obj/item/device/analyzer/plant_analyzer", "/obj/item/weapon/minihoe", "/obj/item/weapon/hatchet", - "/obj/item/weapon/reagent_containers/glass/fertilizer", "/obj/item/weapon/reagent_containers/glass/bottle", "/obj/item/weapon/plantspray", // "/obj/item/weapon/reagent_containers/syringe", diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm index dad7b46a161..460498a874b 100644 --- a/code/game/objects/items/weapons/storage/secure.dm +++ b/code/game/objects/items/weapons/storage/secure.dm @@ -104,7 +104,19 @@ message = text("[]", src.code) if(!src.locked) message = "*****" - dat += text("
\n>[]
\n1-2-3
\n4-5-6
\n7-8-9
\nR-0-E
\n", message, src, src, src, src, src, src, src, src, src, src, src, src) + dat += {"
\n>[message]
\n + 1- + 2- + 3
\n + 4- + 5- + 6
\n + 7- + 8- + 9
\n + R- + 0- + E
\n"} user << browse(dat, "window=caselock;size=300x280") Topic(href, href_list) diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index 12ba6cbce25..122643238ec 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -17,17 +17,15 @@ distribute_pressure = ONE_ATMOSPHERE*O2STANDARD - New() - ..() - src.air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) - return +/obj/item/weapon/tank/oxygen/New() + ..() + air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) - - examine(mob/user) - if(..(user, 0)) - if(air_contents.oxygen < 10) - to_chat(user, text("The meter on the [src.name] indicates you are almost out of air!")) - //playsound(usr, 'sound/effects/alert.ogg', 50, 1) +/obj/item/weapon/tank/oxygen/examine(mob/user) + if(..(user, 0)) + if(air_contents.oxygen < 10) + to_chat(user, text("The meter on the [src.name] indicates you are almost out of air!")) + //playsound(usr, 'sound/effects/alert.ogg', 50, 1) /obj/item/weapon/tank/oxygen/yellow @@ -51,13 +49,12 @@ /obj/item/weapon/tank/anesthetic/New() ..() - src.air_contents.oxygen = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD + air_contents.oxygen = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD var/datum/gas/sleeping_agent/trace_gas = new() trace_gas.moles = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD - src.air_contents.trace_gases += trace_gas - return + air_contents.trace_gases += trace_gas /* * Air @@ -68,18 +65,16 @@ icon_state = "oxygen" - examine(mob/user) - if(..(user, 0)) - if(air_contents.oxygen < 1 && loc==usr) - to_chat(user, "The meter on the [src.name] indicates you are almost out of air!") - user << sound('sound/effects/alert.ogg') +/obj/item/weapon/tank/air/examine(mob/user) + if(..(user, 0)) + if(air_contents.oxygen < 1 && loc==usr) + to_chat(user, "The meter on the [src.name] indicates you are almost out of air!") + user << sound('sound/effects/alert.ogg') /obj/item/weapon/tank/air/New() ..() - - src.air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD - src.air_contents.nitrogen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD - return + air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD + air_contents.nitrogen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD /* * Plasma @@ -93,9 +88,7 @@ /obj/item/weapon/tank/plasma/New() ..() - src.air_contents.toxins = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) - return - + air_contents.toxins = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) /obj/item/weapon/tank/plasma/attackby(obj/item/weapon/W as obj, mob/user as mob, params) ..() @@ -103,17 +96,15 @@ if(istype(W, /obj/item/weapon/flamethrower)) var/obj/item/weapon/flamethrower/F = W if((!F.status)||(F.ptank)) return - src.master = F + master = F F.ptank = src user.unEquip(src) - src.loc = F + loc = F F.update_icon() - return /obj/item/weapon/tank/plasma/full/New() ..() - src.air_contents.toxins = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) - return + air_contents.toxins = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) /obj/item/weapon/tank/plasma/plasmaman desc = "The lifeblood of plasmamen. Warning: Extremely flammable, do not inhale (unless you're a plasman)." @@ -141,17 +132,15 @@ volume = 3 //Tiny. Real life equivalents only have 21 breaths of oxygen in them. They're EMERGENCY tanks anyway -errorage (dangercon 2011) - New() - ..() - src.air_contents.oxygen = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) - return +/obj/item/weapon/tank/emergency_oxygen/New() + ..() + air_contents.oxygen = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) - - examine(mob/user) - if(..(user, 0)) - if(air_contents.oxygen < 0.2 && loc==usr) - to_chat(user, text("The meter on the [src.name] indicates you are almost out of air!")) - user << sound('sound/effects/alert.ogg') +/obj/item/weapon/tank/emergency_oxygen/examine(mob/user) + if(..(user, 0)) + if(air_contents.oxygen < 0.2 && loc==usr) + to_chat(user, text("The meter on the [src.name] indicates you are almost out of air!")) + user << sound('sound/effects/alert.ogg') /obj/item/weapon/tank/emergency_oxygen/engi name = "extended-capacity emergency oxygen tank" @@ -167,10 +156,9 @@ name = "pressurized double emergency oxygen tank" desc = "Used for \"emergencies,\" it actually contains a fair amount of oxygen." - New() - ..() - src.air_contents.oxygen = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) - return +/obj/item/weapon/tank/emergency_oxygen/double/full/New() + ..() + air_contents.oxygen = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) /* * Nitrogen @@ -184,9 +172,7 @@ /obj/item/weapon/tank/nitrogen/New() ..() - - src.air_contents.nitrogen = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) - return + air_contents.nitrogen = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) /obj/item/weapon/tank/nitrogen/examine(mob/user) if(..(user, 0)) @@ -194,7 +180,6 @@ to_chat(user, text("The meter on the [src.name] indicates you are almost out of air!")) //playsound(usr, 'sound/effects/alert.ogg', 50, 1) - /obj/item/weapon/tank/emergency_oxygen/vox name = "vox specialized nitrogen tank" desc = "A high-tech nitrogen tank designed specifically for Vox." @@ -202,9 +187,29 @@ item_state = "emergency_vox" volume = 25 +/obj/item/weapon/tank/emergency_oxygen/vox/New() + ..() + air_contents.oxygen -= (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) + air_contents.nitrogen = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) - New() - ..() - src.air_contents.oxygen -= (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) - src.air_contents.nitrogen = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) - return \ No newline at end of file +/obj/item/weapon/tank/emergency_oxygen/nitrogen + name = "emergency nitrogen tank" + desc = "An emergency tank designed specifically for Vox." + icon_state = "emergency_nitrogen" + volume = 3 + +/obj/item/weapon/tank/emergency_oxygen/nitrogen/New() + ..() + air_contents.oxygen -= (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) + air_contents.nitrogen = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) + +/obj/item/weapon/tank/emergency_oxygen/plasma + name = "emergency plasma tank" + desc = "An emergency tank designed specifically for Plasmamen." + icon_state = "emergency_p" + volume = 3 + +/obj/item/weapon/tank/emergency_oxygen/plasma/New() + ..() + air_contents.oxygen -= (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) + air_contents.toxins = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) 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 += "