Merge branch 'master' of github.com:Baystation12/Baystation12

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

@@ -363,7 +363,7 @@
 				if(istype(loc, /obj/))
 					var/obj/location_as_object = loc
 					location_as_object.handle_internal_lifeform(src, 0)
-			if(isbreathing)
+			if(isbreathing && !being_strangled)
 				//First, check for air from internal atmosphere (using an air tank and mask generally)
 				breath = get_breath_from_internal(BREATH_VOLUME) // Super hacky -- TLE
 				//breath = get_breath_from_internal(0.5) // Manually setting to old BREATH_VOLUME amount -- TLE
@@ -407,6 +407,7 @@
 						location_as_object.handle_internal_lifeform(src, 0)
 
 			handle_breath(breath)
+			being_strangled = 0
 
 			if(breath)
 				loc.assume_air(breath)

code/modules/mob/mob_grab.dm

@@ -78,7 +78,9 @@
 	if ((killing && state == 3))
 		affecting.Stun(5)
 		affecting.Paralyse(3)
-		affecting.losebreath = min(affecting.losebreath + 2, 3)
+		affecting.being_strangled = 1
+		var/datum/organ/external/head = affecting.organs["head"]
+		head.add_wound("Strangulation", 0)
 	return