HOTFIX

code/modules/organs/internal/brain.dm

@@ -82,6 +82,8 @@
 	if(H.mind)
 		H.mind.transfer_to(brainmob)
 
+	brainmob.languages = H.languages
+
 	brainmob << "<span class='notice'>You feel slightly disoriented. That's normal when you're just \a [initial(src.name)].</span>"
 	callHook("debrain", list(brainmob))
 

code/modules/organs/organ.dm

@@ -78,8 +78,9 @@ var/list/organ_cache = list()
 /obj/item/organ/proc/set_dna(var/datum/dna/new_dna)
 	if(new_dna)
 		dna = new_dna.Clone()
-		blood_DNA.Cut()
-		blood_DNA[dna.unique_enzymes] = dna.b_type
+		if(blood_DNA)
+			blood_DNA.Cut()
+			blood_DNA[dna.unique_enzymes] = dna.b_type
 
 /obj/item/organ/proc/die()
 	if(robotic >= ORGAN_ROBOT)

code/modules/organs/robolimbs.dm

@@ -74,6 +74,12 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
 	unavailable_to_build = 1
 	parts = list(BP_HEAD)
 
+/datum/robolimb/bishop_alt2
+	company = "Bishop - Rook"
+	desc = "This limb has a solid plastic casing with blue lights along it."
+	icon = 'icons/mob/human_races/cyberlimbs/bishop/bishop_alt2.dmi'
+	unavailable_to_build = 1
+
 /datum/robolimb/bishop_monitor
 	company = "Bishop Monitor"
 	desc = "Bishop Cybernetics' unique spin on a popular prosthetic head model. The themes conflict in an intriguing way."
@@ -82,6 +88,19 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
 	parts = list(BP_HEAD)
 	monitor_styles = standard_monitor_styles
 
+/datum/robolimb/cybersolutions
+	company = "Cyber Solutions"
+	desc = "This limb is grey and rough, with little in the way of aesthetic."
+	icon = 'icons/mob/human_races/cyberlimbs/cybersolutions/cybersolutions_main.dmi'
+	unavailable_to_build = 1
+
+/datum/robolimb/cybersolutions_alt1
+	company = "Cyber Solutions - Array"
+	desc = "This limb is simple and functional; array of sensors on a featureless case."
+	icon = 'icons/mob/human_races/cyberlimbs/cybersolutions/cybersolutions_alt1.dmi'
+	unavailable_to_build = 1
+	parts = list(BP_HEAD)
+
 /datum/robolimb/grayson
 	company = "Grayson"
 	desc = "This limb has a sturdy and heavy build to it."
@@ -131,6 +150,13 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
 		rgb=hephaestus_alt_rgb;\
 		rainbow=hephaestus_alt_rainbow"
 
+/datum/robolimb/hephaestus_alt2
+	company = "Hephaestus - Athena"
+	desc = "This rather thick limb has a militaristic green plating."
+	icon = 'icons/mob/human_races/cyberlimbs/hephaestus/hephaestus_alt2.dmi'
+	unavailable_to_build = 1
+
+
 /datum/robolimb/hephaestus_monitor
 	company = "Hephaestus Monitor"
 	desc = "Hephaestus' unique spin on a popular prosthetic head model. It looks rugged and sturdy."
@@ -182,6 +208,13 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
 	unavailable_to_build = 1
 	parts = list(BP_HEAD)
 
+/datum/robolimb/wardtakahashi_alt2
+	company = "Ward-Takahashi - Spirit"
+	desc = "This limb has white and purple features, with a heavier casing."
+	icon = 'icons/mob/human_races/cyberlimbs/wardtakahashi/wardtakahashi_alt2.dmi'
+	unavailable_to_build = 1
+
+
 /datum/robolimb/wardtakahashi_monitor
 	company = "Ward-Takahashi Monitor"
 	desc = "Ward-Takahashi's unique spin on a popular prosthetic head model. It looks sleek and modern."
@@ -197,14 +230,23 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
 	unavailable_to_build = 1
 
 /datum/robolimb/xion_alt1
-	company = "Xion Mfg. - Breach"
+	company = "Xion - Breach"
 	desc = "This limb has a minimalist black and red casing. Looks a bit menacing."
 	icon = 'icons/mob/human_races/cyberlimbs/xion/xion_alt1.dmi'
 	unavailable_to_build = 1
 	parts = list(BP_HEAD)
 
+/datum/robolimb/xion_alt2
+	company = "Xion - Hull"
+	desc = "This limb has a thick orange casing with steel plating."
+	icon = 'icons/mob/human_races/cyberlimbs/xion/xion_alt2.dmi'
+	unavailable_to_build = 1
+	monitor_styles = "blank=xion_off;\
+		green=xion_green;\
+		rgb=xion_rgb"
+
 /datum/robolimb/xion_monitor
-	company = "Xion Mfg. Monitor"
+	company = "Xion Monitor"
 	desc = "Xion Mfg.'s unique spin on a popular prosthetic head model. It looks and minimalist and utilitarian."
 	icon = 'icons/mob/human_races/cyberlimbs/xion/xion_monitor.dmi'
 	unavailable_to_build = 1
@@ -232,6 +274,9 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
 /obj/item/weapon/disk/limb/bishop
 	company = "Bishop"
 
+/obj/item/weapon/disk/limb/cybersolutions
+	company = "Cyber Solutions"
+
 /obj/item/weapon/disk/limb/grayson
 	company = "Grayson"
 

code/modules/organs/subtypes/machine.dm

@@ -62,6 +62,8 @@
 	stored_mmi.icon_state = "mmi_full"
 	icon_state = stored_mmi.icon_state
 
+	stored_mmi.brainmob.languages = owner.languages
+
 	if(owner && owner.stat == DEAD)
 		owner.stat = 0
 		dead_mob_list -= owner
@@ -92,6 +94,8 @@
 	stored_mmi.icon_state = "posibrain-occupied"
 	icon_state = stored_mmi.icon_state
 
+	stored_mmi.brainmob.languages = owner.languages
+
 /obj/item/organ/internal/mmi_holder/robot
 	name = "digital brain interface"
 	brain_type = /obj/item/device/mmi/digital/robot
@@ -100,4 +104,6 @@
 /obj/item/organ/internal/mmi_holder/robot/update_from_mmi()
 	..()
 	stored_mmi.icon_state = "mainboard"
-	icon_state = stored_mmi.icon_state
+	icon_state = stored_mmi.icon_state
+
+	stored_mmi.brainmob.languages = owner.languages

code/modules/organs/wound.dm

@@ -85,10 +85,12 @@
 		return src.damage / src.amount
 
 	proc/can_autoheal()
+		if(is_treated())
+			return TRUE
 		if(src.wound_damage() <= autoheal_cutoff)
-			return 1
-
-		return is_treated()
+			if(created + 10 MINUTES > world.time) // Wounds don't autoheal for ten minutes if not bandaged.
+				return FALSE
+			return TRUE
 
 	// checks whether the wound has been appropriately treated
 	proc/is_treated()