diff --git a/code/modules/mining/ores_materials_coins.dm b/code/modules/mining/ores_materials_coins.dm
index a2ac8920f4a..02eca2ef5ca 100644
--- a/code/modules/mining/ores_materials_coins.dm
+++ b/code/modules/mining/ores_materials_coins.dm
@@ -176,7 +176,6 @@
throw_speed = 3
throw_range = 3
origin_tech = "materials=4"
- perunit = 2000
/obj/item/stack/sheet/gold/New(loc,amount)
..()
@@ -198,7 +197,6 @@
throw_speed = 3
throw_range = 3
origin_tech = "materials=3"
- perunit = 2000
/obj/item/stack/sheet/silver/New(loc,amount)
..()
@@ -213,7 +211,6 @@
w_class = 3.0
throw_range = 3
origin_tech = "materials=6"
- perunit = 3750
/obj/item/stack/sheet/diamond/New(loc,amount)
..()
@@ -229,7 +226,6 @@
throw_speed = 3
throw_range = 3
origin_tech = "materials=5"
- perunit = 2000
/obj/item/stack/sheet/enruranium
name = "Enriched Uranium block"
@@ -240,7 +236,6 @@
throw_speed = 3
throw_range = 3
origin_tech = "materials=5"
- perunit = 1000
/obj/item/stack/sheet/plasma
name = "solid plasma"
@@ -251,7 +246,6 @@
throw_speed = 3
throw_range = 3
origin_tech = "plasmatech=2;materials=2"
- perunit = 2000
/obj/item/stack/sheet/adamantine
name = "adamantine"
@@ -262,7 +256,6 @@
throw_speed = 3
throw_range = 3
origin_tech = "materials=4"
- perunit = 2000
/obj/item/stack/sheet/clown
name = "bananium"
@@ -273,7 +266,6 @@
throw_speed = 3
throw_range = 3
origin_tech = "materials=4"
- perunit = 2000
/obj/item/stack/sheet/clown/New(loc,amount)
..()
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index 20224ce0125..0e2f65afe44 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -82,6 +82,8 @@ won't update every console in existence) but it's more of a hassle to do. Also,
return_name = "Uranium"
if("diamond")
return_name = "Diamond"
+ if("adamantine")
+ return_name = "adamantine"
if("clown")
return_name = "Bananium"
else
@@ -367,6 +369,8 @@ won't update every console in existence) but it's more of a hassle to do. Also,
linked_lathe.uranium_amount = max(0, (linked_lathe.uranium_amount-being_built.materials[M]))
if("$diamond")
linked_lathe.diamond_amount = max(0, (linked_lathe.diamond_amount-being_built.materials[M]))
+ if("$adamantine")
+ linked_lathe.adamantine_amount = max(0, (linked_lathe.adamantine_amount-being_built.materials[M]))
if("$clown")
linked_lathe.clown_amount = max(0, (linked_lathe.clown_amount-being_built.materials[M]))
else
@@ -457,6 +461,9 @@ won't update every console in existence) but it's more of a hassle to do. Also,
if("diamond")
type = /obj/item/stack/sheet/diamond
res_amount = "diamond_amount"
+ if("adamantine")
+ type = /obj/item/stack/sheet/adamantine
+ res_amount = "adamantine_amount"
if("clown")
type = /obj/item/stack/sheet/clown
res_amount = "clown_amount"
@@ -468,7 +475,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
linked_lathe.vars[res_amount] = max(0, (linked_lathe.vars[res_amount]-sheet.amount * sheet.perunit))
else
del sheet
- else if(href_list["imprinter_ejectsheet"] && linked_imprinter) //Causes the protolathe to eject a sheet of material
+ else if(href_list["imprinter_ejectsheet"] && linked_imprinter) //Causes the circuit imprinter to eject a sheet of material
var/desired_num_sheets = text2num(href_list["imprinter_ejectsheet_amt"])
var/res_amount, type
switch(href_list["imprinter_ejectsheet"])
@@ -725,6 +732,8 @@ won't update every console in existence) but it's more of a hassle to do. Also,
if(D.materials[M] > linked_lathe.uranium_amount) check_materials = 0
if("$diamond")
if(D.materials[M] > linked_lathe.diamond_amount) check_materials = 0
+ if("$adamantine")
+ if(D.materials[M] > linked_lathe.adamantine_amount) check_materials = 0
if("$clown")
if(D.materials[M] > linked_lathe.clown_amount) check_materials = 0
else if (!linked_lathe.reagents.has_reagent(M, D.materials[M]))
@@ -741,23 +750,23 @@ won't update every console in existence) but it's more of a hassle to do. Also,
//Metal
dat += "* [linked_lathe.m_amount] cm3 of Metal || "
dat += "Eject: "
- if(linked_lathe.m_amount > 3750) dat += "(1 Sheet) "
- if(linked_lathe.m_amount > 18750) dat += "(5 Sheets) "
- if(linked_lathe.m_amount > 3750) dat += "(Max Sheets)"
+ if(linked_lathe.m_amount >= 3750) dat += "(1 Sheet) "
+ if(linked_lathe.m_amount >= 18750) dat += "(5 Sheets) "
+ if(linked_lathe.m_amount >= 3750) dat += "(Max Sheets)"
dat += "
"
//Glass
dat += "* [linked_lathe.g_amount] cm3 of Glass || "
dat += "Eject: "
- if(linked_lathe.g_amount > 3750) dat += "(1 Sheet) "
- if(linked_lathe.g_amount > 18750) dat += "(5 Sheets) "
- if(linked_lathe.g_amount > 3750) dat += "(Max Sheets)"
+ if(linked_lathe.g_amount >= 3750) dat += "(1 Sheet) "
+ if(linked_lathe.g_amount >= 18750) dat += "(5 Sheets) "
+ if(linked_lathe.g_amount >= 3750) dat += "(Max Sheets)"
dat += "
"
//Gold
dat += "* [linked_lathe.gold_amount] cm3 of Gold || "
dat += "Eject: "
- if(linked_lathe.gold_amount > 3750) dat += "(1 Sheet) "
- if(linked_lathe.gold_amount > 18750) dat += "(5 Sheets) "
- if(linked_lathe.gold_amount > 3750) dat += "(Max Sheets)"
+ if(linked_lathe.gold_amount >= 3750) dat += "(1 Sheet) "
+ if(linked_lathe.gold_amount >= 18750) dat += "(5 Sheets) "
+ if(linked_lathe.gold_amount >= 3750) dat += "(Max Sheets)"
dat += "
"
//Silver
dat += "* [linked_lathe.silver_amount] cm3 of Silver || "
@@ -787,6 +796,13 @@ won't update every console in existence) but it's more of a hassle to do. Also,
if(linked_lathe.diamond_amount >= 18750) dat += "(5 Sheets) "
if(linked_lathe.diamond_amount >= 3750) dat += "(Max Sheets)"
dat += "
"
+ //Adamantine - Is this even possible to get?
+ dat += "* [linked_lathe.adamantine_amount] cm3 of Adamantine || "
+ dat += "Eject: "
+ if(linked_lathe.adamantine_amount >= 3750) dat += "(1 Sheet) "
+ if(linked_lathe.adamantine_amount >= 18750) dat += "(5 Sheets) "
+ if(linked_lathe.adamantine_amount >= 3750) dat += "(Max Sheets)"
+ dat += "
"
//Bananium
dat += "* [linked_lathe.clown_amount] cm3 of Bananium || "
dat += "Eject: "
@@ -854,23 +870,23 @@ won't update every console in existence) but it's more of a hassle to do. Also,
//Glass
dat += "* [linked_imprinter.g_amount] cm3 of Glass || "
dat += "Eject: "
- if(linked_imprinter.g_amount > 3750) dat += "(1 Sheet) "
- if(linked_imprinter.g_amount > 18750) dat += "(5 Sheets) "
- if(linked_imprinter.g_amount > 3750) dat += "(Max Sheets)"
+ if(linked_imprinter.g_amount >= 3750) dat += "(1 Sheet) "
+ if(linked_imprinter.g_amount >= 18750) dat += "(5 Sheets) "
+ if(linked_imprinter.g_amount >= 3750) dat += "(Max Sheets)"
dat += "
"
//Gold
dat += "* [linked_imprinter.gold_amount] cm3 of Gold || "
dat += "Eject: "
- if(linked_imprinter.gold_amount > 3750) dat += "(1 Sheet) "
- if(linked_imprinter.gold_amount > 18750) dat += "(5 Sheets) "
- if(linked_imprinter.gold_amount > 3750) dat += "(Max Sheets)"
+ if(linked_imprinter.gold_amount >= 3750) dat += "(1 Sheet) "
+ if(linked_imprinter.gold_amount >= 18750) dat += "(5 Sheets) "
+ if(linked_imprinter.gold_amount >= 3750) dat += "(Max Sheets)"
dat += "
"
//Diamond
dat += "* [linked_imprinter.diamond_amount] cm3 of Diamond || "
dat += "Eject: "
- if(linked_imprinter.diamond_amount > 3750) dat += "(1 Sheet) "
- if(linked_imprinter.diamond_amount > 18750) dat += "(5 Sheets) "
- if(linked_imprinter.diamond_amount > 3750) dat += "(Max Sheets)"
+ if(linked_imprinter.diamond_amount >= 3750) dat += "(1 Sheet) "
+ if(linked_imprinter.diamond_amount >= 18750) dat += "(5 Sheets) "
+ if(linked_imprinter.diamond_amount >= 3750) dat += "(Max Sheets)"
user << browse("Research and Development Console
[dat]", "window=rdconsole;size=575x400")
onclose(user, "rdconsole")
\ No newline at end of file