tweaks to shield generators, added shield generator to the admin shuttle (would have added it to other shuttles, but most are too small)

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

code/WorkInProgress/Cael_Aislinn/external_shield_gen.dm

@@ -34,18 +34,3 @@
 			closed += T
 
 	return closed
-
-/obj/machinery/shield_gen/external/process()
-	/*if(stat & (NOPOWER|BROKEN))
-		return*/
-	if(!active)
-		return
-	/*spawn(100)
-		power()*/
-	/*if(src.active >= 1)
-		if(src.power == 0)
-			src.visible_message("\red The [src.name] shuts down due to lack of power!", \
-				"You hear heavy droning fade out")
-			icon_state = "generator0"
-			src.active = 0*/
-	..()

code/WorkInProgress/Cael_Aislinn/shield_capacitor.dm

@@ -26,12 +26,14 @@
 	var/charge_rate = 100
 
 /obj/machinery/shield_capacitor/New()
+	spawn(10)
+		for(var/obj/machinery/shield_gen/possible_gen in range(1, src))
+			world << "possible_gen:[possible_gen], get_dir:[get_dir(src, possible_gen)], src.dir:[src.dir]"
+			if(get_dir(src, possible_gen) == src.dir)
+				target_generator = possible_gen
+				possible_gen.owned_capacitor = src
+				break
 	..()
-	target_generator = locate() in get_step(src,dir)
-	if(target_generator && !target_generator.owned_capacitor)
-		target_generator.owned_capacitor = src
-	/*spawn(10)
-		check_powered()*/
 
 /obj/machinery/shield_capacitor/verb/rotate()
 	set name = "Rotate Clockwise"
@@ -42,10 +44,9 @@
 		usr << "It is fastened to the floor!"
 		return 0
 	src.dir = turn(src.dir, 270)
-	for(var/obj/machinery/shield_gen/possible_gen in range(1))
-		if(get_dir(src, possible_gen) == dir)
-			possible_gen.owned_capacitor = src
-			break
+	target_generator = locate() in get_step(src,dir)
+	if(target_generator && !target_generator.owned_capacitor)
+		target_generator.owned_capacitor = src
 	return 1
 
 /obj/machinery/shield_capacitor/power_change()

code/WorkInProgress/Cael_Aislinn/shield_gen.dm

@@ -34,14 +34,15 @@
 	active_power_usage = 100
 
 /obj/machinery/shield_gen/New()
-	..()
+	spawn(10)
+		for(var/obj/machinery/shield_capacitor/possible_cap in range(1, src))
+			world << "possible_cap:[possible_cap], get_dir:[get_dir(possible_cap, src)], possible_cap.dir:[possible_cap.dir]"
+			if(get_dir(possible_cap, src) == possible_cap.dir)
+				owned_capacitor = possible_cap
+				possible_cap.target_generator = src
+				break
 	field = new/list()
-	for(var/obj/machinery/shield_capacitor/possible_cap in range(1))
-		if(get_dir(possible_cap, src) == possible_cap.dir)
-			owned_capacitor = possible_cap
-			break
-	/*spawn(10)
-		check_powered()*/
+	..()
 
 //copied from a copypaste. DRY, right?
 /obj/machinery/shield_gen/proc/check_powered()
@@ -78,12 +79,6 @@
 
 /obj/machinery/shield_gen/process()
 
-	if(!owned_capacitor)
-		for(var/obj/machinery/shield_capacitor/possible_cap in range(1))
-			if(get_dir(possible_cap, src) == possible_cap.dir)
-				owned_capacitor = possible_cap
-				break
-
 	if(active && field.len)
 		var/stored_renwicks = 0
 		var/target_field_strength = min(average_field_strength + strengthen_rate, max_field_strength)