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

code/modules/surgery/bodyparts/_bodyparts.dm

@@ -251,7 +251,7 @@
 		if(BIO_JUST_FLESH)
 			if(wounding_type == WOUND_BLUNT)
 				wounding_type = WOUND_SLASH
-				wounding_dmg *= (easy_dismember ? 1 : 0.3)
+				wounding_dmg *= (easy_dismember ? 1 : 0.5)
 			if((mangled_state & BODYPART_MANGLED_FLESH) && try_dismember(wounding_type, wounding_dmg, wound_bonus, bare_wound_bonus))
 				return
 		// standard humanoids

code/modules/surgery/organs/tails.dm

@@ -13,6 +13,9 @@
 		owner.dna.species.stop_wagging_tail(owner)
 	return ..()
 
+/obj/item/organ/tail/on_life()
+	return
+
 /obj/item/organ/tail/cat
 	name = "cat tail"
 	desc = "A severed cat tail. Who's wagging now?"