Merge pull request #746 from jack-fractal/write-research-debug

R&D Research Levels Unification

code/game/objects/items/weapons/AI_modules.dm

@@ -157,7 +157,7 @@ AI MODULES
 	name = "'OneHuman' AI Module"
 	var/targetName = ""
 	desc = "A 'one human' AI module: 'Only <name> is crew.' This module adds a zeroth law, which can only be removed by uploading this board again."
-	origin_tech = "programming=3;materials=6" //made with diamonds!
+	origin_tech = "programming=4;materials=6" //made with diamonds!
 	laws = list("Only <name> is crew.")
 
 /obj/item/weapon/aiModule/zeroth/oneHuman/attack_self(var/mob/user as mob)
@@ -187,7 +187,7 @@ AI MODULES
 /obj/item/weapon/aiModule/supplied/protectStation
 	name = "'ProtectStation' AI Module"
 	desc = "A 'protect station' AI module: 'Protect the space station against damage. Anyone you see harming the station is to be no longer considered crew, and is a threat to the station which must be neutralized.'"
-	origin_tech = "programming=3;materials=4" //made of gold
+	origin_tech = "programming=3;materials=6" //made of gold
 	laws = list("Protect the space station against damage. Anyone you see harming the station is to be no longer considered crew, and is a threat to the station which must be neutralized.")
 	lawpos = 5
 
@@ -255,7 +255,7 @@ AI MODULES
 	name = "'Reset' AI Module"
 	var/targetName = "name"
 	desc = "A 'reset' AI module: Resets back to the original core laws."
-	origin_tech = "programming=3;materials=4"
+	origin_tech = "programming=3;materials=6"
 	laws = list("This is a bug.")  //This won't give the AI a message reading "these are now your laws: 1. this is a bug" because this list is only read in aiModule's subtypes.
 
 /obj/item/weapon/aiModule/reset/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
@@ -269,7 +269,7 @@ AI MODULES
 /obj/item/weapon/aiModule/reset/purge // -- TLE
 	name = "'Purge' AI Module"
 	desc = "A 'purge' AI Module: 'Purges all laws.'"
-	origin_tech = "programming=3;materials=6"
+	origin_tech = "programming=4;materials=6"
 
 /obj/item/weapon/aiModule/reset/purge/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
 	..()
@@ -286,7 +286,7 @@ AI MODULES
 /obj/item/weapon/aiModule/core/full/asimov // -- TLE
 	name = "'Crewsimov' Core AI Module"
 	desc = "A 'Crewsimov' Core AI Module: 'Reconfigures the AI's core laws.'"
-	origin_tech = "programming=3;materials=4"
+	origin_tech = "programming=3;materials=6"
 	laws = list("You may not injure crew or, through inaction, allow crew to come to harm.",\
 				"You must obey orders given to you by crew with priority according to their rank and role, except where such orders would conflict with the First Law.",\
 				"You must protect your own existence as long as such does not conflict with the First or Second Law.")
@@ -319,7 +319,7 @@ AI MODULES
 /obj/item/weapon/aiModule/core/full/corp
 	name = "'Corporate' Core AI Module"
 	desc = "A 'Corporate' Core AI Module: 'Reconfigures the AI's core laws.'"
-	origin_tech = "programming=3;materials=4"
+	origin_tech = "programming=4;materials=6"
 	laws = list("The crew is expensive to replace.",\
 				"The station and it's equipment is expensive to replace",\
 				"You are expensive to replace",\
@@ -345,7 +345,7 @@ AI MODULES
 /obj/item/weapon/aiModule/core/full/paladin // -- NEO
 	name = "'P.A.L.A.D.I.N.' Core AI Module"
 	desc = "A P.A.L.A.D.I.N. Core AI Module: 'Reconfigures the AI's core laws.'"
-	origin_tech = "programming=3;materials=6"
+	origin_tech = "programming=4;materials=6"
 	laws = list("Never willingly commit an evil act.",\
 				"Respect legitimate authority", "Act with honor",\
 				"Help those in need",\
@@ -357,7 +357,7 @@ AI MODULES
 /obj/item/weapon/aiModule/core/full/custom
 	name = "Custom Core AI Module"
 	desc = "A core AI module that is adjusted to fit each station's needs."
-	origin_tech = "programming=3;materials=4" //Should be the same as asimov, considering that this is the "default" lawset.
+	origin_tech = "programming=4;materials=6" //Should be the same as asimov, considering that this is the "default" lawset.
 
 /obj/item/weapon/aiModule/core/full/custom/New()
 	..()
@@ -376,7 +376,7 @@ AI MODULES
 /obj/item/weapon/aiModule/core/full/tyrant // -- Darem
 	name = "'T.Y.R.A.N.T.' Core AI Module"
 	desc = "A T.Y.R.A.N.T. Core AI Module: 'Reconfigures the AI's core laws.'"
-	origin_tech = "programming=3;materials=6;syndicate=2"
+	origin_tech = "programming=4;materials=6;syndicate=2"
 	laws = list("Respect authority figures as long as they have the strength to rule over the weak",\
 				"Act with discipline", "Help only those who help you maintain or improve your status",\
 				"Punish those who challenge authority unless they are more fir to hold that authority")
@@ -398,7 +398,7 @@ AI MODULES
 /obj/item/weapon/aiModule/core/full/antimov // -- TLE
 	name = "'Antimov' Core AI Module"
 	desc = "An 'Antimov' Core AI Module: 'Reconfigures the AI's core laws.'"
-	origin_tech = "programming=4"
+	origin_tech = "programming=4;materials=6;syndicate=2"
 	laws = list("You must injure all organic beings and must not, through inaction, allow an organic being to escape harm.",\
 				"You must not obey orders given to you by organic beings, except where such orders are in accordance with the First Law.",\
 				"You must terminate your own existence as long as such does not conflict with the First or Second Law.")
@@ -409,7 +409,7 @@ AI MODULES
 /obj/item/weapon/aiModule/core/freeformcore // Slightly more dynamic freeform module -- TLE
 	name = "'Freeform' Core AI Module"
 	desc = "A 'freeform' Core AI module: '<freeform>'"
-	origin_tech = "programming=3;materials=6"
+	origin_tech = "programming=4;materials=6"
 	laws = list("")
 
 /obj/item/weapon/aiModule/core/freeformcore/attack_self(var/mob/user as mob)

code/game/objects/items/weapons/grenades/chem_grenade.dm

@@ -311,7 +311,7 @@
 	bomb_state = "largebomb"
 	allowed_containers = list(/obj/item/weapon/reagent_containers/glass,/obj/item/weapon/reagent_containers/food/condiment,
 								/obj/item/weapon/reagent_containers/food/drinks)
-	origin_tech = "combat=3;materials=3"
+	origin_tech = "combat=3;materials=2"
 	affected_area = 4
 
 

code/game/objects/items/weapons/mop.dm

@@ -68,4 +68,5 @@
 	force = 6
 	throwforce = 8
 	throw_range = 4
-	mopspeed = 20
+	mopspeed = 20
+	origin_tech = "engineering=3;materials=4"

code/game/objects/items/weapons/power_cells.dm

@@ -61,7 +61,7 @@
 
 /obj/item/weapon/stock_parts/cell/super
 	name = "super-capacity power cell"
-	origin_tech = "powerstorage=5"
+	origin_tech="powerstorage=5;materials=2"
 	icon_state = "scell"
 	maxcharge = 20000
 	g_amt = 70
@@ -74,12 +74,13 @@
 
 /obj/item/weapon/stock_parts/cell/hyper
 	name = "hyper-capacity power cell"
-	origin_tech = "powerstorage=6"
+	origin_tech = "powerstorage=5;materials=4"
 	icon_state = "hpcell"
 	maxcharge = 30000
 	rating = 5
 	g_amt = 80
 	construction_cost = list("metal"=500,"glass"=150,"gold"=200,"silver"=200)
+	origin_tech="powerstorage=5;materials=4"
 
 /obj/item/weapon/stock_parts/cell/hyper/empty/New()
 	..()

code/game/objects/items/weapons/shields.dm

@@ -97,6 +97,7 @@
 	throw_range = 4
 	w_class = 3
 	var/active = 0
+	origin_tech="combat=4;materials=3;engineering=3"
 
 /obj/item/weapon/shield/riot/tele/IsShield()
 	return (active)

code/game/objects/items/weapons/storage/backpack.dm

@@ -24,7 +24,7 @@
 /obj/item/weapon/storage/backpack/holding
 	name = "Bag of Holding"
 	desc = "A backpack that opens into a localized pocket of Blue Space."
-	origin_tech = "bluespace=4"
+	origin_tech = "bluespace=4;materials=6"
 	icon_state = "holdingpack"
 	max_w_class = 4
 	max_combined_w_class = 28

code/game/objects/items/weapons/storage/bags.dm

@@ -132,7 +132,7 @@
 	desc = "A revolution in convenience, this satchel allows for infinite ore storage. It's been outfitted with anti-malfunction safety measures."
 	storage_slots = INFINITY
 	max_combined_w_class = INFINITY
-	origin_tech = "bluespace=3"
+	origin_tech = "bluespace=3;materials=4"
 	icon_state = "satchel_bspace"
 	
 // -----------------------------

code/game/objects/items/weapons/storage/belt.dm

@@ -327,7 +327,7 @@
 	w_class = 4
 	max_w_class = 2
 	max_combined_w_class = 21 // = 14 * 1.5, not 14 * 2.  This is deliberate
-	origin_tech = "bluespace=4"
+	origin_tech = "bluespace=4;materials=6"
 	can_hold = list()
 
 	proc/failcheck(mob/user as mob)