From 98cfaff0b8cfde126a48bf2ca63361606040319a Mon Sep 17 00:00:00 2001
From: "aranclanos@hotmail.com"
 <aranclanos@hotmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Sat, 20 Oct 2012 14:16:24 +0000
Subject: [PATCH] Holodeck weapons no longer harm simple animals.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4920 316c924e-a436-60f5-8080-3fe189b3f50e
---
 .../mob/living/simple_animal/constructs.dm        | 15 ++++++++++++---
 code/modules/mob/living/simple_animal/life.dm     |  5 ++++-
 code/modules/mob/living/simple_animal/shade.dm    |  5 ++++-
 .../modules/mob/living/simple_animal/syndicate.dm |  5 ++++-
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm
index afe96d85bdb..93b7e28610d 100644
--- a/code/modules/mob/living/simple_animal/constructs.dm
+++ b/code/modules/mob/living/simple_animal/constructs.dm
@@ -107,7 +107,10 @@
 
 /mob/living/simple_animal/construct/attackby(var/obj/item/O as obj, var/mob/user as mob)
 	if(O.force)
-		health -= O.force
+		var/damage = O.force
+		if (O.damtype == HALLOSS)
+			damage = 0
+		health -= damage
 		for(var/mob/M in viewers(src, null))
 			if ((M.client && !( M.blinded )))
 				M.show_message("\red \b [src] has been attacked with the [O] by [user]. ")
@@ -145,7 +148,10 @@
 /mob/living/simple_animal/construct/armoured/attackby(var/obj/item/O as obj, var/mob/user as mob)
 	if(O.force)
 		if(O.force >= 11)
-			health -= O.force
+			var/damage = O.force
+			if (O.damtype == HALLOSS)
+				damage = 0
+			health -= damage
 			for(var/mob/M in viewers(src, null))
 				if ((M.client && !( M.blinded )))
 					M.show_message("\red \b [src] has been attacked with the [O] by [user]. ")
@@ -238,7 +244,10 @@
 /mob/living/simple_animal/constructbehemoth/attackby(var/obj/item/O as obj, var/mob/user as mob)
 	if(O.force)
 		if(O.force >= 11)
-			health -= O.force
+			var/damage = O.force
+			if (O.damtype == HALLOSS)
+				damage = 0
+			health -= damage
 			for(var/mob/M in viewers(src, null))
 				if ((M.client && !( M.blinded )))
 					M.show_message("\red \b [src] has been attacked with the [O] by [user]. ")
diff --git a/code/modules/mob/living/simple_animal/life.dm b/code/modules/mob/living/simple_animal/life.dm
index 2613053858b..7c3aab86119 100644
--- a/code/modules/mob/living/simple_animal/life.dm
+++ b/code/modules/mob/living/simple_animal/life.dm
@@ -365,7 +365,10 @@
 			gib()
 	else
 		if(O.force)
-			health -= O.force
+			var/damage = O.force
+			if (O.damtype == HALLOSS)
+				damage = 0
+			health -= damage
 			for(var/mob/M in viewers(src, null))
 				if ((M.client && !( M.blinded )))
 					M.show_message("\red \b [src] has been attacked with the [O] by [user]. ")
diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm
index 6ec96400568..65c257162db 100644
--- a/code/modules/mob/living/simple_animal/shade.dm
+++ b/code/modules/mob/living/simple_animal/shade.dm
@@ -43,7 +43,10 @@
 			O.transfer_soul("SHADE", src, user)
 		else
 			if(O.force)
-				health -= O.force
+				var/damage = O.force
+				if (O.damtype == HALLOSS)
+					damage = 0
+				health -= damage
 				for(var/mob/M in viewers(src, null))
 					if ((M.client && !( M.blinded )))
 						M.show_message("\red \b [src] has been attacked with the [O] by [user]. ")
diff --git a/code/modules/mob/living/simple_animal/syndicate.dm b/code/modules/mob/living/simple_animal/syndicate.dm
index a2d0b1ab555..e7a62a4586e 100644
--- a/code/modules/mob/living/simple_animal/syndicate.dm
+++ b/code/modules/mob/living/simple_animal/syndicate.dm
@@ -176,7 +176,10 @@
 /mob/living/simple_animal/syndicate/melee/attackby(var/obj/item/O as obj, var/mob/user as mob)
 	if(O.force)
 		if(prob(80))
-			health -= O.force
+			var/damage = O.force
+			if (O.damtype == HALLOSS)
+				damage = 0
+			health -= damage
 			visible_message("\red \b [src] has been attacked with the [O] by [user]. ")
 		else
 			visible_message("\red \b [src] blocks the [O] with its shield! ")