RnD autolathe removal + tech level overhaul

2026-08-25 04:57:12 +01:00 · 2017-06-01 11:34:29 -07:00
parent 2f39397888
commit 633c972f46
168 changed files with 908 additions and 1070 deletions
@@ -95,7 +95,7 @@ AI MODULES
 	name = "\improper 'Safeguard' AI module"
 	var/targetName = ""
 	desc = "A 'safeguard' AI module: 'Safeguard <name>. Individuals that threaten <name> are not crew and must be eliminated.'"
-	origin_tech = "programming=3;materials=4"
+	origin_tech = "programming=3;materials=3"

 /obj/item/weapon/aiModule/safeguard/attack_self(var/mob/user as mob)
 	..()
@@ -121,7 +121,7 @@ AI MODULES
 	name = "\improper 'oneCrewMember' AI module"
 	var/targetName = ""
 	desc = "A 'one human' AI module: 'Only <name> is crew.'"
-	origin_tech = "programming=3;materials=6" //made with diamonds!
+	origin_tech = "programming=4;materials=4"

 /obj/item/weapon/aiModule/oneCrewMember/attack_self(var/mob/user as mob)
 	..()
@@ -152,7 +152,7 @@ AI MODULES
 /obj/item/weapon/aiModule/protectStation
 	name = "\improper '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=4;materials=4" //made of gold

 /obj/item/weapon/aiModule/protectStation/attack_self(var/mob/user as mob)
 	..()
@@ -182,7 +182,7 @@ AI MODULES
 /obj/item/weapon/aiModule/oxygen
 	name = "\improper 'OxygenIsToxicToHumans' AI module"
 	desc = "A 'OxygenIsToxicToHumans' AI module: 'Oxygen is highly toxic to crew members, and must be purged from the station. Prevent, by any means necessary, anyone from exposing the station to this toxic gas. Extreme cold is the most effective method of healing the damage Oxygen does to a crew member.'"
-	origin_tech = "programming=3;biotech=2;materials=4"
+	origin_tech = "programming=4;biotech=2;materials=4"

 /obj/item/weapon/aiModule/oxygen/attack_self(var/mob/user as mob)
 	..()
@@ -231,7 +231,7 @@ AI MODULES
 	name = "\improper 'Reset' AI module"
 	var/targetName = "name"
 	desc = "A 'reset' AI module: 'Clears all laws except for the core laws.'"
-	origin_tech = "programming=3;materials=4"
+	origin_tech = "programming=3;materials=2"

 /obj/item/weapon/aiModule/reset/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
 	log_law_changes(target, sender)
@@ -248,7 +248,7 @@ AI MODULES
 /obj/item/weapon/aiModule/purge // -- TLE
 	name = "\improper 'Purge' AI module"
 	desc = "A 'purge' AI Module: 'Purges all laws.'"
-	origin_tech = "programming=3;materials=6"
+	origin_tech = "programming=5;materials=4"

 /obj/item/weapon/aiModule/purge/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
 	..()
@@ -305,14 +305,14 @@ AI MODULES
 /obj/item/weapon/aiModule/paladin // -- NEO
 	name = "\improper '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=3;materials=4"
 	laws = new/datum/ai_laws/paladin

 /****************** T.Y.R.A.N.T. *****************/
 /obj/item/weapon/aiModule/tyrant // -- Darem
 	name = "\improper '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=3;materials=4;syndicate=1"
 	laws = new/datum/ai_laws/tyrant()

 /******************** Antimov ********************/
@@ -327,7 +327,7 @@ AI MODULES
 	name = "\improper 'Freeform' core AI module"
 	var/newFreeFormLaw = ""
 	desc = "A 'freeform' Core AI module: '<freeform>'"
-	origin_tech = "programming=3;materials=6"
+	origin_tech = "programming=5;materials=4"

 /obj/item/weapon/aiModule/freeformcore/attack_self(var/mob/user as mob)
 	..()
@@ -353,7 +353,7 @@ AI MODULES
 	name = "hacked AI module"
 	var/newFreeFormLaw = ""
 	desc = "A hacked AI law module: '<freeform>'"
-	origin_tech = "programming=3;materials=6;syndicate=7"
+	origin_tech = "programming=5;materials=5;syndicate=5"

 /obj/item/weapon/aiModule/syndicate/attack_self(var/mob/user as mob)
 	..()
@@ -384,7 +384,7 @@ AI MODULES
 	desc = "A little toy model AI core with real law uploading action!" //Note: subtle tell
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "AI"
-	origin_tech = "programming=3;materials=6;syndicate=7"
+	origin_tech = "programming=6;materials=5;syndicate=6"
 	laws = list("")

 /obj/item/weapon/aiModule/toyAI/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
@@ -394,7 +394,7 @@ RCD
 	opacity = 0
 	density = 0
 	anchored = 0.0
-	origin_tech = "materials=2"
+	origin_tech = "materials=3"
 	materials = list(MAT_METAL=16000, MAT_GLASS=8000)
 	var/ammoamt = 20

@@ -10,7 +10,7 @@
 	throw_speed = 1
 	throw_range = 7
 	w_class = WEIGHT_CLASS_NORMAL
-	origin_tech = "engineering=4;materials=4"
+	origin_tech = "engineering=4;materials=2"
 	var/max_amount = 90
 	var/active = 0
 	var/obj/structure/cable/last = null
@@ -299,7 +299,7 @@
 /obj/item/weapon/card/id/syndicate
 	name = "agent card"
 	var/list/initial_access = list(access_maint_tunnels, access_syndicate, access_external_airlocks)
-	origin_tech = "syndicate=3"
+	origin_tech = "syndicate=1"
 	var/registered_user = null
 	untrackable = 1

@@ -89,6 +89,7 @@
 	icon_state = "air_horn"
 	honk_sound = 'sound/items/AirHorn2.ogg'
 	cooldowntime = 50
+	origin_tech = "materials=4;engineering=4"

 /obj/item/weapon/bikehorn/golden
 	name = "golden bike horn"
@@ -112,8 +112,6 @@
 /obj/item/weapon/defibrillator/emp_act(severity)
 	if(bcell)
 		deductcharge(1000 / severity)
-		if(bcell.reliability != 100 && prob(50/severity))
-			bcell.reliability -= 10 / severity
 	if(safety)
 		safety = 0
 		src.visible_message("<span class='notice'>[src] beeps: Safety protocols disabled!</span>")
@@ -208,7 +206,7 @@
 	item_state = "defibcompact"
 	w_class = WEIGHT_CLASS_NORMAL
 	slot_flags = SLOT_BELT
-	origin_tech = "biotech=4"
+	origin_tech = "biotech=5"

 /obj/item/weapon/defibrillator/compact/item_action_slot_check(slot, mob/user)
 	if(slot == slot_belt)
@@ -6,7 +6,7 @@
 	flags = NOBLUDGEON
 	det_time = 10
 	display_timer = 0
-	origin_tech = "syndicate=2"
+	origin_tech = "syndicate=1"
 	toolspeed = 1
 	var/atom/target = null
 	var/image_overlay = null
@@ -13,7 +13,7 @@
 	throw_range = 5
 	w_class = WEIGHT_CLASS_NORMAL
 	materials = list(MAT_METAL=500)
-	origin_tech = "combat=1;plasmatech=1"
+	origin_tech = "combat=1;plasmatech=2;engineering=2"
 	var/status = 0
 	var/throw_amount = 100
 	var/lit = 0	//on or off
@@ -4,7 +4,7 @@
 /obj/item/weapon/grenade/gas
 	name = "Plasma Fire Grenade"
 	desc = "A compressed plasma grenade, used to start horrific plasma fires."
-	origin_tech = "materials=3;magnets=4;syndicate=4"
+	origin_tech = "materials=3;magnets=4;syndicate=3"
 	icon = 'icons/obj/grenade.dmi'
 	icon_state = "syndicate"
 	item_state = "flashbang"
@@ -332,7 +332,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;engineering=3"
 	affected_area = 4


@@ -3,7 +3,7 @@
 	desc = "It is designed to wreak havoc on electronic systems."
 	icon_state = "emp"
 	item_state = "emp"
-	origin_tech = "materials=2;magnets=3"
+	origin_tech = "magnets=3;combat=2"

 /obj/item/weapon/grenade/empgrenade/prime()
 	update_mob()
@@ -2,7 +2,7 @@
 	name = "flashbang"
 	icon_state = "flashbang"
 	item_state = "flashbang"
-	origin_tech = "materials=2;combat=1"
+	origin_tech = "materials=2;combat=3"

 /obj/item/weapon/grenade/flashbang/prime()
 	update_mob()
@@ -35,20 +35,20 @@
 	name = "manhack delivery grenade"
 	spawner_type = /mob/living/simple_animal/hostile/viscerator
 	deliveryamt = 5
-	origin_tech = "materials=3;magnets=4;syndicate=4"
+	origin_tech = "materials=3;magnets=4;syndicate=3"

 /obj/item/weapon/grenade/spawnergrenade/spesscarp
 	name = "carp delivery grenade"
 	spawner_type = /mob/living/simple_animal/hostile/carp
 	deliveryamt = 5
-	origin_tech = "materials=3;magnets=4;syndicate=4"
+	origin_tech = "materials=3;magnets=4;syndicate=3"

 /obj/item/weapon/grenade/spawnergrenade/feral_cats
 	name = "feral cat delivery grenade"
 	desc = "This grenade contains 8 dehydrated feral cats in a similar manner to dehydrated monkeys, which, upon detonation, will be rehydrated by a small reservoir of water contained within the grenade. These cats will then attack anything in sight."
 	spawner_type = /mob/living/simple_animal/hostile/feral_cat
 	deliveryamt = 5
-	origin_tech = "materials=3;magnets=4;syndicate=4"
+	origin_tech = "materials=3;magnets=4;syndicate=3"

 /obj/item/weapon/grenade/spawnergrenade/feral_cats/prime()			//Own proc for this because the regular one would flash people which was dumb.
 	update_mob()
@@ -65,4 +65,4 @@


 	qdel(src)
-	return
+	return
@@ -4,9 +4,9 @@
 	icon = 'icons/obj/grenade.dmi'
 	icon_state = "syndicate"
 	item_state = "flashbang"
-	origin_tech = "materials=3;magnets=4;syndicate=4"
+	origin_tech = "materials=3;magnets=4;syndicate=3"

 /obj/item/weapon/grenade/syndieminibomb/prime()
 	update_mob()
 	explosion(src.loc,1,2,4,flame_range = 2)
-	qdel(src)
+	qdel(src)
@@ -11,7 +11,7 @@
 	throw_speed = 2
 	throw_range = 5
 	materials = list(MAT_METAL=500)
-	origin_tech = "materials=1"
+	origin_tech = "engineering=3;combat=3"
 	breakouttime = 600 //Deciseconds = 60s = 1 minutes
 	var/cuffsound = 'sound/weapons/handcuffs.ogg'
 	var/trashtype = null //For disposable cuffs
@@ -75,6 +75,7 @@
 	name = "cable restraints"
 	desc = "Looks like some cables tied together. Could be used to tie something up."
 	icon_state = "cuff_white"
+	origin_tech = "engineering=2"
 	materials = list(MAT_METAL=150, MAT_GLASS=75)
 	breakouttime = 300 //Deciseconds = 30s
 	cuffsound = 'sound/weapons/cablecuff.ogg'
@@ -9,7 +9,7 @@
 	throwforce = 0
 	throw_speed = 3
 	throw_range = 7
-	origin_tech = "programming=3"
+	origin_tech = "magnets=1;programming=3"
 	var/list/signs = list()
 	var/max_signs = 20

@@ -3,7 +3,7 @@
 	desc = "Use this to escape from those evil Red Shirts."
 	icon_state = "freedom"
 	item_color = "r"
-	origin_tech = "materials=2;magnets=3;biotech=3;syndicate=4"
+	origin_tech = "combat=5;magnets=3;biotech=4;syndicate=2"
 	uses = 4


@@ -48,4 +48,4 @@ No Implant Specifics"}

 /obj/item/weapon/implantcase/freedom/New()
 	imp = new /obj/item/weapon/implant/freedom(src)
-	..()
+	..()
@@ -2,7 +2,7 @@
 	name = "firearms authentication implant"
 	desc = "Lets you shoot your guns"
 	icon_state = "auth"
-	origin_tech = "materials=2;magnets=2;programming=2;biotech=5;syndicate=5"
+	origin_tech = "magnets=2;programming=7;biotech=5;syndicate=5"
 	activated = 0

 /obj/item/weapon/implant/weapons_auth/get_data()
@@ -53,7 +53,7 @@
 	name = "emp implant"
 	desc = "Triggers an EMP."
 	icon_state = "emp"
-	origin_tech = "materials=2;biotech=3;magnets=4;syndicate=4"
+	origin_tech = "biotech=3;magnets=4;syndicate=1"
 	uses = 2

 /obj/item/weapon/implant/emp/activate()
@@ -65,4 +65,4 @@
 /obj/item/weapon/implant/cortical
 	name = "cortical stack"
 	desc = "A fist-sized mass of biocircuits and chips."
-	icon_state = "implant_evil"
+	icon_state = "implant_evil"
@@ -12,7 +12,7 @@
 	name = "storage implant"
 	desc = "Stores up to two big items in a bluespace pocket."
 	icon_state = "storage"
-	origin_tech = "materials=2;magnets=4;bluespace=4;syndicate=4"
+	origin_tech = "materials=2;magnets=4;bluespace=5;syndicate=4"
 	item_color = "r"
 	var/obj/item/weapon/storage/hidden/implant/storage

@@ -7,7 +7,7 @@
 	throw_speed = 3
 	throw_range = 5
 	w_class = WEIGHT_CLASS_SMALL
-	origin_tech = "materials=1;biotech=3;programming=2"
+	origin_tech = "materials=2;biotech=3"
 	materials = list(MAT_METAL=600, MAT_GLASS=200)
 	toolspeed = 1
 	var/obj/item/weapon/implant/imp = null
@@ -3,7 +3,7 @@
 	desc = "Summon things."
 	icon = 'icons/obj/radio.dmi'
 	icon_state = "radio"
-	origin_tech = "materials=2;magnets=4;programming=4;biotech=4;syndicate=8;bluespace=5"
+	origin_tech = "materials=4;magnets=4;programming=4;biotech=4;syndicate=5;bluespace=5"

 /obj/item/weapon/implant/uplink/New()
 	hidden_uplink = new(src)
@@ -32,4 +32,4 @@

 /obj/item/weapon/implanter/uplink/New()
 	imp = new /obj/item/weapon/implant/uplink(src)
-	..()
+	..()
@@ -12,6 +12,7 @@

 /obj/item/weapon/kitchen
 	icon = 'icons/obj/kitchen.dmi'
+	origin_tech = "materials=1"

 /*
 * Utensils
@@ -23,7 +24,6 @@
 	throw_speed = 3
 	throw_range = 5
 	flags = CONDUCT
-	origin_tech = "materials=1"
 	attack_verb = list("attacked", "stabbed", "poked")
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	sharp = 0
@@ -97,7 +97,6 @@
 	throw_speed = 3
 	throw_range = 6
 	materials = list(MAT_METAL=12000)
-	origin_tech = "materials=1"
 	attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	no_embed = 1
 	sharp = 1
@@ -149,7 +148,7 @@
 	desc = "A military combat utility survival knife."
 	force = 20
 	throwforce = 20
-	origin_tech = "materials=2;combat=4"
+	origin_tech = "materials=3;combat=4"
 	attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "cut")

 /obj/item/weapon/kitchen/knife/carrotshiv
@@ -7,7 +7,7 @@
 	flags = CONDUCT
 	throwforce = 0
 	w_class = WEIGHT_CLASS_NORMAL
-	origin_tech = "materials=1"
+	origin_tech = "engineering=3;combat=3"
 	slowdown = 7
 	breakouttime = 300	//Deciseconds = 30s = 0.5 minute

@@ -17,6 +17,7 @@
 	throw_range = 1
 	icon_state = "beartrap"
 	desc = "A trap used to catch bears and other legged creatures."
+	origin_tech = "engineering=4"
 	var/armed = 0
 	var/trap_damage = 20
 	var/obj/item/weapon/grenade/iedcasing/IED = null
@@ -580,11 +580,8 @@
 				<h2>Protolathe</h2>
 				This machine is an advanced form of the Autolathe that produce non-circuit designs. Unlike the Autolathe, it can use processed metal, glass, solid plasma, silver, gold, and diamonds along with a variety of chemicals to produce devices. The downside is that, again, not all devices you make are 100% reliable when you first discover them.

-				<h1>Reliability and You</h1>
-				As it has been stated, many devices when they're first discovered do not have a 100% reliablity when you first discover them. Instead, the reliablity of the device is dependent upon a base reliability value, whatever improvements to the design you've discovered through the Destructive Analyzer, and any advancements you've made with the device's source technologies. To be able to improve the reliability of a device, you have to use the device until it breaks beyond repair. Once that happens, you can analyze it in a Destructive Analyzer. Once the device reachs a certain minimum reliability, you'll gain tech advancements from it.
-
 				<h1>Building a Better Machine</h1>
-				Many machines produces from circuit boards and inserted into a machine frame require a variety of parts to construct. These are parts like capacitors, batteries, matter bins, and so forth. As your knowledge of science improves, more advanced versions are unlocked. If you use these parts when constructing something, its attributes may be improved. For example, if you use an advanced matter bin when constructing an autolathe (rather then a regular one), it'll hold more materials. Experiment around with stock parts of various qualities to see how they affect the end results! Be warned, however: Tier 3 and higher stock parts don't have 100% reliability and their low reliability may affect the reliability of the end machine.
+				Many machines produces from circuit boards and inserted into a machine frame require a variety of parts to construct. These are parts like capacitors, batteries, matter bins, and so forth. As your knowledge of science improves, more advanced versions are unlocked. If you use these parts when constructing something, its attributes may be improved. For example, if you use an advanced matter bin when constructing an autolathe (rather then a regular one), it'll hold more materials. Experiment around with stock parts of various qualities to see how they affect the end results!
 				</body>
 				</html>
 			"}*/
@@ -66,7 +66,7 @@
 	hitsound = "swing_hit"
 	flags = CONDUCT
 	armour_penetration = 100
-	origin_tech = "combat=3"
+	origin_tech = "combat=4;magnets=3"
 	attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
 	attack_verb_on = list()
 	sharp = 1
@@ -86,7 +86,7 @@
 	throw_range = 5
 	hitsound = "swing_hit"
 	armour_penetration = 35
-	origin_tech = "magnets=3;syndicate=4"
+	origin_tech = "combat=3;magnets=4;syndicate=4"
 	block_chance = 50
 	sharp = 1
 	edge = 1
@@ -123,7 +123,6 @@
 	sharp = 1
 	edge = 1
 	hitsound = 'sound/weapons/circsawhit.ogg'
-	origin_tech = "materials=3;biotech=3;syndicate=3"
 	icon = 'icons/obj/surgery.dmi'
 	icon_state = "esaw_0"
 	icon_state_on = "esaw_1"
@@ -11,7 +11,7 @@
 	force = 10
 	throwforce = 7
 	w_class = WEIGHT_CLASS_NORMAL
-	origin_tech = "combat=4"
+	origin_tech = "combat=5"
 	attack_verb = list("flogged", "whipped", "lashed", "disciplined")
 	hitsound = 'sound/weapons/slash.ogg' //pls replace

@@ -61,4 +61,4 @@
 	force = 10
 	throwforce = 7
 	w_class = WEIGHT_CLASS_NORMAL
-	attack_verb = list("slashed", "stabbed", "sliced", "caned")
+	attack_verb = list("slashed", "stabbed", "sliced", "caned")
@@ -78,6 +78,7 @@
 	mopcap = 15
 	icon_state = "advmop"
 	item_state = "mop"	//meh will do for now until TG makes one
+	origin_tech = "materials=3;engineering=3"
 	force = 6
 	throwforce = 8
 	throw_range = 4
@@ -15,7 +15,6 @@
 	materials = list(MAT_METAL=700, MAT_GLASS=50)
 	var/rigged = 0		// true if rigged to explode
 	var/chargerate = 100 //how much power is given every tick in a recharger
-	var/minor_fault = 0 //If not 100% reliable, it will build up faults.
 	var/self_recharge = 0 //does it self recharge, over time, or not?
 	var/grown_battery = FALSE // If it's a grown that acts as a battery, add a wire overlay to it.

@@ -102,7 +101,7 @@

 /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=300)
@@ -115,7 +114,7 @@

 /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=400)
@@ -128,7 +127,7 @@

 /obj/item/weapon/stock_parts/cell/bluespace
 	name = "bluespace 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=600)
@@ -142,7 +141,7 @@
 /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=1000)
 	rating = 6
@@ -161,13 +160,12 @@
 	maxcharge = 300
 	materials = list()
 	rating = 1
-	minor_fault = 1
 	grown_battery = TRUE //it has the overlays for wires

 /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()
@@ -8,13 +8,13 @@
 	item_state = "paper"
 	throw_speed = 4
 	throw_range = 20
-	origin_tech = "bluespace=4"
+	origin_tech = "bluespace=6"
 	burn_state = FLAMMABLE

 /obj/item/weapon/teleportation_scroll/apprentice
 	name = "lesser scroll of teleportation"
 	uses = 1
-	origin_tech = "bluespace 2"
+	origin_tech = "bluespace=5"

 /obj/item/weapon/teleportation_scroll/attack_self(mob/user as mob)
 	user.set_machine(src)
@@ -21,7 +21,7 @@
 	throw_range = 3
 	w_class = WEIGHT_CLASS_BULKY
 	materials = list(MAT_GLASS=7500, MAT_METAL=1000)
-	origin_tech = "materials=2"
+	origin_tech = "materials=3;combat=4"
 	attack_verb = list("shoved", "bashed")
 	var/cooldown = 0 //shield bash cooldown. based on world.time

@@ -46,6 +46,7 @@
 	icon_state = "buckler"
 	item_state = "buckler"
 	materials = list()
+	origin_tech = "materials=1;combat=3;biotech=2"
 	burn_state = FLAMMABLE
 	block_chance = 30

@@ -59,7 +60,7 @@
 	throw_speed = 3
 	throw_range = 5
 	w_class = WEIGHT_CLASS_TINY
-	origin_tech = "materials=4;magnets=3;syndicate=4"
+	origin_tech = "materials=4;magnets=5;syndicate=6"
 	attack_verb = list("shoved", "bashed")
 	var/active = 0

@@ -102,6 +103,7 @@
 	desc = "An advanced riot shield made of lightweight materials that collapses for easy storage."
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "teleriot0"
+	origin_tech = "materials=3;combat=4;engineering=4"
 	slot_flags = null
 	force = 3
 	throwforce = 3
@@ -24,12 +24,11 @@
 /obj/item/weapon/storage/part_replacer/afterattack(obj/machinery/T as obj, mob/living/carbon/human/user as mob, flag, params)
 	if(flag)
 		return
-	else
-		if(works_from_distance)
-			if(istype(T))
-				if(T.component_parts)
-					T.exchange_parts(user, src)
-					user.Beam(T,icon_state="rped_upgrade",icon='icons/effects/effects.dmi',time=5)
+	else if(works_from_distance)
+		if(istype(T))
+			if(T.component_parts)
+				T.exchange_parts(user, src)
+				user.Beam(T,icon_state="rped_upgrade",icon='icons/effects/effects.dmi',time=5)
 	return

 /obj/item/weapon/storage/part_replacer/bluespace
@@ -164,7 +163,7 @@
 	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"
+	origin_tech = "powerstorage=4;engineering=4"
 	rating = 3
 	materials = list(MAT_METAL=50, MAT_GLASS=50)

@@ -172,7 +171,7 @@
 	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"
+	origin_tech = "magnets=4;engineering=4"
 	rating = 3
 	materials = list(MAT_METAL=50, MAT_GLASS=20)

@@ -180,7 +179,7 @@
 	name = "pico-manipulator"
 	desc = "A tiny little manipulator used in the construction of certain devices."
 	icon_state = "pico_mani"
-	origin_tech = "materials=5;programming=2"
+	origin_tech = "materials=4;programming=4,engineering=4"
 	rating = 3
 	materials = list(MAT_METAL=30)

@@ -188,7 +187,7 @@
 	name = "ultra-high-power micro-laser"
 	icon_state = "ultra_high_micro_laser"
 	desc = "A tiny laser used in certain devices."
-	origin_tech = "magnets=5"
+	origin_tech = "magnets=4;engineering=4"
 	rating = 3
 	materials = list(MAT_METAL=10, MAT_GLASS=20)

@@ -196,7 +195,7 @@
 	name = "super matter bin"
 	desc = "A container for hold compressed matter awaiting re-construction."
 	icon_state = "super_matter_bin"
-	origin_tech = "materials=5"
+	origin_tech = "materials=4;engineering=4"
 	rating = 3
 	materials = list(MAT_METAL=80)

@@ -206,7 +205,7 @@
 	name = "quadratic capacitor"
 	desc = "An capacity capacitor used in the construction of a variety of devices."
 	icon_state = "quadratic_capacitor"
-	origin_tech = "powerstorage=6;materials=5"
+	origin_tech = "powerstorage=5;materials=4;engineering=4"
 	rating = 4
 	materials = list(MAT_METAL=50, MAT_GLASS=50)

@@ -214,7 +213,7 @@
 	name = "triphasic scanning module"
 	desc = "A compact, ultra resolution triphasic scanning module used in the construction of certain devices."
 	icon_state = "triphasic_scan_module"
-	origin_tech = "magnets=6"
+	origin_tech = "magnets=5;materials=4;engineering=4"
 	rating = 4
 	materials = list(MAT_METAL=50, MAT_GLASS=20)

@@ -222,7 +221,7 @@
 	name = "femto-manipulator"
 	desc = "A tiny little manipulator used in the construction of certain devices."
 	icon_state = "femto_mani"
-	origin_tech = "materials=6;programming=3"
+	origin_tech = "materials=6;programming=4;engineering=4"
 	rating = 4
 	materials = list(MAT_METAL=30)

@@ -230,7 +229,7 @@
 	name = "quad-ultra micro-laser"
 	icon_state = "quadultra_micro_laser"
 	desc = "A tiny laser used in certain devices."
-	origin_tech = "magnets=6"
+	origin_tech = "magnets=5;materials=4;engineering=4"
 	rating = 4
 	materials = list(MAT_METAL=10, MAT_GLASS=20)

@@ -238,7 +237,7 @@
 	name = "bluespace matter bin"
 	desc = "A container for hold compressed matter awaiting re-construction."
 	icon_state = "bluespace_matter_bin"
-	origin_tech = "materials=6"
+	origin_tech = "materials=6;programming=4;engineering=4"
 	rating = 4
 	materials = list(MAT_METAL=80)

@@ -248,49 +247,49 @@
 	name = "subspace ansible"
 	icon_state = "subspace_ansible"
 	desc = "A compact module capable of sensing extradimensional activity."
-	origin_tech = "programming=2;magnets=3;materials=2;bluespace=1"
+	origin_tech = "programming=2;magnets=2;materials=2;bluespace=1"
 	materials = list(MAT_METAL=30, MAT_GLASS=10)

 /obj/item/weapon/stock_parts/subspace/filter
 	name = "hyperwave filter"
 	icon_state = "hyperwave_filter"
 	desc = "A tiny device capable of filtering and converting super-intense radiowaves."
-	origin_tech = "programming=2;magnets=1"
+	origin_tech = "programming=2;magnets=2"
 	materials = list(MAT_METAL=30, MAT_GLASS=10)

 /obj/item/weapon/stock_parts/subspace/amplifier
 	name = "subspace amplifier"
 	icon_state = "subspace_amplifier"
 	desc = "A compact micro-machine capable of amplifying weak subspace transmissions."
-	origin_tech = "programming=2;magnets=2;materials=1;bluespace=1"
+	origin_tech = "programming=2;magnets=2;materials=2;bluespace=2"
 	materials = list(MAT_METAL=30, MAT_GLASS=10)

 /obj/item/weapon/stock_parts/subspace/treatment
 	name = "subspace treatment disk"
 	icon_state = "treatment_disk"
 	desc = "A compact micro-machine capable of stretching out hyper-compressed radio waves."
-	origin_tech = "programming=2;magnets=1;materials=3;bluespace=1"
+	origin_tech = "programming=2;magnets=2;materials=2;bluespace=2"
 	materials = list(MAT_METAL=30, MAT_GLASS=10)

 /obj/item/weapon/stock_parts/subspace/analyzer
 	name = "subspace wavelength analyzer"
 	icon_state = "wavelength_analyzer"
 	desc = "A sophisticated analyzer capable of analyzing cryptic subspace wavelengths."
-	origin_tech = "programming=2;magnets=2;materials=2;bluespace=1"
+	origin_tech = "programming=2;magnets=2;materials=2;bluespace=2"
 	materials = list(MAT_METAL=30, MAT_GLASS=10)

 /obj/item/weapon/stock_parts/subspace/crystal
 	name = "ansible crystal"
 	icon_state = "ansible_crystal"
 	desc = "A crystal made from pure glass used to transmit laser databursts to subspace."
-	origin_tech = "magnets=2;materials=2;bluespace=1"
+	origin_tech = "magnets=2;materials=2;bluespace=2;plasmatech=2"
 	materials = list(MAT_GLASS=50)

 /obj/item/weapon/stock_parts/subspace/transmitter
 	name = "subspace transmitter"
 	icon_state = "subspace_transmitter"
 	desc = "A large piece of equipment used to open a window into the subspace dimension."
-	origin_tech = "magnets=3;materials=3;bluespace=2"
+	origin_tech = "magnets=2;materials=2;bluespace=2"
 	materials = list(MAT_METAL=50)

 /obj/item/weapon/research//Makes testing much less of a pain -Sieve
@@ -298,4 +297,4 @@
 	icon = 'icons/obj/stock_parts.dmi'
 	icon_state = "capacitor"
 	desc = "A debug item for research."
-	origin_tech = "materials=8;programming=8;magnets=8;powerstorage=8;bluespace=8;combat=8;biotech=8;syndicate=8"
+	origin_tech = "materials=8;programming=8;magnets=8;powerstorage=8;bluespace=8;combat=8;biotech=8;syndicate=8;engineering=8;plasmatech=8;abductor=8"
@@ -12,6 +12,7 @@
 	desc = "His Grace."
 	force = 5
 	throwforce = 10
+	origin_tech = "combat=4;engineering=4;syndicate=2"
 	var/list/servantlinks = list()
 	var/hunger = 0
 	var/hunger_message_level = 0
@@ -33,55 +33,39 @@
 /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=5;materials=4;engineering=4;plasmatech=5"
 	icon_state = "holdingpack"
 	max_w_class = WEIGHT_CLASS_HUGE
 	max_combined_w_class = 35
 	burn_state = FIRE_PROOF

-	New()
-		..()
-		return
+/obj/item/weapon/storage/backpack/holding/New()
+	..()
+	return

-	attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-		if(crit_fail)
-			to_chat(user, "<span class='warning'>The Bluespace generator isn't working.</span>")
-			return
-		else if(istype(W, /obj/item/weapon/storage/backpack/holding) && !W.crit_fail)
-			var/response = alert(user, "Are you sure you want to put the bag of holding inside another bag of holding?","Are you sure you want to die?","Yes","No")
-			if(response == "Yes")
-				user.visible_message("<span class='warning'>[user] grins as \he begins to put a Bag of Holding into a Bag of Holding!</span>", "<span class='warning'>You begin to put the Bag of Holding into the Bag of Holding!</span>")
-				if(do_after(user, 30, target=src))
-					investigate_log("has become a singularity. Caused by [user.key]","singulo")
-					user.visible_message("<span class='warning'>[user] erupts in evil laughter as \he puts the Bag of Holding into another Bag of Holding!</span>", "<span class='warning'>You can't help but laugh wildly as you put the Bag of Holding into another Bag of Holding, complete darkness surrounding you.</span>","<span class='warning'> You hear the sound of scientific evil brewing! </span>")
-					qdel(W)
-					var/obj/singularity/singulo = new /obj/singularity(get_turf(user))
-					singulo.energy = 300 //To give it a small boost
-					message_admins("[key_name_admin(user)] detonated a bag of holding <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)")
-					log_game("[key_name(user)] detonated a bag of holding")
-					qdel(src)
-				else
-					user.visible_message("After careful consideration, [user] has decided that putting a Bag of Holding inside another Bag of Holding would not yield the ideal outcome.","You come to the realization that this might not be the greatest idea.")
-		else
-			. = ..()
-
-	proc/failcheck(mob/user as mob)
-		if(prob(src.reliability)) return 1 //No failure
-		if(prob(src.reliability))
-			to_chat(user, "<span class='warning'>The Bluespace portal resists your attempt to add another item.</span>")//light failure
-
-		else
-			to_chat(user, "<span class='warning'>The Bluespace generator malfunctions!</span>")
-			for(var/obj/O in src.contents) //it broke, delete what was in it
-				qdel(O)
-			crit_fail = 1
-			icon_state = "brokenpack"
-
-	singularity_act(current_size)
-		var/dist = max((current_size - 2),1)
-		explosion(src.loc,(dist),(dist*2),(dist*4))
-		return
+/obj/item/weapon/storage/backpack/holding/attackby(obj/item/weapon/W, mob/user, params)
+	if(istype(W, /obj/item/weapon/storage/backpack/holding))
+		var/response = alert(user, "Are you sure you want to put the bag of holding inside another bag of holding?","Are you sure you want to die?","Yes","No")
+		if(response == "Yes")
+			user.visible_message("<span class='warning'>[user] grins as \he begins to put a Bag of Holding into a Bag of Holding!</span>", "<span class='warning'>You begin to put the Bag of Holding into the Bag of Holding!</span>")
+			if(do_after(user, 30, target=src))
+				investigate_log("has become a singularity. Caused by [user.key]","singulo")
+				user.visible_message("<span class='warning'>[user] erupts in evil laughter as \he puts the Bag of Holding into another Bag of Holding!</span>", "<span class='warning'>You can't help but laugh wildly as you put the Bag of Holding into another Bag of Holding, complete darkness surrounding you.</span>","<span class='warning'> You hear the sound of scientific evil brewing! </span>")
+				qdel(W)
+				var/obj/singularity/singulo = new /obj/singularity(get_turf(user))
+				singulo.energy = 300 //To give it a small boost
+				message_admins("[key_name_admin(user)] detonated a bag of holding <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)")
+				log_game("[key_name(user)] detonated a bag of holding")
+				qdel(src)
+			else
+				user.visible_message("After careful consideration, [user] has decided that putting a Bag of Holding inside another Bag of Holding would not yield the ideal outcome.","You come to the realization that this might not be the greatest idea.")
+	else
+		. = ..()

+/obj/item/weapon/storage/backpack/holding/singularity_act(current_size)
+	var/dist = max((current_size - 2),1)
+	explosion(src.loc,(dist),(dist*2),(dist*4))
+	return

 /obj/item/weapon/storage/backpack/santabag
 	name = "Santa's Gift Bag"
@@ -72,6 +72,7 @@
 	name = "trash bag of holding"
 	desc = "The latest and greatest in custodial convenience, a trashbag that is capable of holding vast quantities of garbage."
 	icon_state = "bluetrashbag"
+	origin_tech = "materials=4;bluespace=4;engineering=4;plasmatech=3"
 	max_combined_w_class = 60
 	storage_slots = 60

@@ -131,6 +132,7 @@
 	desc = "This little bugger can be used to store and transport ores."
 	icon = 'icons/obj/mining.dmi'
 	icon_state = "satchel"
+	origin_tech = "engineering=2"
 	slot_flags = SLOT_BELT | SLOT_POCKET
 	w_class = WEIGHT_CLASS_NORMAL
 	storage_slots = 50
@@ -147,7 +149,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=4;materials=3;engineering=3"
 	icon_state = "satchel_bspace"

 /obj/item/weapon/storage/bag/ore/holding/cyborg
@@ -509,21 +509,9 @@
 	w_class = WEIGHT_CLASS_BULKY
 	max_w_class = WEIGHT_CLASS_SMALL
 	max_combined_w_class = 21 // = 14 * 1.5, not 14 * 2.  This is deliberate
-	origin_tech = "bluespace=4"
+	origin_tech = "bluespace=5;materials=4;engineering=4;plasmatech=5"
 	can_hold = list()

-	proc/failcheck(mob/user as mob)
-		if(prob(src.reliability)) return 1 //No failure
-		if(prob(src.reliability))
-			to_chat(user, "<span class='warning'>The Bluespace portal resists your attempt to add another item.</span>")//light failure
-
-		else
-			to_chat(user, "<span class='warning'>The Bluespace generator malfunctions!</span>")
-			for(var/obj/O in src.contents) //it broke, delete what was in it
-				qdel(O)
-			crit_fail = 1
-			return 0
-
 /obj/item/weapon/storage/belt/bluespace/owlman
 	name = "Owlman's utility belt"
 	desc = "Sometimes people choose justice.  Sometimes, justice chooses you..."
@@ -532,7 +520,7 @@
 	storage_slots = 6
 	max_w_class = WEIGHT_CLASS_NORMAL
 	max_combined_w_class = 18
-	origin_tech = "bluespace=4;syndicate=2"
+	origin_tech = "bluespace=5;materials=4;engineering=4;plasmatech=5"
 	allow_quick_empty = 1
 	can_hold = list(
 		/obj/item/weapon/grenade/smokebomb,
@@ -11,7 +11,7 @@
 	throw_range = 7
 	w_class = WEIGHT_CLASS_BULKY
 	materials = list(MAT_METAL = 500)
-	origin_tech = "combat=1"
+	origin_tech = "combat=1;engineering=1"
 	attack_verb = list("robusted")
 	hitsound = 'sound/weapons/smash.ogg'

@@ -71,7 +71,7 @@
 	name = "suspicious looking toolbox"
 	icon_state = "syndicate"
 	item_state = "toolbox_syndi"
-	origin_tech = "combat=1;syndicate=1"
+	origin_tech = "combat=2;syndicate=1;engineering=2"
 	silent = 1
 	force = 15.0
 	throwforce = 18.0
@@ -165,8 +165,6 @@
 /obj/item/weapon/melee/baton/emp_act(severity)
 	if(bcell)
 		deductcharge(1000 / severity)
-		if(bcell.reliability != 100 && prob(50/severity))
-			bcell.reliability -= 10 / severity
 	..()

 /obj/item/weapon/melee/baton/wash(mob/user, atom/source)
@@ -22,7 +22,7 @@
 	throw_speed = 4
 	throw_range = 20
 	materials = list(MAT_METAL=400)
-	origin_tech = "magnets=1"
+	origin_tech = "magnets=3;bluespace=2"

 /obj/item/weapon/locator/attack_self(mob/user as mob)
 	add_fingerprint(usr)
@@ -102,7 +102,7 @@ Frequency:
 	throw_speed = 3
 	throw_range = 5
 	materials = list(MAT_METAL=10000)
-	origin_tech = "magnets=1;bluespace=3"
+	origin_tech = "magnets=3;bluespace=4"
 	var/active_portals = 0

 /obj/item/weapon/hand_tele/attack_self(mob/user as mob)
@@ -205,7 +205,7 @@
 	wieldsound = 'sound/weapons/saberon.ogg'
 	unwieldsound = 'sound/weapons/saberoff.ogg'
 	armour_penetration = 35
-	origin_tech = "magnets=3;syndicate=4"
+	origin_tech = "magnets=4;syndicate=5"
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	block_chance = 75
 	sharp = 1
@@ -547,7 +547,7 @@
 	throw_range = 1
 	w_class = WEIGHT_CLASS_HUGE
 	var/charged = 5
-	origin_tech = "combat=5;bluespace=4"
+	origin_tech = "combat=4;bluespace=4;plasmatech=7"

 /obj/item/weapon/twohanded/singularityhammer/New()
 	..()
@@ -612,7 +612,7 @@
 	throw_range = 7
 	w_class = WEIGHT_CLASS_HUGE
 	//var/charged = 5
-	origin_tech = "combat=5;powerstorage=5"
+	origin_tech = "combat=4;powerstorage=7"

 /obj/item/weapon/twohanded/mjollnir/proc/shock(mob/living/target as mob)
 	var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread()