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

code/modules/admin/admin.dm

@@ -2108,6 +2108,10 @@
 
 			var/job = ""
 
+			if(istype(M,/mob/new_player))
+				job = "New player"
+			if(isliving(M))
+				job = "Living"
 			if(isobserver(M))
 				job = "Ghost"
 			if(isalien(M))
@@ -2140,7 +2144,7 @@
 						<a id='link[i]'
 						onmouseover='expand("item[i]","[job]","[M.name]","[M.real_name]","--unused--","[M.key]","[M.lastKnownIP]",[is_antagonist],"[karma]","\ref[M]")'
 						>
-						<b id='search[i]'>[M.name] - [M.real_name] - [M.key]</b>
+						<b id='search[i]'>[M.name] - [M.real_name] - [M.key] ([job])</b>
 						</a>
 						<br><span id='item[i]'></span>
 					</td>
@@ -2163,7 +2167,6 @@
 	</body></html>
 	"}
 
-	text2file(dat, "debug.html")
 	usr << browse(dat, "window=players;size=600x480")
 
 /obj/admins/proc/Jobbans()

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