Merge pull request #1440 from caelaislinn/master

shielding generator fixes

code/WorkInProgress/Cael_Aislinn/external_shield_gen.dm

@@ -49,16 +49,3 @@
 			icon_state = "generator0"
 			src.active = 0*/
 	..()
-
-/obj/item/weapon/circuitboard/shield_gen/external
-	name = "Circuit Board (External Shield Generator)"
-	build_path = "/obj/machinery/shield_gen/external"
-	board_type = "machine"
-	origin_tech = "electromagnetic=3;engineering=2;power=1"
-	frame_desc = "Requires, 2 Cable Coil, 2 Nano Manipulator, 1 Advanced Matter Bin, 1 Console Screen and 1 High-Power Micro-Laser. "
-	req_components = list(
-							"/obj/item/weapon/cable_coil" = 2,
-							"/obj/item/weapon/stock_parts/manipulator/nano" = 2,
-							"/obj/item/weapon/stock_parts/matter_bin/adv" = 1,
-							"/obj/item/weapon/stock_parts/console_screen" = 1,
-							"/obj/item/weapon/stock_parts/micro_laser/high" = 1)

code/WorkInProgress/Cael_Aislinn/shield_capacitor.dm

@@ -108,6 +108,10 @@
 		else
 			user << "\red Access denied."
 
+	else if(istype(W, /obj/item/weapon/wrench))
+		src.anchored = !src.anchored
+		src.visible_message("\blue \icon[src] [src] has been [anchored ? "bolted to the floor" : "unbolted from the floor"] by [user].")
+
 	else
 		src.add_fingerprint(user)
 		user << "\red You hit the [src.name] with your [W.name]!"

code/WorkInProgress/Cael_Aislinn/shield_gen.dm

@@ -25,7 +25,7 @@
 	var/max_field_strength = 10
 	var/time_since_fail = 100
 	var/energy_conversion_rate = 0.01	//how many renwicks per watt?
-	var/flicker_shield_glitch = 1		//shield is slightly faulty, and flickers
+	var/flicker_shield_glitch = 1		//shield is slightly faulty and flickers - don't think this is working as intended
 	//
 	use_power = 1			//0 use nothing
 							//1 use idle power
@@ -129,15 +129,8 @@
 				if(E.strength < target_field_strength)
 					E.strength += strengthen_rate
 
-				retry:
 				if(stored_renwicks - E.strength < 0)
-					if(owned_capacitor.stored_charge > 0)
-						var/emergency_renwicks = min(E.strength, owned_capacitor.stored_charge * energy_conversion_rate)
-						owned_capacitor.stored_charge -= emergency_renwicks / energy_conversion_rate
-						stored_renwicks += emergency_renwicks
-						goto retry
-					else
-						E.strength = stored_renwicks
+					E.strength = stored_renwicks
 				stored_renwicks -= E.strength
 
 				average_field_strength += E.strength
@@ -175,6 +168,10 @@
 		else
 			user << "\red Access denied."
 
+	else if(istype(W, /obj/item/weapon/wrench))
+		src.anchored = !src.anchored
+		src.visible_message("\blue \icon[src] [src] has been [anchored?"bolted to the floor":"unbolted from the floor"] by [user].")
+
 	else
 		src.add_fingerprint(user)
 		user << "\red You hit the [src.name] with your [W.name]!"

code/game/machinery/computer/buildandrepair.dm

@@ -240,7 +240,7 @@
 	name = "Circuit Board (Shield Capacitor)"
 	build_path = "/obj/machinery/shield_capacitor"
 	board_type = "machine"
-	origin_tech = "electromagnetic=3;engineering=2;power=1"
+	origin_tech = "programming=3;electromagnetic=3;engineering=2;power=1"
 	frame_desc = "Requires, 2 Cable Coil, 2 Nano Manipulator, 1 Advanced Matter Bin, 1 Console Screen and 1 High-Power Micro-Laser. "
 	req_components = list(
 							"/obj/item/weapon/cable_coil" = 2,
@@ -249,11 +249,11 @@
 							"/obj/item/weapon/stock_parts/console_screen" = 1,
 							"/obj/item/weapon/stock_parts/micro_laser/high" = 1)
 
-/obj/item/weapon/circuitboard/shield_generator
-	name = "Circuit Board (Shield Generator)"
-	build_path = "/obj/machinery/shield_generator"
+/obj/item/weapon/circuitboard/shield_generator_external
+	name = "Circuit Board (Hull Shield Generator)"
+	build_path = "/obj/machinery/shield_generator/external"
 	board_type = "machine"
-	origin_tech = "electromagnetic=3;engineering=2;power=1"
+	origin_tech = "programming=3;electromagnetic=3;engineering=2;power=1"
 	frame_desc = "Requires, 2 Cable Coil, 2 Nano Manipulator, 1 Advanced Matter Bin, 1 Console Screen and 1 High-Power Micro-Laser. "
 	req_components = list(
 							"/obj/item/weapon/cable_coil" = 2,

code/modules/research/designs.dm

@@ -1201,6 +1201,23 @@ datum
 			materials = list("$glass" = 2000, "acid" = 20)
 			build_path = "/obj/item/weapon/circuitboard/mechfab"
 
+		shieldgenex
+			name = "Hull Shield Generator Board"
+			desc = "The circuit board for an External Hull Shield Generator"
+			id = "shieldgen"
+			req_tech = list("programming" = 3, "electromagnetic" = 3, "engineering" = 2, "power" = 1)
+			build_type = IMPRINTER
+			materials = list("$glass" = 2000, "acid" = 20)
+			build_path = "/obj/item/weapon/circuitboard/shield_generator_external"
+
+		shieldcap
+			name = "Shield Capacitor Board"
+			desc = "The circuit board for a Shield Capacitor"
+			id = "shieldcap"
+			req_tech = list("programming" = 3, "electromagnetic" = 3, "engineering" = 2, "power" = 1)
+			build_type = IMPRINTER
+			materials = list("$glass" = 2000, "acid" = 20)
+			build_path = "/obj/item/weapon/circuitboard/shield_capacitor"
 
 /////////////////////////////////////////
 ////////////Power Stuff//////////////////