Breathing Tube Augment

code/modules/surgery/organs/augments_internal.dm

@@ -144,6 +144,24 @@
 	spawn(90 / severity)
 		crit_fail = 0
 
+
+//[[[[MOUTH]]]]
+/obj/item/organ/internal/cyberimp/mouth
+	parent_organ = "mouth"
+
+/obj/item/organ/internal/cyberimp/mouth/breathing_tube
+	name = "breathing tube implant"
+	desc = "This simple implant adds an internals connector to your back, allowing you to use internals without a mask and protecting you from being choked."
+	icon_state = "implant_mask"
+	slot = "breathing_tube"
+	w_class = WEIGHT_CLASS_TINY
+	origin_tech = "materials=2;biotech=3"
+
+/obj/item/organ/internal/cyberimp/mouth/breathing_tube/emp_act(severity)
+	if(prob(60/severity) && owner)
+		to_chat(owner, "<span class='warning'>Your breathing tube suddenly closes!</span>")
+		owner.AdjustLoseBreath(2)
+
 /obj/item/organ/internal/cyberimp/brain/clown_voice
 	name = "Comical implant"
 	desc = "<span class='sans'>Uh oh.</span>"

code/modules/surgery/organs/helpers.dm

@@ -30,9 +30,7 @@
 	return returnorg
 
 /mob/living/carbon/get_organ_slot(slot)
-	for(var/obj/item/organ/internal/O in internal_organs)
-		if(slot == O.slot)
-			return O
+	return internal_organs_slot[slot]
 
 /mob/living/carbon/get_int_organ_tag(tag)
 	for(var/obj/item/organ/internal/O in internal_organs)

code/modules/surgery/organs/organ_internal.dm

@@ -7,6 +7,7 @@
 	throwforce = 0
 	var/zone = "chest"
 	var/slot
+	// DO NOT add slots with matching names to different zones - it will break internal_organs_slot list!
 	vital = 0
 	var/non_primary = 0
 
@@ -29,6 +30,7 @@
 	owner = M
 
 	M.internal_organs |= src
+	M.internal_organs_slot[slot] = src
 	var/obj/item/organ/external/parent
 	if(istype(M, /mob/living/carbon/human))
 		var/mob/living/carbon/human/H = M
@@ -52,6 +54,8 @@
 	owner = null
 	if(M)
 		M.internal_organs -= src
+		if(M.internal_organs_slot[slot] == src)
+			M.internal_organs_slot.Remove(slot)
 		if(vital && !special)
 			if(M.stat != DEAD)//safety check!
 				M.death()