diff --git a/code/controllers/subsystems/cult.dm b/code/controllers/subsystems/cult.dm
index f432b46c9a2..af50519ccd7 100644
--- a/code/controllers/subsystems/cult.dm
+++ b/code/controllers/subsystems/cult.dm
@@ -23,8 +23,10 @@
for(var/rune in subtypesof(/datum/rune))
var/datum/rune/R = new rune
runes_by_name[R.name] = rune
- tome_data += "[R.name]: [R.desc]"
- tome_data += "This rune [R.can_be_talisman() ? "can" : "cannot"] be turned into a talisman.
"
+ tome_data += "
"
+ tome_data += "[capitalize_first_letters(R.name)]: [R.desc]
"
+ tome_data += "This rune [R.can_be_talisman() ? "can" : "cannot"] be turned into a talisman.
"
+ tome_data += ""
/datum/controller/subsystem/cult/proc/add_rune(var/datum/rune/R)
if(check_rune_limit())
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index f9eabecfc21..f5e5c0f6a12 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -137,7 +137,9 @@
output += "Objective #[obj_count]: [objective.explanation_text]"
obj_count++
- recipient << browse(output,"window=memory")
+ var/datum/browser/memory_win = new(recipient, "memory")
+ memory_win.set_content(output)
+ memory_win.open()
/datum/mind/proc/edit_memory()
if(!ROUND_IS_STARTED)
diff --git a/code/game/gamemodes/cult/items/tome.dm b/code/game/gamemodes/cult/items/tome.dm
index bbe350a0f18..d89c2eb8346 100644
--- a/code/game/gamemodes/cult/items/tome.dm
+++ b/code/game/gamemodes/cult/items/tome.dm
@@ -56,18 +56,21 @@
to_chat(scribe, SPAN_WARNING("You are unable to write a rune here."))
return
- // This counts how many runes exist in the game, for some sort of arbitrary rune limit. I trust the old devs had their reasons. - Geeves
- if(SScult.check_rune_limit())
- to_chat(scribe, SPAN_WARNING("The cloth of reality can't take that much of a strain. Remove some runes first!"))
- return
- else
- switch(alert("What shall you do with the tome?", "Tome of Nar'sie", "Read it", "Scribe a rune", "Cancel"))
- if("Cancel")
+ switch(alert("What shall you do with the tome?", "Tome of Nar'sie", "Read it", "Scribe a rune", "Cancel"))
+ if("Cancel")
+ return
+ if("Read it")
+ if(use_check_and_message(user))
return
- if("Read it")
- if(use_check_and_message(user))
- return
- user << browse("[SScult.tome_data]", "window=Arcane Tome")
+ var/datum/browser/tome_win = new(user, "Arcane Tome", "Nar'Sie's Runes")
+ tome_win.set_content(SScult.tome_data)
+ tome_win.add_stylesheet("cult", 'html/browser/cult.css')
+ tome_win.open()
+ return
+ if("Scribe a rune")
+ // This counts how many runes exist in the game, for some sort of arbitrary rune limit. I trust the old devs had their reasons. - Geeves
+ if(SScult.check_rune_limit())
+ to_chat(scribe, SPAN_WARNING("The cloth of reality can't take that much of a strain. Remove some runes first!"))
return
//only check if they want to scribe a rune, so they can still read if standing on a rune
diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm
index 8d9948cd5ac..45062bb0a1a 100644
--- a/code/game/machinery/autolathe.dm
+++ b/code/game/machinery/autolathe.dm
@@ -51,8 +51,7 @@
print_loc = src
/obj/machinery/autolathe/Destroy()
- qdel(wires)
- wires = null
+ QDEL_NULL(wires)
return ..()
/obj/machinery/autolathe/proc/update_recipe_list()
@@ -69,7 +68,7 @@
if(shocked)
shock(user, 50)
- var/dat = "Autolathe Control Panel
"
+ var/dat = ""
if(!disabled)
dat += ""
@@ -77,14 +76,15 @@
var/material_bottom = ""
for(var/material in stored_material)
- material_top += "| [material] | "
+ material_top += "[capitalize_first_letters(material)] | "
material_bottom += "[stored_material[material]]/[storage_capacity[material]] | "
dat += "[material_top]
[material_bottom]
"
- dat += "Printable Designs
"
+ dat += "Printable Designs
"
var/index = 0
- for(var/datum/autolathe/recipe/R in machine_recipes)
+ for(var/recipe in machine_recipes)
+ var/datum/autolathe/recipe/R = recipe
index++
if(R.hidden && !hacked || (show_category != "All" && show_category != R.category))
continue
@@ -108,7 +108,7 @@
else
material_string += ", "
material_string += "[round(R.resources[material] * mat_efficiency)] [material]"
- material_string += ".
"
+ material_string += "
"
//Build list of multipliers for sheets.
if(R.is_stack)
if(max_sheets)
@@ -119,12 +119,13 @@
multiplier_string += "\[x[i]\]"
multiplier_string += "\[x[max_sheets]\]"
- dat += "| [R.hidden ? "*" : ""][can_make ? "" : ""][R.name][can_make ? "" : ""][R.hidden ? "*" : ""][multiplier_string] | [material_string] |
"
-
+ dat += "| [R.hidden ? "*" : ""][can_make ? "" : " "][R.name][can_make ? "" : " "][R.hidden ? "*" : ""][multiplier_string] | [material_string] |
"
dat += "
"
- user << browse(dat, "window=autolathe")
- onclose(user, "autolathe")
+ var/datum/browser/autolathe_win = new(user, "autolathe", "Autolathe Control Panel")
+ autolathe_win.set_content(dat)
+ autolathe_win.add_stylesheet("misc", 'html/browser/misc.css')
+ autolathe_win.open()
/obj/machinery/autolathe/attackby(obj/item/O, mob/user)
if(busy)
diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm
index e16a8c731d7..ea6b3133904 100644
--- a/code/game/machinery/biogenerator.dm
+++ b/code/game/machinery/biogenerator.dm
@@ -422,10 +422,10 @@
switch(menustat)
if("menu")
if (beaker)
- dat += "Commands |
"
- dat += "| Activate Biogenerator |
"
- dat += "Detach Container
|
"
- dat += "| Name | Cost | Production Amount |
"
+ dat += "Commands |
"
+ dat += "| Activate Biogenerator |
"
+ dat += "Detach Container
|
"
+ dat += "| Name | Cost | Production Amount |
"
var/lastclass = "Commands"
for (var/k in biorecipies)
@@ -439,19 +439,19 @@
if(emag == 0 || emagged == 1)
if(lastclass != class)
- dat += "[class] | |
"
+ dat += "[class] |
"
lastclass = class
- dat += "| [name] | [round(cost/build_eff)] | "
+ dat += "
| [name] | [round(cost/build_eff)] | "
+ dat += ""
for(var/num in listamount)
- dat += " | "
var/fakenum = ""
if(num <= 9)
fakenum = "0"
if(num*round(cost/build_eff) > points)
- dat += "([fakenum][num])"
+ dat += " ([fakenum][num]) "
else
dat += "([fakenum][num])"
- dat += " | "
+ dat += ""
dat += "
"
dat += "
"
@@ -459,19 +459,20 @@
else
dat += "
No beaker inside. Please insert a beaker.
"
if("nopoints")
- dat += "You do not have biomass to create products.
Please, put growns into reactor and activate it.
"
+ dat += "You do not have biomass to create products.
Please put growns into the reactor and activate it.
"
dat += "Return to menu"
if("complete")
dat += "Operation complete.
"
dat += "Return to menu"
if("void")
- dat += "Error: No growns inside.
Please, put growns into reactor.
"
+ dat += "Error: No growns inside.
Please put growns into the reactor.
"
dat += "Return to menu"
- dat += "