From 0a0dd1c449ca3d07f8dbd10cc04f32bac4d23dfe Mon Sep 17 00:00:00 2001
From: Ren Erthilo <erthilo@gmail.com>
Date: Sat, 21 Apr 2012 20:14:21 +0100
Subject: [PATCH] TG: The "X FAILS TO PUSH Y'S FAT ASS OUT OF THE WAY" message
 now only displays to the person shoving, so those nearby are not subjected to
 chat spam.

Added a "Relentless" var to mobs that makes them unshoveable if their intent is
anything but help.

Alien Queens are relentless.

Constructs are relentless, can now push things, and have automated movement
disabled (because it was bugging the hell out of me when testing)

Shades also have automated movement disabled.

The gladiator costume now has a chance to spawn in the theatre (sprites by
Ausops)
Revision: r3040
Author: 	 kortgstation
---
 code/defines/mob/living/carbon/alien_humanoid.dm   |  2 +-
 .../modules/mob/living/carbon/alien/larva/larva.dm | 10 +++++-----
 code/modules/mob/living/carbon/monkey/monkey.dm    | 13 ++++++++-----
 code/modules/mob/living/silicon/robot/robot.dm     | 14 ++++++++------
 code/modules/mob/simple_animal/shade.dm            |  1 +
 5 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/code/defines/mob/living/carbon/alien_humanoid.dm b/code/defines/mob/living/carbon/alien_humanoid.dm
index 6a880121b4d..4c6ae07fbe3 100644
--- a/code/defines/mob/living/carbon/alien_humanoid.dm
+++ b/code/defines/mob/living/carbon/alien_humanoid.dm
@@ -45,7 +45,7 @@
 
 	health = 250
 	icon_state = "queen_s"
-
+	nopush = 1
 /mob/living/carbon/alien/humanoid/rpbody
 	update_icon = 0
 
diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm
index 434d7d01bfd..252dc6349e7 100644
--- a/code/modules/mob/living/carbon/alien/larva/larva.dm
+++ b/code/modules/mob/living/carbon/alien/larva/larva.dm
@@ -29,12 +29,12 @@
 		if(ismob(AM))
 			var/mob/tmob = AM
 			if(istype(tmob, /mob/living/carbon/human) && tmob.mutations & FAT)
-				/*if(prob(70))
-					for(var/mob/M in viewers(src, null))
-						if(M.client)
-							M << "\red <B>[src] fails to push [tmob]'s fat ass out of the way.</B>"
+/*
+				if(prob(70))
+					src << "\red <B>You fail to push [tmob]'s fat ass out of the way.</B>"
 					now_pushing = 0
-					return*/
+					return
+*/
 				if(tmob.nopush)
 					now_pushing = 0
 					return
diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm
index 7e0e99380d5..c3356f4d644 100644
--- a/code/modules/mob/living/carbon/monkey/monkey.dm
+++ b/code/modules/mob/living/carbon/monkey/monkey.dm
@@ -97,13 +97,16 @@
 		now_pushing = 1
 		if(ismob(AM))
 			var/mob/tmob = AM
-			/*if(istype(tmob, /mob/living/carbon/human) && tmob.mutations & FAT)
+/*
+			if(istype(tmob, /mob/living/carbon/human) && tmob.mutations & FAT)
 				if(prob(70))
-					for(var/mob/M in viewers(src, null))
-						if(M.client)
-							M << "\red <B>[src] fails to push [tmob]'s fat ass out of the way.</B>"
+					usr << "\red <B>You fail to push [tmob]'s fat ass out of the way.</B>"
 					now_pushing = 0
-					return*/
+					return
+*/
+			if(tmob.nopush)
+				now_pushing = 0
+				return
 
 			tmob.LAssailant = src
 		now_pushing = 0
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 29f43b6128c..4ff27d3ee2f 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -262,16 +262,18 @@
 		if ((!( yes ) || now_pushing))
 			return
 		now_pushing = 1
-		/*if(ismob(AM))
+		if(ismob(AM))
 			var/mob/tmob = AM
+/*
 			if(istype(tmob, /mob/living/carbon/human) && tmob.mutations & FAT)
 				if(prob(20))
-					for(var/mob/M in viewers(src, null))
-						if(M.client)
-							M << M << "\red <B>[src] fails to push [tmob]'s fat ass out of the way.</B>"
+					usr << "\red <B>You fail to push [tmob]'s fat ass out of the way.</B>"
 					now_pushing = 0
-					//unlock_medal("That's No Moon, That's A Gourmand!", 1)
-					return*/
+					return
+*/
+			if(tmob.nopush)
+				now_pushing = 0
+				return
 		now_pushing = 0
 		..()
 		if (istype(AM, /obj/machinery/recharge_station))
diff --git a/code/modules/mob/simple_animal/shade.dm b/code/modules/mob/simple_animal/shade.dm
index 480d7bc8c0a..34034a63df6 100644
--- a/code/modules/mob/simple_animal/shade.dm
+++ b/code/modules/mob/simple_animal/shade.dm
@@ -21,6 +21,7 @@
 	max_co2 = 0
 	max_tox = 0
 	speed = -1
+	stop_automated_movement = 1
 
 
 	Life()