Merge branch 'dev' into ofChemistryAndStuff

Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/organs/organ_internal.dm
	code/modules/organs/organ_objects.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/syringes.dm

code/modules/research/designs.dm

@@ -358,7 +358,7 @@ datum/design/aimodule/safeguard
 	build_path = /obj/item/weapon/aiModule/safeguard
 
 datum/design/aimodule/onehuman
-	name = "OneHuman"
+	name = "OneCrewMember"
 	id = "onehuman"
 	req_tech = list("programming" = 4, "materials" = 6)
 	build_path = /obj/item/weapon/aiModule/oneHuman

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

@@ -13,7 +13,7 @@
 
 			if(ishuman(toucher))
 				var/mob/living/carbon/human/H = toucher
-				for(var/datum/organ/external/affecting in H.organs)
+				for(var/obj/item/organ/external/affecting in H.organs)
 					if(affecting && istype(affecting))
 						affecting.heal_damage(25 * weakness, 25 * weakness)
 				//H:heal_organ_damage(25, 25)

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

@@ -1,49 +1,49 @@
-
-/datum/artifact_effect/hurt
-	effecttype = "hurt"
-	effect_type = 5
-
-/datum/artifact_effect/hurt/DoEffectTouch(var/mob/toucher)
-	if(toucher)
-		var/weakness = GetAnomalySusceptibility(toucher)
-		if(iscarbon(toucher) && prob(weakness * 100))
-			var/mob/living/carbon/C = toucher
-			C << "\red A painful discharge of energy strikes you!"
-			C.adjustOxyLoss(rand(5,25) * weakness)
-			C.adjustToxLoss(rand(5,25) * weakness)
-			C.adjustBruteLoss(rand(5,25) * weakness)
-			C.adjustFireLoss(rand(5,25) * weakness)
-			C.adjustBrainLoss(rand(5,25) * weakness)
-			C.radiation += 25 * weakness
-			C.nutrition -= min(50 * weakness, C.nutrition)
-			C.make_dizzy(6 * weakness)
-			C.weakened += 6 * weakness
-
-/datum/artifact_effect/hurt/DoEffectAura()
-	if(holder)
-		var/turf/T = get_turf(holder)
-		for (var/mob/living/carbon/C in range(src.effectrange,T))
-			var/weakness = GetAnomalySusceptibility(C)
-			if(prob(weakness * 100))
-				if(prob(10))
-					C << "\red You feel a painful force radiating from something nearby."
-				C.adjustBruteLoss(1 * weakness)
-				C.adjustFireLoss(1 * weakness)
-				C.adjustToxLoss(1 * weakness)
-				C.adjustOxyLoss(1 * weakness)
-				C.adjustBrainLoss(1 * weakness)
-				C.updatehealth()
-
-/datum/artifact_effect/hurt/DoEffectPulse()
-	if(holder)
-		var/turf/T = get_turf(holder)
-		for (var/mob/living/carbon/C in range(effectrange, T))
-			var/weakness = GetAnomalySusceptibility(C)
-			if(prob(weakness * 100))
-				C << "\red A wave of painful energy strikes you!"
-				C.adjustBruteLoss(3 * weakness)
-				C.adjustFireLoss(3 * weakness)
-				C.adjustToxLoss(3 * weakness)
-				C.adjustOxyLoss(3 * weakness)
-				C.adjustBrainLoss(3 * weakness)
-				C.updatehealth()
+
+/datum/artifact_effect/hurt
+	effecttype = I_HURT
+	effect_type = 5
+
+/datum/artifact_effect/hurt/DoEffectTouch(var/mob/toucher)
+	if(toucher)
+		var/weakness = GetAnomalySusceptibility(toucher)
+		if(iscarbon(toucher) && prob(weakness * 100))
+			var/mob/living/carbon/C = toucher
+			C << "\red A painful discharge of energy strikes you!"
+			C.adjustOxyLoss(rand(5,25) * weakness)
+			C.adjustToxLoss(rand(5,25) * weakness)
+			C.adjustBruteLoss(rand(5,25) * weakness)
+			C.adjustFireLoss(rand(5,25) * weakness)
+			C.adjustBrainLoss(rand(5,25) * weakness)
+			C.radiation += 25 * weakness
+			C.nutrition -= min(50 * weakness, C.nutrition)
+			C.make_dizzy(6 * weakness)
+			C.weakened += 6 * weakness
+
+/datum/artifact_effect/hurt/DoEffectAura()
+	if(holder)
+		var/turf/T = get_turf(holder)
+		for (var/mob/living/carbon/C in range(src.effectrange,T))
+			var/weakness = GetAnomalySusceptibility(C)
+			if(prob(weakness * 100))
+				if(prob(10))
+					C << "\red You feel a painful force radiating from something nearby."
+				C.adjustBruteLoss(1 * weakness)
+				C.adjustFireLoss(1 * weakness)
+				C.adjustToxLoss(1 * weakness)
+				C.adjustOxyLoss(1 * weakness)
+				C.adjustBrainLoss(1 * weakness)
+				C.updatehealth()
+
+/datum/artifact_effect/hurt/DoEffectPulse()
+	if(holder)
+		var/turf/T = get_turf(holder)
+		for (var/mob/living/carbon/C in range(effectrange, T))
+			var/weakness = GetAnomalySusceptibility(C)
+			if(prob(weakness * 100))
+				C << "\red A wave of painful energy strikes you!"
+				C.adjustBruteLoss(3 * weakness)
+				C.adjustFireLoss(3 * weakness)
+				C.adjustToxLoss(3 * weakness)
+				C.adjustOxyLoss(3 * weakness)
+				C.adjustBrainLoss(3 * weakness)
+				C.updatehealth()