Fixing several reported issues.

code/datums/elements/mob_holder.dm

@@ -164,7 +164,7 @@
 	release()
 
 /obj/item/clothing/head/mob_holder/mob_can_equip(mob/living/M, mob/living/equipper, slot, disable_warning = FALSE, bypass_equip_delay_self = FALSE)
-	if(!ishuman(M)) //monkeys holding monkeys holding monkeys...
+	if(M == held_mob || !ishuman(M)) //monkeys holding monkeys holding monkeys...
 		return FALSE
 	return ..()
 

code/game/objects/items/devices/multitool.dm

@@ -68,10 +68,9 @@
 	update_icon()
 
 /obj/item/multitool/update_icon_state()
+	icon_state = initial(icon_state)
 	if(selected_io)
-		icon_state = "multitool_red"
+		icon_state += "_red"
-	else
-		icon_state = "multitool"
 
 /obj/item/multitool/proc/wire(var/datum/integrated_io/io, mob/user)
 	if(!io.holder.assembly)

code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm

@@ -55,7 +55,6 @@
 	var/gender = NEUTER	//Determines if the accessory will be skipped or included in random hair generations
 	var/gender_specific //Something that can be worn by either gender, but looks different on each
 	var/color_src = MUTCOLORS	//Currently only used by mutantparts so don't worry about hair and stuff. This is the source that this accessory will get its color from. Default is MUTCOLOR, but can also be HAIR, FACEHAIR, EYECOLOR and 0 if none.
-	var/hasinner		//Decides if this sprite has an "inner" part, such as the fleshy parts on ears.
 	var/locked = FALSE		//Is this part locked from roundstart selection? Used for parts that apply effects
 	var/dimension_x = 32
 	var/dimension_y = 32

code/modules/mob/dead/new_player/sprite_accessories/ears.dm

@@ -29,9 +29,10 @@
 /datum/sprite_accessory/ears/human/bigwolfinner
 	name = "Big Wolf (ALT)"
 	icon_state = "bigwolfinner"
-	hasinner = 1
 	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
 	color_src = MATRIXED
+	extra = TRUE
+	extra_color_src = NONE
 
 /datum/sprite_accessory/ears/human/bigwolfdark
 	name = "Dark Big Wolf"
@@ -42,15 +43,17 @@
 /datum/sprite_accessory/ears/human/bigwolfinnerdark
 	name = "Dark Big Wolf (ALT)"
 	icon_state = "bigwolfinnerdark"
-	hasinner = 1
 	icon = 'modular_citadel/icons/mob/mam_ears.dmi'
 	color_src = MATRIXED
+	extra = TRUE
+	extra_color_src = NONE
 
 /datum/sprite_accessory/ears/cat
 	name = "Cat"
 	icon_state = "cat"
-	hasinner = 1
 	color_src = HAIR
+	extra = TRUE
+	extra_color_src = NONE
 
 /datum/sprite_accessory/ears/human/cow
 	name = "Cow"
@@ -196,7 +199,8 @@
 /datum/sprite_accessory/mam_ears/bigwolfinner
 	name = "Big Wolf (ALT)"
 	icon_state = "bigwolfinner"
-	hasinner = 1
+	extra = TRUE
+	extra_color_src = NONE
 
 /datum/sprite_accessory/mam_ears/bigwolfdark
 	name = "Dark Big Wolf"
@@ -205,12 +209,13 @@
 /datum/sprite_accessory/mam_ears/bigwolfinnerdark
 	name = "Dark Big Wolf (ALT)"
 	icon_state = "bigwolfinnerdark"
-	hasinner = 1
+	extra = TRUE
+	extra_color_src = NONE
 
 /datum/sprite_accessory/mam_ears/cat
 	name = "Cat"
 	icon_state = "cat"
-	hasinner = 1
+	icon = 'icons/mob/mutant_bodyparts.dmi'
 	color_src = HAIR
 
 /datum/sprite_accessory/mam_ears/catbig

code/modules/mob/living/carbon/human/species.dm

@@ -909,22 +909,6 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 
 			standing += accessory_overlay
 
-			if(S.hasinner)
-				var/mutable_appearance/inner_accessory_overlay = mutable_appearance(S.icon, layer = -layer)
-				if(S.gender_specific)
-					inner_accessory_overlay.icon_state = "[g]_[bodypart]inner_[S.icon_state]_[layertext]"
-				else
-					inner_accessory_overlay.icon_state = "m_[bodypart]inner_[S.icon_state]_[layertext]"
-
-				if(S.center)
-					inner_accessory_overlay = center_image(inner_accessory_overlay, S.dimension_x, S.dimension_y)
-
-				if(OFFSET_MUTPARTS in H.dna.species.offset_features)
-					inner_accessory_overlay.pixel_x += H.dna.species.offset_features[OFFSET_MUTPARTS][1]
-					inner_accessory_overlay.pixel_y += H.dna.species.offset_features[OFFSET_MUTPARTS][2]
-
-				standing += inner_accessory_overlay
-
 			if(S.extra) //apply the extra overlay, if there is one
 				var/mutable_appearance/extra_accessory_overlay = mutable_appearance(S.icon, layer = -layer)
 				if(S.gender_specific)

code/modules/mob/living/carbon/monkey/combat.dm

@@ -111,7 +111,7 @@
 	if(pickupTarget)
 		if(restrained() || blacklistItems[pickupTarget] || HAS_TRAIT(pickupTarget, TRAIT_NODROP))
 			pickupTarget = null
-		else
+		else if(!isobj(loc) || istype(loc, /obj/item/clothing/head/mob_holder))
 			pickupTimer++
 			if(pickupTimer >= 4)
 				blacklistItems[pickupTarget] ++
@@ -126,10 +126,8 @@
 						pickupTarget = null
 						pickupTimer = 0
 					else if(ismob(pickupTarget.loc)) // in someones hand
-						if(istype(pickupTarget, /obj/item/clothing/head/mob_holder/))
+						if(istype(pickupTarget, /obj/item/clothing/head/mob_holder))
-							var/obj/item/clothing/head/mob_holder/h = pickupTarget
+							return//dont let them pickpocket themselves or hold other monkys.
-							if(h && h.held_mob==src)
-								return//dont let them pickpocket themselves
 						var/mob/M = pickupTarget.loc
 						if(!pickpocketing)
 							pickpocketing = TRUE

code/modules/surgery/bodyparts/dismemberment.dm

@@ -295,6 +295,7 @@
 		O.Insert(C)
 
 	update_bodypart_damage_state()
+	update_disabled()
 
 	C.updatehealth()
 	C.update_body()
@@ -302,7 +303,6 @@
 	C.update_damage_overlays()
 	C.update_mobility()
 
-
 /obj/item/bodypart/head/attach_limb(mob/living/carbon/C, special)
 	//Transfer some head appearance vars over
 	if(brain)