From 4b4bbb28cc775e3df20c7ecb6eb2a1da67ba6790 Mon Sep 17 00:00:00 2001
From: phil235 <antoine_hernandez62@hotmail.fr>
Date: Wed, 25 May 2016 23:22:03 +0200
Subject: [PATCH] can't choke people with breathing tubes. another tiny fix
 with tablepush.

---
 code/game/objects/structures/tables_racks.dm | 4 ++--
 code/modules/mob/living/carbon/life.dm       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index e3f6df6107c..2d0a1dbb44e 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -137,7 +137,7 @@
 		. = . || mover.checkpass(PASSTABLE)
 
 /obj/structure/table/proc/tablepush(mob/living/user, mob/living/pushed_mob)
-	pushed_mob.loc = src.loc
+	pushed_mob.forceMove(src.loc)
 	pushed_mob.Weaken(2)
 	pushed_mob.visible_message("<span class='danger'>[user] pushes [pushed_mob] onto [src].</span>", \
 								"<span class='userdanger'>[user] pushes [pushed_mob] onto [src].</span>")
@@ -365,7 +365,7 @@
 			break
 
 /obj/structure/table/optable/tablepush(mob/living/user, mob/living/pushed_mob)
-	pushed_mob.loc = src.loc
+	pushed_mob.forceMove(src.loc)
 	pushed_mob.resting = 1
 	pushed_mob.update_canmove()
 	visible_message("<span class='notice'>[user] has laid [pushed_mob] on [src].</span>")
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index 587977a4715..b0024940eca 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -46,7 +46,7 @@
 
 	var/datum/gas_mixture/breath
 
-	if(health <= config.health_threshold_crit || (pulledby && pulledby.grab_state >= GRAB_KILL))
+	if(health <= config.health_threshold_crit) || (pulledby && pulledby.grab_state >= GRAB_KILL && !getorganslot("breathing_tube")))
 		losebreath++
 
 	//Suffocate