Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HereWeGoAgain

code/modules/surgery/organs/mmi_holder.dm

@@ -29,7 +29,7 @@
 /obj/item/organ/internal/brain/mmi_holder/proc/update_from_mmi()
 	if(!stored_mmi)
 		return
-	name = stored_mmi.name
+	name = initial(stored_mmi.name)
 	desc = stored_mmi.desc
 	icon = stored_mmi.icon
 	icon_state = stored_mmi.icon_state

code/modules/surgery/organs/subtypes/machine.dm

@@ -115,15 +115,22 @@
 
 	. = ..()
 
+/obj/item/organ/internal/brain/mmi_holder/posibrain
+	name = "positronic brain"
+
 /obj/item/organ/internal/brain/mmi_holder/posibrain/New()
 	..()
 	stored_mmi = new /obj/item/mmi/robotic_brain/positronic(src)
-	if(owner)
-		stored_mmi.name = "positronic brain ([owner.real_name])"
-		stored_mmi.brainmob.real_name = owner.real_name
+	if(!owner)
+		stored_mmi.forceMove(get_turf(src))
+		qdel(src)
+
+/obj/item/organ/internal/brain/mmi_holder/posibrain/remove(mob/living/user, special = 0)
+	if(stored_mmi && dna)
+		stored_mmi.name = "[initial(name)] ([dna.real_name])"
+		stored_mmi.brainmob.real_name = dna.real_name
 		stored_mmi.brainmob.name = stored_mmi.brainmob.real_name
 		stored_mmi.icon_state = "posibrain-occupied"
-		update_from_mmi()
-	else
-		stored_mmi.forceMove(get_turf(src))
-		qdel(src)
+		if(!stored_mmi.brainmob.dna)
+			stored_mmi.brainmob.dna = dna.Clone()
+	. = ..()

code/modules/surgery/organs/subtypes/standard.dm

@@ -136,9 +136,9 @@
 		if(owner.gloves)
 			owner.unEquip(owner.gloves)
 		if(owner.l_hand)
-			owner.unEquip(owner.l_hand,1)
+			owner.unEquip(owner.l_hand, TRUE)
 		if(owner.r_hand)
-			owner.unEquip(owner.r_hand,1)
+			owner.unEquip(owner.r_hand, TRUE)
 
 	. = ..()
 
@@ -202,7 +202,6 @@
 
 /obj/item/organ/external/head/replaced()
 	name = limb_name
-
 	..()
 
 /obj/item/organ/external/head/receive_damage(brute, burn, sharp, used_weapon = null, list/forbidden_limbs = list(), ignore_resists = FALSE)
@@ -222,6 +221,11 @@
 		alt_head = initial(alt_head)
 		icon_name = initial(icon_name)
 
+/obj/item/organ/external/head/robotize(company, make_tough = 0, convert_all = 1) //Undoes alt_head business to avoid getting in the way of robotization. Make sure we pass all args down the line...
+	alt_head = initial(alt_head)
+	icon_name = initial(icon_name)
+	..()
+
 /obj/item/organ/external/head/set_dna(datum/dna/new_dna)
 	..()
 	new_dna.write_head_attributes(src)