"
var/coeff = linked_lathe.efficiency_coeff
@@ -891,7 +861,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
dat += "
Search results:
"
- dat += "
Material Amount: [linked_lathe.TotalMaterials()] / [linked_lathe.max_material_storage]
"
+ dat += "
Material Amount: [linked_lathe.materials.total_amount] / [linked_lathe.materials.max_amount]
"
dat += "
Chemical Volume: [linked_lathe.reagents.total_volume] / [linked_lathe.reagents.maximum_volume]
"
var/coeff = linked_lathe.efficiency_coeff
@@ -925,52 +895,60 @@ won't update every console in existence) but it's more of a hassle to do. Also,
dat += "
Protolathe Menu"
dat += "
Material Storage:
"
//Metal
- dat += "* [linked_lathe.m_amount] of Metal: "
- if(linked_lathe.m_amount >= 3750) dat += "
Eject "
- if(linked_lathe.m_amount >= 18750) dat += "
5x "
- if(linked_lathe.m_amount >= 3750) dat += "
All"
+ var/m_amount = linked_lathe.materials.amount(MAT_METAL)
+ dat += "* [m_amount] of Metal: "
+ if(m_amount >= MINERAL_MATERIAL_AMOUNT) dat += "
Eject "
+ if(m_amount >= MINERAL_MATERIAL_AMOUNT*5) dat += "
5x "
+ if(m_amount >= MINERAL_MATERIAL_AMOUNT) dat += "
All"
dat += "
"
//Glass
- dat += "* [linked_lathe.g_amount] of Glass: "
- if(linked_lathe.g_amount >= 3750) dat += "
Eject "
- if(linked_lathe.g_amount >= 18750) dat += "
5x "
- if(linked_lathe.g_amount >= 3750) dat += "
All"
+ var/g_amount = linked_lathe.materials.amount(MAT_GLASS)
+ dat += "* [g_amount] of Glass: "
+ if(g_amount >= MINERAL_MATERIAL_AMOUNT) dat += "
Eject "
+ if(g_amount >= MINERAL_MATERIAL_AMOUNT*5) dat += "
5x "
+ if(g_amount >= MINERAL_MATERIAL_AMOUNT) dat += "
All"
dat += "
"
//Gold
- dat += "* [linked_lathe.gold_amount] of Gold: "
- if(linked_lathe.gold_amount >= 2000) dat += "
Eject "
- if(linked_lathe.gold_amount >= 10000) dat += "
5x "
- if(linked_lathe.gold_amount >= 2000) dat += "
All"
+ var/gold_amount = linked_lathe.materials.amount(MAT_GOLD)
+ dat += "* [gold_amount] of Gold: "
+ if(gold_amount >= MINERAL_MATERIAL_AMOUNT) dat += "
Eject "
+ if(gold_amount >= MINERAL_MATERIAL_AMOUNT*5) dat += "
5x "
+ if(gold_amount >= MINERAL_MATERIAL_AMOUNT) dat += "
All"
dat += "
"
//Silver
- dat += "* [linked_lathe.silver_amount] of Silver: "
- if(linked_lathe.silver_amount >= 2000) dat += "
Eject "
- if(linked_lathe.silver_amount >= 10000) dat += "
5x "
- if(linked_lathe.silver_amount >= 2000) dat += "
All"
+ var/silver_amount = linked_lathe.materials.amount(MAT_SILVER)
+ dat += "* [silver_amount] of Silver: "
+ if(silver_amount >= MINERAL_MATERIAL_AMOUNT) dat += "
Eject "
+ if(silver_amount >= MINERAL_MATERIAL_AMOUNT*5) dat += "
5x "
+ if(silver_amount >= MINERAL_MATERIAL_AMOUNT) dat += "
All"
dat += "
"
//Plasma
- dat += "* [linked_lathe.plasma_amount] of Solid Plasma: "
- if(linked_lathe.plasma_amount >= 2000) dat += "
Eject "
- if(linked_lathe.plasma_amount >= 10000) dat += "
5x "
- if(linked_lathe.plasma_amount >= 2000) dat += "
All"
+ var/plasma_amount = linked_lathe.materials.amount(MAT_PLASMA)
+ dat += "* [plasma_amount] of Solid Plasma: "
+ if(plasma_amount >= MINERAL_MATERIAL_AMOUNT) dat += "
Eject "
+ if(plasma_amount >= MINERAL_MATERIAL_AMOUNT*5) dat += "
5x "
+ if(plasma_amount >= MINERAL_MATERIAL_AMOUNT) dat += "
All"
dat += "
"
//Uranium
- dat += "* [linked_lathe.uranium_amount] of Uranium: "
- if(linked_lathe.uranium_amount >= 2000) dat += "
Eject "
- if(linked_lathe.uranium_amount >= 10000) dat += "
5x "
- if(linked_lathe.uranium_amount >= 2000) dat += "
All"
+ var/uranium_amount = linked_lathe.materials.amount(MAT_URANIUM)
+ dat += "* [uranium_amount] of Uranium: "
+ if(uranium_amount >= MINERAL_MATERIAL_AMOUNT) dat += "
Eject "
+ if(uranium_amount >= MINERAL_MATERIAL_AMOUNT*5) dat += "
5x "
+ if(uranium_amount >= MINERAL_MATERIAL_AMOUNT) dat += "
All"
dat += "
"
//Diamond
- dat += "* [linked_lathe.diamond_amount] of Diamond: "
- if(linked_lathe.diamond_amount >= 2000) dat += "
Eject "
- if(linked_lathe.diamond_amount >= 10000) dat += "
5x "
- if(linked_lathe.diamond_amount >= 2000) dat += "
All"
+ var/diamond_amount = linked_lathe.materials.amount(MAT_DIAMOND)
+ dat += "* [diamond_amount] of Diamond: "
+ if(diamond_amount >= MINERAL_MATERIAL_AMOUNT) dat += "
Eject "
+ if(diamond_amount >= MINERAL_MATERIAL_AMOUNT*5) dat += "
5x "
+ if(diamond_amount >= MINERAL_MATERIAL_AMOUNT) dat += "
All"
dat += "
"
//Bananium
- dat += "* [linked_lathe.clown_amount] of Bananium: "
- if(linked_lathe.clown_amount >= 2000) dat += "
Eject "
- if(linked_lathe.clown_amount >= 10000) dat += "
5x "
- if(linked_lathe.clown_amount >= 2000) dat += "
All"
+ var/bananium_amount = linked_lathe.materials.amount(MAT_BANANIUM)
+ dat += "* [bananium_amount] of Bananium: "
+ if(bananium_amount >= MINERAL_MATERIAL_AMOUNT) dat += "
Eject "
+ if(bananium_amount >= MINERAL_MATERIAL_AMOUNT*5) dat += "
5x "
+ if(bananium_amount >= MINERAL_MATERIAL_AMOUNT) dat += "
All"
dat += "
"
if(3.3)
@@ -1072,21 +1050,21 @@ won't update every console in existence) but it's more of a hassle to do. Also,
dat += "
Material Storage:
"
//Glass
dat += "* [linked_imprinter.g_amount] glass: "
- if(linked_imprinter.g_amount >= 3750) dat += "
Eject "
- if(linked_imprinter.g_amount >= 18750) dat += "
5x "
- if(linked_imprinter.g_amount >= 3750) dat += "
All"
+ if(linked_imprinter.g_amount >= MINERAL_MATERIAL_AMOUNT) dat += "
Eject "
+ if(linked_imprinter.g_amount >= MINERAL_MATERIAL_AMOUNT*5) dat += "
5x "
+ if(linked_imprinter.g_amount >= MINERAL_MATERIAL_AMOUNT) dat += "
All"
dat += "
"
//Gold
dat += "* [linked_imprinter.gold_amount] gold: "
- if(linked_imprinter.gold_amount >= 2000) dat += "
Eject "
- if(linked_imprinter.gold_amount >= 10000) dat += "
5x "
- if(linked_imprinter.gold_amount >= 2000) dat += "
All"
+ if(linked_imprinter.gold_amount >= MINERAL_MATERIAL_AMOUNT) dat += "
Eject "
+ if(linked_imprinter.gold_amount >= MINERAL_MATERIAL_AMOUNT*5) dat += "
5x "
+ if(linked_imprinter.gold_amount >= MINERAL_MATERIAL_AMOUNT) dat += "
All"
dat += "
"
//Diamond
dat += "* [linked_imprinter.diamond_amount] diamond: "
- if(linked_imprinter.diamond_amount >= 2000) dat += "
Eject "
- if(linked_imprinter.diamond_amount >= 10000) dat += "
5x "
- if(linked_imprinter.diamond_amount >= 2000) dat += "
All"
+ if(linked_imprinter.diamond_amount >= MINERAL_MATERIAL_AMOUNT) dat += "
Eject "
+ if(linked_imprinter.diamond_amount >= MINERAL_MATERIAL_AMOUNT*5) dat += "
5x "
+ if(linked_imprinter.diamond_amount >= MINERAL_MATERIAL_AMOUNT) dat += "
All"
dat += "
"
var/datum/browser/popup = new(user, "rndconsole", name, 700, 550)
diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi
index a5931466e9a..d94b0af256f 100644
Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ
diff --git a/icons/mob/hands.dmi b/icons/mob/hands.dmi
index 7f27823e9a6..ca38284b11c 100644
Binary files a/icons/mob/hands.dmi and b/icons/mob/hands.dmi differ
diff --git a/icons/mob/species/vox/gloves.dmi b/icons/mob/species/vox/gloves.dmi
index c3d1b6a5603..c12466ee543 100644
Binary files a/icons/mob/species/vox/gloves.dmi and b/icons/mob/species/vox/gloves.dmi differ
diff --git a/icons/mob/species/vox/shoes.dmi b/icons/mob/species/vox/shoes.dmi
index 8aaf18114b2..76984ed3ffc 100644
Binary files a/icons/mob/species/vox/shoes.dmi and b/icons/mob/species/vox/shoes.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index bdc4de8da2b..7aa0bd96a1b 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index 7d3c63af612..b74fd8ffb13 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi
index 8a7c4b5d8bb..5f1b810bff1 100644
Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 42b7407d87f..8db68ca02cf 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index bcaca6e730c..3469a6e7e92 100644
Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ
diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi
index b4c71af21d6..1d696cf70e7 100644
Binary files a/icons/obj/gun.dmi and b/icons/obj/gun.dmi differ
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index 819ce7883e4..09ae246998e 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ
diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi
index 15427f2a183..430f54c44d9 100755
Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ
diff --git a/nano/templates/accounts_terminal.tmpl b/nano/templates/accounts_terminal.tmpl
index 7397eda8ad5..5722383aa84 100644
--- a/nano/templates/accounts_terminal.tmpl
+++ b/nano/templates/accounts_terminal.tmpl
@@ -23,9 +23,35 @@
{{:helper.link('New Account', 'gear', {'choice' : 'create_account'}, data.creating_new_account ? 'disabled' : null, 'fixedLeft')}}
{{:helper.link('Print', 'print', {'choice' : 'print'}, data.creating_new_account ? 'disabled' : null, 'fixedLeft')}}
+ {{if data.creating_new_account}}
+