Breathing Tube Augment

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

@@ -650,9 +650,10 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
 								"<span class='userdanger'>[usr] tries to [internal ? "close" : "open"] the valve on [src]'s [ITEM].</span>")
 
 				var/no_mask
-				if(!(wear_mask && wear_mask.flags & AIRTIGHT))
-					if(!(head && head.flags & AIRTIGHT))
-						no_mask = 1
+				if(!get_organ_slot("breathing_tube"))
+					if(!(wear_mask && wear_mask.flags & AIRTIGHT))
+						if(!(head && head.flags & AIRTIGHT))
+							no_mask = 1
 				if(no_mask)
 					to_chat(usr, "<span class='warning'>[src] is not wearing a suitable mask or helmet!</span>")
 					return
@@ -663,9 +664,10 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
 						update_internals_hud_icon(0)
 					else
 						var/no_mask2
-						if(!(wear_mask && wear_mask.flags & AIRTIGHT))
-							if(!(head && head.flags & AIRTIGHT))
-								no_mask2 = 1
+						if(!get_organ_slot("breathing_tube"))
+							if(!(wear_mask && wear_mask.flags & AIRTIGHT))
+								if(!(head && head.flags & AIRTIGHT))
+									no_mask2 = 1
 						if(no_mask2)
 							to_chat(usr, "<span class='warning'>[src] is not wearing a suitable mask or helmet!</span>")
 							return

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

@@ -3,6 +3,7 @@
 	hud_possible = list(HEALTH_HUD,STATUS_HUD,SPECIALROLE_HUD)
 	var/list/stomach_contents = list()
 	var/list/internal_organs	= list()
+	var/list/internal_organs_slot	= list()	//Same as above, but stores "slot ID" - "organ" pairs for easy access.
 	var/antibodies = 0
 
 	var/life_tick = 0      // The amount of life ticks that have processed on this mob.

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

@@ -428,7 +428,7 @@
 
 /mob/living/carbon/human/show_inv(mob/user)
 	user.set_machine(src)
-	var/has_breathable_mask = istype(wear_mask, /obj/item/clothing/mask)
+	var/has_breathable_mask = istype(wear_mask, /obj/item/clothing/mask) || get_organ_slot("breathing_tube")
 	var/list/obscured = check_obscured_slots()
 
 	var/dat = {"<table>

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

@@ -151,7 +151,7 @@
 			update_hair()	//rebuild hair
 			update_fhair()
 			update_head_accessory()
-		if(internal)
+		if(internal && !get_organ_slot("breathing_tube"))
 			internal = null
 			update_internals_hud_icon(0)
 		wear_mask_update(I, toggle_off = FALSE)

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

@@ -301,9 +301,10 @@
 		var/null_internals = 0      //internals are invalid, therefore turn them off
 		var/skip_contents_check = 0 //rigsuit snowflake, oxygen tanks aren't stored inside the mob, so the 'contents.Find' check has to be skipped.
 
-		if(!(wear_mask && wear_mask.flags & AIRTIGHT)) //if NOT (wear_mask AND wear_mask.flags CONTAIN AIRTIGHT)
-			if(!(head && head.flags & AIRTIGHT)) //if NOT (head AND head.flags CONTAIN AIRTIGHT)
-				null_internals = 1 //not wearing a mask or suitable helmet
+		if(!get_organ_slot("breathing_tube"))
+			if(!(wear_mask && wear_mask.flags & AIRTIGHT)) //if NOT (wear_mask AND wear_mask.flags CONTAIN AIRTIGHT)
+				if(!(head && head.flags & AIRTIGHT)) //if NOT (head AND head.flags CONTAIN AIRTIGHT)
+					null_internals = 1 //not wearing a mask or suitable helmet
 
 		if(istype(back, /obj/item/weapon/rig)) //wearing a rigsuit
 			var/obj/item/weapon/rig/rig = back //needs to be typecasted because this doesn't use get_rig() for some reason

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

@@ -183,9 +183,10 @@
 	if(internal)
 		if(internal.loc != src)
 			internal = null
-		if(!wear_mask || !(wear_mask.flags & AIRTIGHT)) //not wearing mask or non-breath mask
-			if(!head || !(head.flags & AIRTIGHT)) //not wearing helmet or non-breath helmet
-				internal = null //turn off internals
+		if(!get_organ_slot("breathing_tube"))
+			if(!wear_mask || !(wear_mask.flags & AIRTIGHT)) //not wearing mask or non-breath mask
+				if(!head || !(head.flags & AIRTIGHT)) //not wearing helmet or non-breath helmet
+					internal = null //turn off internals
 
 		if(internal)
 			update_internals_hud_icon(1)

code/modules/mob/mob_grab.dm

@@ -167,9 +167,11 @@
 
 */
 
+	var/breathing_tube = affecting.get_organ_slot("breathing_tube")
+
 	if(state >= GRAB_NECK)
 		affecting.Stun(5)  //It will hamper your voice, being choked and all.
-		if(isliving(affecting))
+		if(isliving(affecting) && !breathing_tube)
 			var/mob/living/L = affecting
 			L.adjustOxyLoss(1)
 
@@ -177,7 +179,8 @@
 		//affecting.apply_effect(STUTTER, 5) //would do this, but affecting isn't declared as mob/living for some stupid reason.
 		affecting.Stuttering(5) //It will hamper your voice, being choked and all.
 		affecting.Weaken(5)	//Should keep you down unless you get help.
-		affecting.AdjustLoseBreath(2, bound_lower = 0, bound_upper = 3)
+		if(!breathing_tube)
+			affecting.AdjustLoseBreath(2, bound_lower = 0, bound_upper = 3)
 
 	adjust_position()
 
@@ -290,7 +293,8 @@
 		msg_admin_attack("[key_name(assailant)] strangled (kill intent) [key_name(affecting)]")
 
 		assailant.next_move = world.time + 10
-		affecting.AdjustLoseBreath(1)
+		if(!affecting.get_organ_slot("breathing_tube"))
+			affecting.AdjustLoseBreath(1)
 		affecting.setDir(WEST)
 	adjust_position()