From 31ff464d1c3aad3b56211e25a7d13dd9c0556e56 Mon Sep 17 00:00:00 2001
From: Zuhayr <AGMogett@gmail.com>
Date: Wed, 25 Jun 2014 21:52:01 +0930
Subject: [PATCH] Couple of small tweaks.

---
 code/modules/mob/living/carbon/human/life.dm         | 10 ++++++----
 code/modules/mob/living/carbon/monkey/life.dm        | 10 ++++++----
 code/modules/mob/living/silicon/robot/drone/drone.dm |  8 +++++++-
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index cf39160aad8..a1f0865dc5c 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -245,8 +245,9 @@
 			if (radiation > 100)
 				radiation = 100
 				Weaken(10)
-				src << "\red You feel weak."
-				emote("collapse")
+				if(!lying)
+					src << "\red You feel weak."
+					emote("collapse")
 
 			if (radiation < 0)
 				radiation = 0
@@ -279,8 +280,9 @@
 						if(prob(5))
 							radiation -= 5
 							Weaken(3)
-							src << "\red You feel weak."
-							emote("collapse")
+							if(!lying)
+								src << "\red You feel weak."
+								emote("collapse")
 						updatehealth()
 
 					if(75 to 100)
diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm
index 8adaaa8443e..19cfe316868 100644
--- a/code/modules/mob/living/carbon/monkey/life.dm
+++ b/code/modules/mob/living/carbon/monkey/life.dm
@@ -139,8 +139,9 @@
 			if (radiation > 100)
 				radiation = 100
 				Weaken(10)
-				src << "\red You feel weak."
-				emote("collapse")
+				if(!lying)
+					src << "\red You feel weak."
+					emote("collapse")
 
 			switch(radiation)
 				if(1 to 49)
@@ -154,8 +155,9 @@
 					if(prob(5))
 						radiation -= 5
 						Weaken(3)
-						src << "\red You feel weak."
-						emote("collapse")
+						if(!lying)
+							src << "\red You feel weak."
+							emote("collapse")
 
 				if(75 to 100)
 					radiation -= 3
diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm
index 55270907aca..358238b1dc2 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone.dm
@@ -327,7 +327,13 @@
 	src << "<b>If a crewmember has noticed you, <i>you are probably breaking your third law</i></b>."
 
 /mob/living/silicon/robot/drone/Bump(atom/movable/AM as mob|obj, yes)
-	if (!yes || ( !istype(AM,/obj/machinery/door) && !istype(AM,/obj/machinery/recharge_station) && !istype(AM,/obj/machinery/disposal/deliveryChute) ) ) return
+	if (!yes || ( \
+	 !istype(AM,/obj/machinery/door) && \
+	 !istype(AM,/obj/machinery/recharge_station) && \
+	 !istype(AM,/obj/machinery/disposal/deliveryChute && \
+	 !istype(AM,/obj/machinery/teleport/hub) && \
+	 !istype(AM,/obj/effect/portal)
+	))) return
 	..()
 	return