Construction Update

code/modules/research/circuitprinter.dm

@@ -8,6 +8,7 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid).
 	name = "Circuit Imprinter"
 	icon_state = "circuit_imprinter"
 	flags = OPENCONTAINER
+	circuit = /obj/item/weapon/circuitboard/circuit_imprinter
 	var/list/datum/design/queue = list()
 	var/progress = 0
 
@@ -24,7 +25,6 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid).
 /obj/machinery/r_n_d/circuit_imprinter/New()
 	..()
 	component_parts = list()
-	component_parts += new /obj/item/weapon/circuitboard/circuit_imprinter(src)
 	component_parts += new /obj/item/weapon/stock_parts/matter_bin(src)
 	component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
 	component_parts += new /obj/item/weapon/reagent_containers/glass/beaker(src)

code/modules/research/destructive_analyzer.dm

@@ -11,7 +11,7 @@ Note: Must be placed within 3 tiles of the R&D Console
 	icon_state = "d_analyzer"
 	var/obj/item/weapon/loaded_item = null
 	var/decon_mod = 0
-
+	circuit = /obj/item/weapon/circuitboard/destructive_analyzer
 	use_power = 1
 	idle_power_usage = 30
 	active_power_usage = 2500
@@ -19,7 +19,6 @@ Note: Must be placed within 3 tiles of the R&D Console
 /obj/machinery/r_n_d/destructive_analyzer/New()
 	..()
 	component_parts = list()
-	component_parts += new /obj/item/weapon/circuitboard/destructive_analyzer(src)
 	component_parts += new /obj/item/weapon/stock_parts/scanning_module(src)
 	component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
 	component_parts += new /obj/item/weapon/stock_parts/micro_laser(src)

code/modules/research/protolathe.dm

@@ -2,7 +2,7 @@
 	name = "Protolathe"
 	icon_state = "protolathe"
 	flags = OPENCONTAINER
-
+	circuit = /obj/item/weapon/circuitboard/protolathe
 	use_power = 1
 	idle_power_usage = 30
 	active_power_usage = 5000
@@ -20,7 +20,6 @@
 /obj/machinery/r_n_d/protolathe/New()
 	..()
 	component_parts = list()
-	component_parts += new /obj/item/weapon/circuitboard/protolathe(src)
 	component_parts += new /obj/item/weapon/stock_parts/matter_bin(src)
 	component_parts += new /obj/item/weapon/stock_parts/matter_bin(src)
 	component_parts += new /obj/item/weapon/stock_parts/manipulator(src)

code/modules/research/server.dm

@@ -13,11 +13,11 @@
 	idle_power_usage = 800
 	var/delay = 10
 	req_access = list(access_rd) //Only the R&D can change server settings.
+	circuit = /obj/item/weapon/circuitboard/rdserver
 
 /obj/machinery/r_n_d/server/New()
 	..()
 	component_parts = list()
-	component_parts += new /obj/item/weapon/circuitboard/rdserver(src)
 	component_parts += new /obj/item/weapon/stock_parts/scanning_module(src)
 	component_parts += new /obj/item/stack/cable_coil(src)
 	component_parts += new /obj/item/stack/cable_coil(src)

code/modules/research/xenoarchaeology/artifact/artifact.dm

@@ -108,10 +108,9 @@
 	. = ..()
 	if(istype(AM,/mob/living/carbon/human))
 		var/mob/living/carbon/human/H = AM
-		if((istype(H.l_hand,/obj/item/weapon/pickaxe)) && (!H.hand))
-			attackby(H.l_hand,H)
-		else if((istype(H.r_hand,/obj/item/weapon/pickaxe)) && H.hand)
-			attackby(H.r_hand,H)
+		var/obj/item/weapon/pickaxe/P = H.get_inactive_hand()
+		if(istype(P))
+			src.attackby(P, H)
 
 	else if(istype(AM,/mob/living/silicon/robot))
 		var/mob/living/silicon/robot/R = AM

code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm

@@ -181,7 +181,7 @@
 				out += " have been detected "
 
 				//how the artifact does it's effect
-				switch(A.my_effect.effect_type)
+				switch(A.my_effect.effect)
 					if(1)
 						out += " emitting in an ambient energy field."
 					if(2)
@@ -224,7 +224,7 @@
 						out += "low level radiation"
 
 				//how the artifact does it's effect
-				switch(A.secondary_effect.effect_type)
+				switch(A.secondary_effect.effect)
 					if(1)
 						out += " emitting in an ambient energy field."
 					if(2)

code/modules/research/xenoarchaeology/master_controller.dm

@@ -9,9 +9,12 @@
 #define ARTIFACTSPAWNNUM_LOWER 6
 #define ARTIFACTSPAWNNUM_UPPER 12
 
-datum/controller/game_controller/proc/SetupXenoarch()
+/datum/controller/game_controller/proc/SetupXenoarch()
 	//create digsites
 	for(var/turf/simulated/mineral/M in block(locate(1,1,1), locate(world.maxx, world.maxy, world.maxz)))
+		if(!(M.density))
+			continue
+			
 		if(isnull(M.geologic_data))
 			M.geologic_data = new/datum/geosample(M)