Merge resolution.

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

@@ -84,7 +84,7 @@
 
 /mob/living/carbon/human/proc/Drain()
 	ChangeToHusk()
-	//mutations |= NOCLONE
+	mutations |= HUSK
 	return
 
 /mob/living/carbon/human/proc/ChangeToSkeleton()

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

@@ -26,7 +26,16 @@
 	if(wear_suit)
 		tally += wear_suit.slowdown
 
-	if(!buckled || (buckled && !istype(buckled, /obj/structure/stool/bed/chair/wheelchair)))
+	if(istype(buckled, /obj/structure/stool/bed/chair/wheelchair))
+		for(var/organ_name in list("l_hand","r_hand","l_arm","r_arm"))
+			var/datum/organ/external/E = get_organ(organ_name)
+			if(!E || (E.status & ORGAN_DESTROYED))
+				tally += 4
+			if(E.status & ORGAN_SPLINTED)
+				tally += 0.5
+			else if(E.status & ORGAN_BROKEN)
+				tally += 1.5
+	else
 		if(shoes)
 			tally += shoes.slowdown
 
@@ -38,17 +47,7 @@
 				tally += 0.5
 			else if(E.status & ORGAN_BROKEN)
 				tally += 1.5
-
-	if(buckled && istype(buckled, /obj/structure/stool/bed/chair/wheelchair))
-		for(var/organ_name in list("l_hand","r_hand","l_arm","r_arm"))
-			var/datum/organ/external/E = get_organ(organ_name)
-			if(!E || (E.status & ORGAN_DESTROYED))
-				tally += 4
-			if(E.status & ORGAN_SPLINTED)
-				tally += 0.5
-			else if(E.status & ORGAN_BROKEN)
-				tally += 1.5
-
+	
 	if(shock_stage >= 10) tally += 3
 
 	if(FAT in src.mutations)

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

@@ -98,7 +98,7 @@
 	T.Weaken(5)
 
 	//Only official cool kids get the grab and no self-prone.
-	if(src.mind && !src.mind.special_role)
+	if(!(src.mind && src.mind.special_role))
 		src.Weaken(5)
 		return
 

code/modules/mob/living/carbon/shock.dm

@@ -3,6 +3,10 @@
 
 // proc to find out in how much pain the mob is at the moment
 /mob/living/carbon/proc/updateshock()
+	if (species && (species.flags & NO_PAIN))
+		src.traumatic_shock = 0
+		return 0
+
 	src.traumatic_shock = 			\
 	1	* src.getOxyLoss() + 		\
 	0.7	* src.getToxLoss() + 		\