Merge pull request #17576 from LatD/Research

[Ready for test/merge] R&D level remake

code/modules/power/cell.dm

@@ -15,7 +15,6 @@
 	var/maxcharge = 1000
 	materials = list(MAT_METAL=700, MAT_GLASS=50)
 	var/rigged = 0		// true if rigged to explode
-	var/minor_fault = 0 //If not 100% reliable, it will build up faults.
 	var/chargerate = 100 //how much power is given every tick in a recharger
 	var/self_recharge = 0 //does it self recharge, over time, or not?
 
@@ -77,19 +76,12 @@
 	if(maxcharge < amount)
 		amount = maxcharge
 	var/power_used = min(maxcharge-charge,amount)
-	if(crit_fail)
-		return 0
-	if(!prob(reliability))
-		minor_fault++
-		if(prob(minor_fault))
-			crit_fail = 1
-			return 0
 	charge += power_used
 	return power_used
 
 /obj/item/weapon/stock_parts/cell/examine(mob/user)
 	..()
-	if(crit_fail || rigged)
+	if(rigged)
 		user << "<span class='danger'>This power cell seems to be faulty!</span>"
 	else
 		user << "The charge meter reads [round(src.percent() )]%."
@@ -140,8 +132,6 @@
 	charge -= 1000 / severity
 	if (charge < 0)
 		charge = 0
-	if(reliability != 100 && prob(50/severity))
-		reliability -= 10 / severity
 	..()
 
 /obj/item/weapon/stock_parts/cell/ex_act(severity, target)
@@ -169,7 +159,6 @@
 /obj/item/weapon/stock_parts/cell/crap
 	name = "\improper Nanotrasen brand rechargable AA battery"
 	desc = "You can't top the plasma top." //TOTALLY TRADEMARK INFRINGEMENT
-	origin_tech = null
 	maxcharge = 500
 	materials = list(MAT_GLASS=40)
 	rating = 2
@@ -225,10 +214,10 @@
 
 /obj/item/weapon/stock_parts/cell/super
 	name = "super-capacity power cell"
-	origin_tech = "powerstorage=5"
+	origin_tech = "powerstorage=3;materials=3"
 	icon_state = "scell"
 	maxcharge = 20000
-	materials = list(MAT_GLASS=70)
+	materials = list(MAT_GLASS=300)
 	rating = 4
 	chargerate = 2000
 
@@ -238,10 +227,10 @@
 
 /obj/item/weapon/stock_parts/cell/hyper
 	name = "hyper-capacity power cell"
-	origin_tech = "powerstorage=6"
+	origin_tech = "powerstorage=4;engineering=4;materials=4"
 	icon_state = "hpcell"
 	maxcharge = 30000
-	materials = list(MAT_GLASS=80)
+	materials = list(MAT_GLASS=400)
 	rating = 5
 	chargerate = 3000
 
@@ -252,10 +241,10 @@
 /obj/item/weapon/stock_parts/cell/bluespace
 	name = "bluespace power cell"
 	desc = "A rechargable transdimensional power cell."
-	origin_tech = "powerstorage=7"
+	origin_tech = "powerstorage=5;bluespace=4;materials=4;engineering=4"
 	icon_state = "bscell"
 	maxcharge = 40000
-	materials = list(MAT_GLASS=80)
+	materials = list(MAT_GLASS=600)
 	rating = 6
 	chargerate = 4000
 
@@ -266,9 +255,9 @@
 /obj/item/weapon/stock_parts/cell/infinite
 	name = "infinite-capacity power cell!"
 	icon_state = "icell"
-	origin_tech =  null
+	origin_tech =  "powerstorage=7"
 	maxcharge = 30000
-	materials = list(MAT_GLASS=80)
+	materials = list(MAT_GLASS=1000)
 	rating = 6
 	chargerate = 30000
 
@@ -278,19 +267,18 @@
 /obj/item/weapon/stock_parts/cell/potato
 	name = "potato battery"
 	desc = "A rechargable starch based power cell."
-	origin_tech = "powerstorage=1"
 	icon = 'icons/obj/power.dmi' //'icons/obj/hydroponics/harvest.dmi'
 	icon_state = "potato_cell" //"potato_battery"
+	origin_tech = "powerstorage=1;biotech=1"
 	charge = 100
 	maxcharge = 300
 	materials = list()
-	minor_fault = 1
 	rating = 1
 
 /obj/item/weapon/stock_parts/cell/high/slime
 	name = "charged slime core"
 	desc = "A yellow slime core infused with plasma, it crackles with power."
-	origin_tech = "powerstorage=2;biotech=4"
+	origin_tech = "powerstorage=5;biotech=4"
 	icon = 'icons/mob/slimes.dmi'
 	icon_state = "yellow slime extract"
 	materials = list()

code/modules/power/port_gen.dm

@@ -115,7 +115,7 @@ display round(lastgen) and plasmatank amount
 /obj/item/weapon/circuitboard/machine/pacman
 	name = "circuit board (PACMAN-type Generator)"
 	build_path = /obj/machinery/power/port_gen/pacman
-	origin_tech = "programming=3;powerstorage=3;plasmatech=3;engineering=3"
+	origin_tech = "programming=2;powerstorage=3;plasmatech=3;engineering=3"
 	req_components = list(
 							/obj/item/weapon/stock_parts/matter_bin = 1,
 							/obj/item/weapon/stock_parts/micro_laser = 1,
@@ -130,7 +130,7 @@ display round(lastgen) and plasmatank amount
 /obj/item/weapon/circuitboard/machine/pacman/mrs
 	name = "circuit board (MRSPACMAN-type Generator)"
 	build_path = "/obj/machinery/power/port_gen/pacman/mrs"
-	origin_tech = "programming=3;powerstorage=5;engineering=5"
+	origin_tech = "programming=3;powerstorage=4;engineering=4;plasmatech=4"
 
 /obj/machinery/power/port_gen/pacman/Destroy()
 	DropFuel()

code/modules/power/singularity/emitter.dm

@@ -37,7 +37,7 @@
 /obj/item/weapon/circuitboard/machine/emitter
 	name = "circuit board (Emitter)"
 	build_path = /obj/machinery/power/emitter
-	origin_tech = "programming=4;powerstorage=5;engineering=5"
+	origin_tech = "programming=3;powerstorage=4;engineering=4"
 	req_components = list(
 							/obj/item/weapon/stock_parts/micro_laser = 1,
 							/obj/item/weapon/stock_parts/manipulator = 1)

code/modules/power/tesla/coil.dm

@@ -16,7 +16,7 @@
 /obj/item/weapon/circuitboard/machine/tesla_coil
 	name = "circuit board (Tesla Coil)"
 	build_path = /obj/machinery/power/tesla_coil
-	origin_tech = "programming=1;engineering=2;powerstorage=3"
+	origin_tech = "programming=3;magnets=3;powerstorage=3"
 	req_components = list(/obj/item/weapon/stock_parts/capacitor = 1)
 
 /obj/machinery/power/tesla_coil/RefreshParts()
@@ -72,7 +72,7 @@
 /obj/item/weapon/circuitboard/machine/grounding_rod
 	name = "circuit board (Grounding Rod)"
 	build_path = /obj/machinery/power/grounding_rod
-	origin_tech = "programming=1;engineering=1;powerstorage=1"
+	origin_tech = "programming=3;powerstorage=3;magnets=3;plasmatech=2"
 	req_components = list(/obj/item/weapon/stock_parts/capacitor = 1)
 
 /obj/machinery/power/grounding_rod/attackby(obj/item/W, mob/user, params)

code/modules/power/turbine.dm

@@ -76,7 +76,7 @@
 /obj/item/weapon/circuitboard/machine/power_compressor
 	name = "circuit board (Power Compressor)"
 	build_path = /obj/machinery/power/compressor
-	origin_tech = "programming=4;powerstorage=5;engineering=4"
+	origin_tech = "programming=4;powerstorage=4;engineering=4"
 	req_components = list(
 							/obj/item/stack/cable_coil = 5,
 							/obj/item/weapon/stock_parts/manipulator = 6)
@@ -195,7 +195,7 @@
 /obj/item/weapon/circuitboard/machine/power_turbine
 	name = "circuit board (Power Turbine)"
 	build_path = /obj/machinery/power/turbine
-	origin_tech = "programming=4;powerstorage=4;engineering=5"
+	origin_tech = "programming=4;powerstorage=4;engineering=4"
 	req_components = list(
 							/obj/item/stack/cable_coil = 5,
 							/obj/item/weapon/stock_parts/capacitor = 6)