Merge pull request #673 from ArchieBeepBoop/paraplegic

Fixes Paraplegic Free Real Estate

code/datums/elements/mob_holder.dm

@@ -167,7 +167,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/modules/mob/living/carbon/carbon.dm

@@ -945,7 +945,7 @@
 /mob/living/carbon/proc/update_disabled_bodyparts()
 	for(var/B in bodyparts)
 		var/obj/item/bodypart/BP = B
-		BP.update_disabled()
+		BP.update_disabled(silent)
 
 /mob/living/carbon/vv_get_dropdown()
 	. = ..()

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

@@ -117,7 +117,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] ++
@@ -132,10 +132,8 @@
 						pickupTarget = null
 						pickupTimer = 0
 					else if(ismob(pickupTarget.loc)) // in someones hand
-						if(istype(pickupTarget, /obj/item/clothing/head/mob_holder/))
-							var/obj/item/clothing/head/mob_holder/h = pickupTarget
-							if(h && h.held_mob==src)
-								return//dont let them pickpocket themselves
+						if(istype(pickupTarget, /obj/item/clothing/head/mob_holder))
+							return//dont let them pickpocket themselves or hold other monkys.
 						var/mob/M = pickupTarget.loc
 						if(!pickpocketing)
 							pickpocketing = TRUE

code/modules/surgery/bodyparts/bodyparts.dm

@@ -228,8 +228,6 @@
 		total += stamina_dam
 	return total
 
-//Checks disabled status thresholds
-
 //Checks disabled status thresholds
 /obj/item/bodypart/proc/update_disabled()
 	set_disabled(is_disabled())
@@ -257,11 +255,12 @@
 
 /obj/item/bodypart/proc/set_disabled(new_disabled)
 	if(disabled == new_disabled)
-		return
+		return FALSE
 	disabled = new_disabled
 	owner.update_health_hud() //update the healthdoll
 	owner.update_body()
 	owner.update_canmove()
+	return TRUE
 
 //Updates an organ's brute/burn states for use by update_damage_overlays()
 //Returns 1 if we need to update overlays. 0 otherwise.

code/modules/surgery/bodyparts/dismemberment.dm

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

code/modules/surgery/bodyparts/helpers.dm

@@ -110,14 +110,14 @@
 /mob/proc/get_leg_ignore()
 	return FALSE
 
-/mob/living/carbon/alien/larva/get_leg_ignore()
-	return TRUE
-
-/mob/living/carbon/human/get_leg_ignore()
-	if((movement_type & FLYING) || floating)
+/mob/living/carbon/get_leg_ignore()
+	if(movement_type & (FLYING|floating))
 		return TRUE
 	return FALSE
 
+/mob/living/carbon/alien/larva/get_leg_ignore()
+	return TRUE
+
 /mob/living/proc/get_missing_limbs()
 	return list()
 
@@ -348,4 +348,4 @@
 				. |= HAND_LEFT
 			if(ARM_RIGHT)
 				. |= HAND_RIGHT
-		. |= L.body_part
+		. |= L.body_part