diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index 04baae91356..1c4ff451c59 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -670,6 +670,7 @@
/obj/item/weapon/stock_parts/capacitor/adv
name = "advanced capacitor"
desc = "An advanced capacitor used in the construction of a variety of devices."
+ icon_state = "adv_capacitor"
origin_tech = "powerstorage=3"
rating = 2
m_amt = 50
@@ -678,7 +679,7 @@
/obj/item/weapon/stock_parts/scanning_module/adv
name = "advanced scanning module"
desc = "A compact, high resolution scanning module used in the construction of certain devices."
- icon_state = "scan_module"
+ icon_state = "adv_scan_module"
origin_tech = "magnets=3"
rating = 2
m_amt = 50
@@ -714,6 +715,7 @@
/obj/item/weapon/stock_parts/capacitor/super
name = "super capacitor"
desc = "A super-high capacity capacitor used in the construction of a variety of devices."
+ icon_state = "super_capacitor"
origin_tech = "powerstorage=5;materials=4"
rating = 3
m_amt = 50
@@ -722,6 +724,7 @@
/obj/item/weapon/stock_parts/scanning_module/phasic
name = "phasic scanning module"
desc = "A compact, high resolution phasic scanning module used in the construction of certain devices."
+ icon_state = "super_scan_module"
origin_tech = "magnets=5"
rating = 3
m_amt = 50
diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index ad008362907..d0102167973 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -847,9 +847,13 @@
product_slogans = "Carts to go!"
icon_state = "cart"
icon_deny = "cart-deny"
- products = list(/obj/item/weapon/cartridge/medical = 10,/obj/item/weapon/cartridge/engineering = 10,/obj/item/weapon/cartridge/security = 10,
- /obj/item/weapon/cartridge/janitor = 10,/obj/item/weapon/cartridge/signal/toxins = 10,/obj/item/device/pda/heads = 10,
- /obj/item/weapon/cartridge/captain = 3,/obj/item/weapon/cartridge/quartermaster = 10)
+ products = list(/obj/item/device/pda =10,/obj/item/weapon/cartridge/medical = 10,/obj/item/weapon/cartridge/chemistry = 10,
+ /obj/item/weapon/cartridge/engineering = 10,/obj/item/weapon/cartridge/atmos = 10,/obj/item/weapon/cartridge/janitor = 10,
+ /obj/item/weapon/cartridge/signal/toxins = 10,/obj/item/weapon/cartridge/signal = 10,/obj/item/weapon/cartridge = 10)
+ contraband = list(/obj/item/weapon/cartridge/clown = 1,/obj/item/weapon/cartridge/mime = 1)
+ prices = list(/obj/item/device/pda =300,/obj/item/weapon/cartridge/medical = 200,/obj/item/weapon/cartridge/chemistry = 150,/obj/item/weapon/cartridge/engineering = 100,
+ /obj/item/weapon/cartridge/atmos = 75,/obj/item/weapon/cartridge/janitor = 100,/obj/item/weapon/cartridge/signal/toxins = 150,
+ /obj/item/weapon/cartridge/signal = 75,/obj/item/weapon/cartridge = 50)
/obj/machinery/vending/cigarette
name = "Cigarette machine" //OCD had to be uppercase to look nice with the new formating
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index fa2dbfb1cc0..773525b4da7 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -318,16 +318,6 @@
max_combined_w_class = 21 // = 14 * 1.5, not 14 * 2. This is deliberate
origin_tech = "bluespace=4"
can_hold = list()
- New()
- if(prob(5))
- //Sometimes people choose justice.
- //Sometimes justice chooses you.
- visible_message("That doesn't look like a normal Toolbelt of Holding...")
- new /obj/item/weapon/storage/belt/bluespace/owlman(loc)
- spawn(1)
- del src
- return
- ..()
proc/failcheck(mob/user as mob)
if (prob(src.reliability)) return 1 //No failure
diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm
index a0e267392f1..00b2af7cf5c 100644
--- a/code/modules/research/circuitprinter.dm
+++ b/code/modules/research/circuitprinter.dm
@@ -15,20 +15,20 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
var/diamond_amount = 0
var/max_material_amount = 75000.0
var/efficiency_coeff
-
+
var/list/categories = list(
"AI Modules",
"Computer Boards",
"Engineering Machinery",
"Exosuit Modules",
- "Hydroponics Machinery",
+ "Hydroponics Machinery",
"Medical Machinery",
"Misc. Machinery",
"Research Machinery",
"Subspace Telecomms",
"Teleportation Machinery"
)
-
+
reagents = new()
/obj/machinery/r_n_d/circuit_imprinter/New()
@@ -62,13 +62,13 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
/obj/machinery/r_n_d/circuit_imprinter/proc/check_mat(datum/design/being_built, var/M)
switch(M)
if("$glass")
- return (g_amount - (being_built.materials[M]/efficiency_coeff) >= 0) ? 1 : 0
+ return (g_amount - (being_built.materials[M]/efficiency_coeff) >= 0)
if("$gold")
- return (gold_amount - (being_built.materials[M]/efficiency_coeff) >= 0) ? 1 : 0
+ return (gold_amount - (being_built.materials[M]/efficiency_coeff) >= 0)
if("$diamond")
- return (diamond_amount - (being_built.materials[M]/efficiency_coeff) >= 0) ? 1 : 0
+ return (diamond_amount - (being_built.materials[M]/efficiency_coeff) >= 0)
else
- return (reagents.has_reagent(M, (being_built.materials[M]/efficiency_coeff)) != 0) ? 1 : 0
+ return (reagents.has_reagent(M, (being_built.materials[M]/efficiency_coeff)) != 0)
/obj/machinery/r_n_d/circuit_imprinter/proc/TotalMaterials()
diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm
index 3f784559213..fe9acc74a7c 100644
--- a/code/modules/research/designs/mechfabricator_designs.dm
+++ b/code/modules/research/designs/mechfabricator_designs.dm
@@ -857,7 +857,8 @@
id = "borg_upgrade_jetpack"
build_type = MECHFAB
build_path = /obj/item/borg/upgrade/jetpack
- materials = list("$metal"=10000,"$plasma"=15000,"$uranium" = 20000)
+ req_tech = list("engineering" = 4, "power" = 4)
+ materials = list("$metal"=10000, "$plasma"=5000, "$uranium" = 6000)
construction_time = 120
category = list("Cyborg Upgrade Modules")
@@ -866,6 +867,7 @@
id = "borg_upgrade_disablercooler"
build_type = MECHFAB
build_path = /obj/item/borg/upgrade/disablercooler
+ req_tech = list("combat" = 5, "power" = 4)
materials = list("$metal"=80000 , "$glass"=6000 , "$gold"= 2000, "$diamond" = 500)
construction_time = 120
category = list("Cyborg Upgrade Modules")
@@ -902,7 +904,8 @@
id = "borg_upgrade_vtec"
build_type = MECHFAB
build_path = /obj/item/borg/upgrade/vtec
- materials = list("$metal"=80000 , "$glass"=6000 , "$gold"= 5000)
+ req_tech = list("engineering" = 4, "materials" = 5)
+ materials = list("$metal"=80000 , "$glass"=6000 , "$uranium"= 5000)
construction_time = 120
category = list("Cyborg Upgrade Modules")
diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm
index d22d31ceeae..b6b01c63872 100644
--- a/code/modules/research/designs/medical_designs.dm
+++ b/code/modules/research/designs/medical_designs.dm
@@ -11,7 +11,7 @@
reliability_base = 74
build_path = "/obj/item/device/mass_spectrometer/adv"
category = list("Medical")
-
+
/datum/design/adv_reagent_scanner
name = "Advanced Reagent Scanner"
desc = "A device for identifying chemicals and their proportions."
@@ -22,18 +22,7 @@
reliability_base = 74
build_path = /obj/item/device/reagent_scanner/adv
category = list("Medical")
-
-/datum/design/implant_chem
- name = "Chemical Implant"
- desc = "An implant which can be filled with various chemicals, and then injected on command."
- id = "implant_chem"
- req_tech = list("materials" = 2, "biotech" = 3)
- build_type = PROTOLATHE
- materials = list("$metal" = 50, "$glass" = 50)
- build_path = /obj/item/weapon/implantcase/chem
- locked = 1
- category = list("Medical")
-
+
/datum/design/noreactbeaker
name = "Cryostasis Beaker"
desc = "A cryostasis beaker that allows for chemical storage without reactions. Can hold up to 50 units."
@@ -44,7 +33,7 @@
reliability_base = 76
build_path = /obj/item/weapon/reagent_containers/glass/beaker/noreact
category = list("Medical")
-
+
/datum/design/cyborg_analyzer
name = "Cyborg Analyzer"
desc = "A hand-held scanner able to diagnose robotic injuries."
@@ -55,7 +44,7 @@
reliability_base = 76
build_path = /obj/item/device/robotanalyzer
category = list("Medical")
-
+
/datum/design/defib
name = "Defibrillator"
desc = "A device that delivers powerful shocks to detachable paddles that resuscitate incapacitated patients."
@@ -66,17 +55,8 @@
reliability = 76
build_path = /obj/item/weapon/defibrillator
category = list("Medical")
-
-/datum/design/implant_free
- name = "Freedom Implant"
- desc = "An implant which allows the user to instantly escape from restraints."
- id = "implant_free"
- req_tech = list("syndicate" = 2, "biotech" = 3)
- build_type = PROTOLATHE
- materials = list("$metal" = 50, "$glass" = 50)
- build_path = /obj/item/weapon/implantcase/freedom
- category = list("Medical")
-
+
+
/datum/design/sensor_device
name = "Handheld Crew Monitor"
desc = "A device for tracking crew members on the station."
@@ -87,28 +67,7 @@
reliability_base = 76
build_path = /obj/item/device/sensor_device
category = list("Medical")
-
-/datum/design/implanter
- name = "Implanter"
- desc = "A basic implanter for injecting implants"
- id = "implanter"
- req_tech = list("materials" = 2, "biotech" = 3)
- build_type = PROTOLATHE
- materials = list("$metal" = 50, "$glass" = 50)
- build_path = "/obj/item/weapon/implanter"
- category = list("Medical")
-
-/datum/design/implant_loyal
- name = "Loyalty Implant"
- desc = "An implant which makes its carrier loyal to Nanotrasen."
- id = "implant_loyal"
- req_tech = list("materials" = 2, "biotech" = 3)
- build_type = PROTOLATHE
- materials = list("$metal" = 7000, "$glass" = 7000)
- build_path = /obj/item/weapon/implantcase/loyalty
- locked = 1
- category = list("Medical")
-
+
/datum/design/mmi
name = "Man-Machine Interface"
desc = "The Warrior's bland acronym, MMI, obscures the true horror of this monstrosity."
@@ -119,7 +78,7 @@
reliability_base = 76
build_path = /obj/item/device/mmi
category = list("Misc","Medical")
-
+
/datum/design/mass_spectrometer
name = "Mass-Spectrometer"
desc = "A device for analyzing chemicals in the blood."
@@ -130,7 +89,7 @@
reliability_base = 76
build_path = /obj/item/device/mass_spectrometer
category = list("Medical")
-
+
/datum/design/posibrain
name = "Positronic Brain"
desc = "Allows for the construction of a positronic brain"
@@ -151,7 +110,7 @@
reliability_base = 74
build_path = /obj/item/device/mmi/radio_enabled
category = list("Misc","Medical")
-
+
/datum/design/nanopaste
name = "Nanopaste"
desc = "A tube of paste containing swarms of repair nanites. Very effective in repairing robotic machinery."
diff --git a/code/modules/research/designs/radio_pda_designs.dm b/code/modules/research/designs/radio_pda_designs.dm
deleted file mode 100644
index 40dcac11da9..00000000000
--- a/code/modules/research/designs/radio_pda_designs.dm
+++ /dev/null
@@ -1,200 +0,0 @@
-/////////////////////////////////////////
-/////////////PDA and Radio///////////////
-/////////////////////////////////////////
-/datum/design/binaryencrypt
- name = "Binary Encryption Key"
- desc = "An encyption key for a radio headset. Contains cypherkeys."
- id = "binaryencrypt"
- req_tech = list("syndicate" = 2)
- build_type = PROTOLATHE
- materials = list("$metal" = 300, "$glass" = 300)
- build_path = /obj/item/device/encryptionkey/binary
- category = list("Communication")
-
-/datum/design/cart_atmos
- name = "BreatheDeep Cartridge"
- desc = "A data cartridge for portable microcomputers."
- id = "cart_atmos"
- req_tech = list("engineering" = 2, "powerstorage" = 3)
- build_type = PROTOLATHE
- materials = list("$metal" = 50, "$glass" = 50)
- build_path = /obj/item/weapon/cartridge/atmos
- category = list("Communication")
-
-/datum/design/cart_chemistry
- name = "ChemWhiz Cartridge"
- desc = "A data cartridge for portable microcomputers."
- id = "cart_chemistry"
- req_tech = list("engineering" = 2, "powerstorage" = 3)
- build_type = PROTOLATHE
- materials = list("$metal" = 50, "$glass" = 50)
- build_path = /obj/item/weapon/cartridge/chemistry
- category = list("Communication")
-
-/datum/design/cart_janitor
- name = "CustodiPRO Cartridge"
- desc = "A data cartridge for portable microcomputers."
- id = "cart_janitor"
- req_tech = list("engineering" = 2, "powerstorage" = 3)
- build_type = PROTOLATHE
- materials = list("$metal" = 50, "$glass" = 50)
- build_path = /obj/item/weapon/cartridge/janitor
- category = list("Communication")
-
-/datum/design/cart_mime
- name = "Gestur-O 1000 Cartridge"
- desc = "A data cartridge for portable microcomputers."
- id = "cart_mime"
- req_tech = list("engineering" = 2, "powerstorage" = 3)
- build_type = PROTOLATHE
- materials = list("$metal" = 50, "$glass" = 50)
- build_path = /obj/item/weapon/cartridge/mime
- category = list("Communication")
-
-/datum/design/cart_basic
- name = "Generic Cartridge"
- desc = "A data cartridge for portable microcomputers."
- id = "cart_basic"
- req_tech = list("engineering" = 2, "powerstorage" = 3)
- build_type = PROTOLATHE
- materials = list("$metal" = 50, "$glass" = 50)
- build_path = /obj/item/weapon/cartridge
- category = list("Communication")
-
-/datum/design/cart_clown
- name = "Honkworks 5.0 Cartridge"
- desc = "A data cartridge for portable microcomputers."
- id = "cart_clown"
- req_tech = list("engineering" = 2, "powerstorage" = 3)
- build_type = PROTOLATHE
- materials = list("$metal" = 50, "$glass" = 50)
- build_path = /obj/item/weapon/cartridge/clown
- category = list("Communication")
-
-/datum/design/cart_hop
- name = "Human Resources 9001 Cartridge"
- desc = "A data cartridge for portable microcomputers."
- id = "cart_hop"
- req_tech = list("engineering" = 2, "powerstorage" = 3)
- build_type = PROTOLATHE
- materials = list("$metal" = 50, "$glass" = 50)
- build_path = /obj/item/weapon/cartridge/hop
- locked = 1
- category = list("Communication")
-
-/datum/design/cart_medical
- name = "Med-U Cartridge"
- desc = "A data cartridge for portable microcomputers."
- id = "cart_medical"
- req_tech = list("engineering" = 2, "powerstorage" = 3)
- build_type = PROTOLATHE
- materials = list("$metal" = 50, "$glass" = 50)
- build_path = /obj/item/weapon/cartridge/medical
- category = list("Communication")
-
-/datum/design/cart_cmo
- name = "Med-U DELUXE Cartridge"
- desc = "A data cartridge for portable microcomputers."
- id = "cart_cmo"
- req_tech = list("engineering" = 2, "powerstorage" = 3)
- build_type = PROTOLATHE
- materials = list("$metal" = 50, "$glass" = 50)
- build_path = /obj/item/weapon/cartridge/cmo
- locked = 1
- category = list("Communication")
-
-/datum/design/pda
- name = "PDA"
- desc = "A portable microcomputer by Thinktronic Systems, LTD. Functionality determined by a preprogrammed ROM cartridge."
- id = "pda"
- req_tech = list("engineering" = 2, "powerstorage" = 3)
- build_type = PROTOLATHE
- materials = list("$metal" = 50, "$glass" = 50)
- build_path = /obj/item/device/pda
- category = list("Communication")
-
-/datum/design/cart_engineering
- name = "Power-ON Cartridge"
- desc = "A data cartridge for portable microcomputers."
- id = "cart_engineering"
- req_tech = list("engineering" = 2, "powerstorage" = 3)
- build_type = PROTOLATHE
- materials = list("$metal" = 50, "$glass" = 50)
- build_path = /obj/item/weapon/cartridge/engineering
- category = list("Communication")
-
-/datum/design/cart_ce
- name = "Power-On DELUXE Cartridge"
- desc = "A data cartridge for portable microcomputers."
- id = "cart_ce"
- req_tech = list("engineering" = 2, "powerstorage" = 3)
- build_type = PROTOLATHE
- materials = list("$metal" = 50, "$glass" = 50)
- build_path = /obj/item/weapon/cartridge/ce
- locked = 1
- category = list("Communication")
-
-/datum/design/cart_security
- name = "R.O.B.U.S.T. Cartridge"
- desc = "A data cartridge for portable microcomputers."
- id = "cart_security"
- req_tech = list("engineering" = 2, "powerstorage" = 3)
- build_type = PROTOLATHE
- materials = list("$metal" = 50, "$glass" = 50)
- build_path = "/obj/item/weapon/cartridge/security"
- locked = 1
- category = list("Communication")
-
-/datum/design/cart_hos
- name = "R.O.B.U.S.T. DELUXE Cartridge"
- desc = "A data cartridge for portable microcomputers."
- id = "cart_hos"
- req_tech = list("engineering" = 2, "powerstorage" = 3)
- build_type = PROTOLATHE
- materials = list("$metal" = 50, "$glass" = 50)
- build_path = /obj/item/weapon/cartridge/hos
- locked = 1
- category = list("Communication")
-
-/datum/design/cart_toxins
- name = "Signal Ace 2 Cartridge"
- desc = "A data cartridge for portable microcomputers."
- id = "cart_toxins"
- req_tech = list("engineering" = 2, "powerstorage" = 3)
- build_type = PROTOLATHE
- materials = list("$metal" = 50, "$glass" = 50)
- build_path = /obj/item/weapon/cartridge/signal/toxins
- category = list("Communication")
-
-/datum/design/cart_rd
- name = "Signal Ace DELUXE Cartridge"
- desc = "A data cartridge for portable microcomputers."
- id = "cart_rd"
- req_tech = list("engineering" = 2, "powerstorage" = 3)
- build_type = PROTOLATHE
- materials = list("$metal" = 50, "$glass" = 50)
- build_path = /obj/item/weapon/cartridge/rd
- locked = 1
- category = list("Communication")
-
-/datum/design/cart_quartermaster
- name = "Space Parts & Space Vendors Cartridge"
- desc = "A data cartridge for portable microcomputers."
- id = "cart_quartermaster"
- req_tech = list("engineering" = 2, "powerstorage" = 3)
- build_type = PROTOLATHE
- materials = list("$metal" = 50, "$glass" = 50)
- build_path = /obj/item/weapon/cartridge/quartermaster
- locked = 1
- category = list("Communication")
-
-/datum/design/cart_captain
- name = "Value-PAK Cartridge"
- desc = "A data cartridge for portable microcomputers."
- id = "cart_captain"
- req_tech = list("engineering" = 2, "powerstorage" = 3)
- build_type = PROTOLATHE
- materials = list("$metal" = 50, "$glass" = 50)
- build_path = /obj/item/weapon/cartridge/captain
- locked = 1
- category = list("Communication")
\ No newline at end of file
diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm
index 81fbad60c95..09a2b9a7974 100644
--- a/code/modules/research/protolathe.dm
+++ b/code/modules/research/protolathe.dm
@@ -26,17 +26,16 @@ Note: Must be placed west/left of and R&D console to function.
var/list/categories = list(
"Bluespace",
- "Communication",
"Equipment",
"Janitorial",
"Medical",
"Mining",
"Miscellaneous",
"Power",
- "Stock Parts",
- "Weapons"
- )
-
+ "Stock Parts",
+ "Weapons"
+ )
+
reagents = new()
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index 309f2c2374c..d901423368b 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -389,34 +389,38 @@ won't update every console in existence) but it's more of a hassle to do. Also,
if (g2g) //If input is incorrect, nothing happens
+ var/enough_materials = 1
linked_lathe.busy = 1
flick("protolathe_n",linked_lathe)
use_power(power)
for(var/M in being_built.materials)
- if(!linked_lathe.check_mat(being_built, M))
+ if(linked_lathe.check_mat(being_built, M) < amount)
src.visible_message("The [src.name] beeps, \"Not enough materials to complete prototype.\"")
+ enough_materials = 0
g2g = 0
break
- switch(M)
- if("$metal")
- linked_lathe.m_amount = max(0, (linked_lathe.m_amount-(being_built.materials[M]/coeff * amount)))
- if("$glass")
- linked_lathe.g_amount = max(0, (linked_lathe.g_amount-(being_built.materials[M]/coeff * amount)))
- if("$gold")
- linked_lathe.gold_amount = max(0, (linked_lathe.gold_amount-(being_built.materials[M]/coeff * amount)))
- if("$silver")
- linked_lathe.silver_amount = max(0, (linked_lathe.silver_amount-(being_built.materials[M]/coeff * amount)))
- if("$plasma")
- linked_lathe.plasma_amount = max(0, (linked_lathe.plasma_amount-(being_built.materials[M]/coeff * amount)))
- if("$uranium")
- linked_lathe.uranium_amount = max(0, (linked_lathe.uranium_amount-(being_built.materials[M]/coeff * amount)))
- if("$diamond")
- linked_lathe.diamond_amount = max(0, (linked_lathe.diamond_amount-(being_built.materials[M]/coeff * amount)))
- if("$bananium")
- linked_lathe.clown_amount = max(0, (linked_lathe.clown_amount-(being_built.materials[M]/coeff * amount)))
- else
- linked_lathe.reagents.remove_reagent(M, being_built.materials[M]/coeff * amount)
+ if(enough_materials)
+ for(var/M in being_built.materials)
+ switch(M)
+ if("$metal")
+ linked_lathe.m_amount = max(0, (linked_lathe.m_amount-(being_built.materials[M]/coeff * amount)))
+ if("$glass")
+ linked_lathe.g_amount = max(0, (linked_lathe.g_amount-(being_built.materials[M]/coeff * amount)))
+ if("$gold")
+ linked_lathe.gold_amount = max(0, (linked_lathe.gold_amount-(being_built.materials[M]/coeff * amount)))
+ if("$silver")
+ linked_lathe.silver_amount = max(0, (linked_lathe.silver_amount-(being_built.materials[M]/coeff * amount)))
+ if("$plasma")
+ linked_lathe.plasma_amount = max(0, (linked_lathe.plasma_amount-(being_built.materials[M]/coeff * amount)))
+ if("$uranium")
+ linked_lathe.uranium_amount = max(0, (linked_lathe.uranium_amount-(being_built.materials[M]/coeff * amount)))
+ if("$diamond")
+ linked_lathe.diamond_amount = max(0, (linked_lathe.diamond_amount-(being_built.materials[M]/coeff * amount)))
+ if("$bananium")
+ linked_lathe.clown_amount = max(0, (linked_lathe.clown_amount-(being_built.materials[M]/coeff * amount)))
+ else
+ linked_lathe.reagents.remove_reagent(M, being_built.materials[M]/coeff * amount)
var/P = being_built.build_path //lets save these values before the spawn() just in case. Nobody likes runtimes.
var/R = being_built.reliability
@@ -855,17 +859,17 @@ won't update every console in existence) but it's more of a hassle to do. Also,
for(var/M in D.materials)
t = linked_lathe.check_mat(D, M)
temp_material += " | "
- if (!t)
+ if (t < 1)
temp_material += "[D.materials[M]/coeff] [CallMaterialName(M)]"
else
temp_material += " [D.materials[M]/coeff] [CallMaterialName(M)]"
c = min(c,t)
- if (c)
+ if (c >= 1)
dat += "[D.name]"
- if(c >= 5.0)
+ if(c >= 5)
dat += "x5"
- if(c >= 10.0)
+ if(c >= 10)
dat += "x10"
dat += "[temp_material]"
else
@@ -890,17 +894,17 @@ won't update every console in existence) but it's more of a hassle to do. Also,
for(var/M in D.materials)
t = linked_lathe.check_mat(D, M)
temp_material += " | "
- if (!t)
+ if (t < 1)
temp_material += "[D.materials[M]/coeff] [CallMaterialName(M)]"
else
temp_material += " [D.materials[M]/coeff] [CallMaterialName(M)]"
c = min(c,t)
- if (c)
+ if (c >= 1)
dat += "[D.name]"
- if(c >= 5.0)
+ if(c >= 5)
dat += "x5"
- if(c >= 10.0)
+ if(c >= 10)
dat += "x10"
dat += "[temp_material]"
else
diff --git a/icons/obj/stock_parts.dmi b/icons/obj/stock_parts.dmi
index 1e56e5848dc..d263d057cbc 100644
Binary files a/icons/obj/stock_parts.dmi and b/icons/obj/stock_parts.dmi differ
diff --git a/maps/cyberiad.dmm b/maps/cyberiad.dmm
index 9479ba408f7..579bc602a63 100644
--- a/maps/cyberiad.dmm
+++ b/maps/cyberiad.dmm
@@ -4258,7 +4258,7 @@
"bDT" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor,/area/quartermaster/office)
"bDU" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4; initialize_directions = 11; level = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor,/area/quartermaster/office)
"bDV" = (/obj/machinery/door/firedoor/border_only{dir = 4; name = "Firelock East"},/obj/machinery/door/airlock/glass_mining{name = "Cargo Office"; req_access_txt = "50"},/turf/simulated/floor,/area/quartermaster/office)
-"bDW" = (/obj/machinery/lapvend,/turf/simulated/floor,/area/quartermaster/office)
+"bDW" = (/obj/machinery/vending/cart,/turf/simulated/floor,/area/quartermaster/office)
"bDX" = (/obj/structure/closet/secure_closet/hop2,/turf/simulated/floor,/area/crew_quarters/heads)
"bDY" = (/turf/simulated/floor,/area/crew_quarters/heads)
"bDZ" = (/obj/structure/table,/obj/item/weapon/pen,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/obj/item/device/megaphone,/turf/simulated/floor,/area/crew_quarters/heads)
diff --git a/paradise.dme b/paradise.dme
index a59937230f9..e9a71bbd9cd 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -1574,7 +1574,6 @@
#include "code\modules\research\designs\mining_designs.dm"
#include "code\modules\research\designs\misc_designs.dm"
#include "code\modules\research\designs\power_designs.dm"
-#include "code\modules\research\designs\radio_pda_designs.dm"
#include "code\modules\research\designs\stock_parts_designs.dm"
#include "code\modules\research\designs\telecomms_designs.dm"
#include "code\modules\research\designs\weapon_designs.dm"