"
return dat
/obj/machinery/autolathe/proc/search_win(mob/user)
- var/dat = "
Search results:
"
+ var/dat = "
"
+ dat += ""
+ dat += " Return to main menu"
+ dat += " Search results:"
dat += " Metal amount: [src.m_amount] / [max_m_amount] cm 3"
dat += " Glass amount: [src.g_amount] / [max_g_amount] cm 3
"
@@ -340,19 +467,13 @@
dat += "[get_design_cost(D)] "
dat += " "
+ dat += " | "
+ dat += get_queue()
+ dat += "
"
return dat
-/obj/machinery/autolathe/proc/can_build(var/datum/design/D)
- var/coeff = (ispath(D.build_path,/obj/item/stack) ? 1 : 2 ** prod_coeff)
-
- if(D.materials["$metal"] && (m_amount < (D.materials["$metal"] / coeff)))
- return 0
- if(D.materials["$glass"] && (g_amount < (D.materials["$glass"] / coeff)))
- return 0
- return 1
-
/obj/machinery/autolathe/proc/get_design_cost(var/datum/design/D)
- var/coeff = (ispath(D.build_path,/obj/item/stack) ? 1 : 2 ** prod_coeff)
+ var/coeff = get_coeff(D)
var/dat
if(D.materials["$metal"])
dat += "[D.materials["$metal"] / coeff] metal "
@@ -378,7 +499,7 @@
if(hack)
for(var/datum/design/D in files.possible_designs)
- if((D.build_type & 4) && ("hacked" in D.category))
+ if((D.build_type & AUTOLATHE) && ("hacked" in D.category))
files.known_designs += D
else
for(var/datum/design/D in files.known_designs)
diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm
index 7b72b5bc3f4..e8c7656032a 100644
--- a/code/game/machinery/camera/camera_assembly.dm
+++ b/code/game/machinery/camera/camera_assembly.dm
@@ -5,8 +5,8 @@
icon_state = "cameracase"
w_class = 2
anchored = 0
- m_amt = 700
- g_amt = 300
+ m_amt = 400
+ g_amt = 250
// Motion, EMP-Proof, X-Ray
var/list/obj/item/possible_upgrades = list(/obj/item/device/assembly/prox_sensor, /obj/item/stack/sheet/mineral/osmium, /obj/item/weapon/stock_parts/scanning_module)
diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm
index dab630f188a..d323fe0d7cb 100644
--- a/code/game/objects/items/weapons/surgery_tools.dm
+++ b/code/game/objects/items/weapons/surgery_tools.dm
@@ -16,8 +16,8 @@
desc = "Retracts stuff."
icon = 'icons/obj/surgery.dmi'
icon_state = "retractor"
- m_amt = 10000
- g_amt = 5000
+ m_amt = 6000
+ g_amt = 3000
flags = FPRINT | TABLEPASS | CONDUCT
w_class = 2.0
origin_tech = "materials=1;biotech=1"
@@ -265,8 +265,8 @@ LOOK FOR SURGERY.DM*/
desc = "This stops bleeding."
icon = 'icons/obj/surgery.dmi'
icon_state = "cautery"
- m_amt = 5000
- g_amt = 2500
+ m_amt = 2500
+ g_amt = 750
flags = FPRINT | TABLEPASS | CONDUCT
w_class = 2.0
origin_tech = "materials=1;biotech=1"
@@ -356,8 +356,8 @@ LOOK FOR SURGERY.DM*/
icon = 'icons/obj/surgery.dmi'
icon_state = "drill"
hitsound = 'sound/weapons/circsawhit.ogg'
- m_amt = 15000
- g_amt = 10000
+ m_amt = 10000
+ g_amt = 6000
flags = FPRINT | TABLEPASS | CONDUCT
force = 15.0
w_class = 2.0
@@ -385,8 +385,8 @@ LOOK FOR SURGERY.DM*/
throwforce = 5.0
throw_speed = 3
throw_range = 5
- m_amt = 10000
- g_amt = 5000
+ m_amt = 4000
+ g_amt = 1000
origin_tech = "materials=1;biotech=1"
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
@@ -637,8 +637,8 @@ LOOK FOR SURGERY.DM*/
throwforce = 9.0
throw_speed = 3
throw_range = 5
- m_amt = 20000
- g_amt = 10000
+ m_amt = 10000
+ g_amt = 6000
origin_tech = "materials=1;biotech=1"
attack_verb = list("attacked", "slashed", "sawed", "cut")
sharp = 1
diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
index 747fc89183e..a1985a93050 100644
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -147,7 +147,7 @@
//Cost to make in the autolathe
m_amt = 70
- g_amt = 30
+ g_amt = 20
//R&D tech level
origin_tech = "engineering=1"
diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm
index 7f2d7c8f731..4d24559ef0c 100644
--- a/code/modules/assembly/signaler.dm
+++ b/code/modules/assembly/signaler.dm
@@ -3,8 +3,8 @@
desc = "Used to remotely activate devices."
icon_state = "signaller"
item_state = "signaler"
- m_amt = 1000
- g_amt = 200
+ m_amt = 400
+ g_amt = 120
origin_tech = "magnets=1"
wires = WIRE_RECEIVE | WIRE_PULSE | WIRE_RADIO_PULSE | WIRE_RADIO_RECEIVE
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 0d1b64dacd3..50c5c1ba848 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -226,7 +226,7 @@
name = "large beaker"
desc = "A large beaker. Can hold up to 100 units."
icon_state = "beakerlarge"
-
g_amt = 5000
+
g_amt = 2500
volume = 100
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,25,30,50,100)
diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm
index 5620f5dcd7a..cd3acea26fe 100644
--- a/code/modules/research/designs/autolathe_designs.dm
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -230,7 +230,7 @@
name = "Metal"
id = "metal"
build_type = AUTOLATHE
- materials = list("$metal" = MINERAL_MATERIAL_AMOUNT)
+ materials = list("$metal" = 3750)
build_path = /obj/item/stack/sheet/metal
category = list("initial","Construction")
@@ -254,7 +254,7 @@
name = "Reinforced Glass"
id = "rglass"
build_type = AUTOLATHE
- materials = list("$metal" = 1000, "$glass" = MINERAL_MATERIAL_AMOUNT)
+ materials = list("$metal" = 1875, "$glass" = MINERAL_MATERIAL_AMOUNT)
build_path = /obj/item/stack/sheet/rglass
category = list("initial","Construction")
@@ -262,7 +262,7 @@
name = "Metal Rod"
id = "rods"
build_type = AUTOLATHE
- materials = list("$metal" = 1000)
+ materials = list("$metal" = 1875)
build_path = /obj/item/stack/rods
category = list("initial","Construction")