Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765

code/modules/surgery/advanced/revival.dm

@@ -36,7 +36,7 @@
 			return FALSE
 	if(istype(tool, /obj/item/melee/baton))
 		var/obj/item/melee/baton/B = tool
-		if(!B.status)
+		if(!B.turned_on)
 			to_chat(user, "<span class='warning'>[B] needs to be active!</span>")
 			return FALSE
 	if(istype(tool, /obj/item/gun/energy))

code/modules/surgery/bodyparts/dismemberment.dm

@@ -14,7 +14,6 @@
 		return FALSE
 	if(HAS_TRAIT(C, TRAIT_NODISMEMBER))
 		return FALSE
-
 	var/obj/item/bodypart/affecting = C.get_bodypart(BODY_ZONE_CHEST)
 	affecting.receive_damage(clamp(brute_dam/2 * affecting.body_damage_coeff, 15, 50), clamp(burn_dam/2 * affecting.body_damage_coeff, 0, 50)) //Damage the chest based on limb's existing damage
 	C.visible_message("<span class='danger'><B>[C]'s [src.name] has been violently dismembered!</B></span>")
@@ -44,6 +43,10 @@
 	throw_at(target_turf, throw_range, throw_speed)
 	return TRUE
 
+/obj/item/bodypart/head/dismember()
+	if(HAS_TRAIT(owner, TRAIT_NODECAP))
+		return FALSE
+	..()
 
 /obj/item/bodypart/chest/dismember()
 	if(!owner)
@@ -53,6 +56,8 @@
 		return FALSE
 	if(HAS_TRAIT(C, TRAIT_NODISMEMBER))
 		return FALSE
+	if(HAS_TRAIT(C, TRAIT_NOGUT)) //Just for not allowing gutting
+		return FALSE
 	. = list()
 	var/organ_spilled = 0
 	var/turf/T = get_turf(C)