Fixes and tweaks to the previous.

code/modules/organs/organ_alien.dm

@@ -39,6 +39,7 @@
 
 /obj/item/organ/diona/removed(var/mob/living/target,var/mob/living/user)
 
+	..()
 	var/mob/living/carbon/human/H = target
 	if(!istype(target))
 		del(src)
@@ -51,10 +52,10 @@
 	if(!diona)
 		del(src)
 
-	var/mob/living/carbon/alien/diona/D = new(get_turf(src))
-	diona.request_player(D)
-
-	del(src)
+	spawn(1) // So it has time to be thrown about by the gib() proc.
+		var/mob/living/carbon/alien/diona/D = new(get_turf(src))
+		diona.request_player(D)
+		del(src)
 
 // These are different to the standard diona organs as they have a purpose in other
 // species (absorbing radiation and light respectively)
@@ -221,6 +222,8 @@
 	icon_state = "brain-prosthetic"
 	organ_tag = "stack"
 	robotic = 2
+	prosthetic_name = null
+	prosthetic_icon = null
 
 /obj/item/organ/stack/vox
 	name = "vox cortical stack"

code/modules/organs/organ_external.dm

@@ -662,10 +662,9 @@ Note that amputating the affected organ does in fact remove the infection from t
 		"<span class='moderate'><b>Your [display_name] goes flying off!</b></span>",\
 		"You hear a terrible sound of ripping tendons and flesh.")
 
-		if(organ)
-			//Throw organs around
-			var/lol = pick(cardinal)
-			step(organ,lol)
+		//Throw organs around
+		if(istype(owner.loc,/turf) && organ)
+			step(organ,pick(cardinal))
 
 		owner.update_body(1)
 

code/modules/organs/organ_internal.dm

@@ -250,6 +250,14 @@
 /datum/organ/internal/brain/xeno
 	removed_type = /obj/item/organ/brain/xeno
 
+/datum/organ/internal/brain/golem
+	name = "golem chem"
+	removed_type = /obj/item/organ/brain/golem
+
+/datum/organ/internal/brain/slime
+	name = "slime core"
+	removed_type = /obj/item/organ/brain/slime
+
 /datum/organ/internal/eyes
 	name = "eyes"
 	parent_organ = "head"
@@ -271,7 +279,13 @@
 
 	if(!removed_type) return 0
 
-	var/obj/item/organ/removed_organ = new removed_type(get_turf(user))
+	var/turf/target_loc
+	if(user)
+		target_loc = get_turf(user)
+	else
+		target_loc = get_turf(owner)
+
+	var/obj/item/organ/removed_organ = new removed_type(target_loc)
 
 	if(istype(removed_organ))
 		removed_organ.organ_data = src

code/modules/organs/organ_objects.dm

@@ -153,10 +153,10 @@
 
 /obj/item/organ/proc/removed(var/mob/living/target,var/mob/living/user)
 
-	if(!target || !user)
+	if(!target)
 		return
 
-	if(organ_data.vital)
+	if(target && user && organ_data.vital)
 		user.attack_log += "\[[time_stamp()]\]<font color='red'> removed a vital organ ([src]) from [target.name] ([target.ckey]) (INTENT: [uppertext(user.a_intent)])</font>"
 		target.attack_log += "\[[time_stamp()]\]<font color='orange'> had a vital organ ([src]) removed by [user.name] ([user.ckey]) (INTENT: [uppertext(user.a_intent)])</font>"
 		msg_admin_attack("[user.name] ([user.ckey]) removed a vital organ ([src]) from [target.name] ([target.ckey]) (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")