From 5aae9c30af4a4c502b41401f82ce3c4438a4f4e1 Mon Sep 17 00:00:00 2001
From: Tastyfish <crazychris32@gmail.com>
Date: Fri, 8 Apr 2016 16:18:16 -0400
Subject: [PATCH] Makes synipets and borgi not need to breathe, all cats eat
 mice (except syndicat)

---
 .../mob/living/simple_animal/friendly/cat.dm  | 36 ++++++++++---------
 .../living/simple_animal/friendly/corgi.dm    |  2 ++
 .../mob/living/simple_animal/friendly/fox.dm  |  2 ++
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index c77d117bad4..9c174527e8a 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -22,6 +22,10 @@
 	response_harm   = "kicks"
 	gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
 
+	var/turns_since_scan = 0
+	var/mob/living/simple_animal/mouse/movement_target
+	var/eats_mice = 1
+
 //RUNTIME IS ALIVE! SQUEEEEEEEE~
 /mob/living/simple_animal/pet/cat/Runtime
 	name = "Runtime"
@@ -31,30 +35,27 @@
 	icon_dead = "cat_dead"
 	icon_resting = "cat_rest"
 	gender = FEMALE
-	var/turns_since_scan = 0
-	var/mob/living/simple_animal/mouse/movement_target
 	gold_core_spawnable = CHEM_MOB_SPAWN_INVALID
 
-/mob/living/simple_animal/pet/cat/Runtime/handle_automated_action()
+/mob/living/simple_animal/pet/cat/handle_automated_action()
 	..()
 
 	//MICE!
-	if(loc && isturf(loc))
-		if(!incapacitated())
-			for(var/mob/living/simple_animal/mouse/M in view(1,src))
-				if(!M.stat && Adjacent(M))
-					custom_emote(1, "splats \the [M]!")
-					M.splat()
-					movement_target = null
-					stop_automated_movement = 0
-					break
+	if(eats_mice && loc && isturf(loc) && !incapacitated())
+		for(var/mob/living/simple_animal/mouse/M in view(1,src))
+			if(!M.stat && Adjacent(M))
+				custom_emote(1, "splats \the [M]!")
+				M.splat()
+				movement_target = null
+				stop_automated_movement = 0
+				break
 
 	//attempt to mate
 	make_babies()
 
-/mob/living/simple_animal/pet/cat/Runtime/handle_automated_movement()
+/mob/living/simple_animal/pet/cat/handle_automated_movement()
 	..()
-	if(!incapacitated())
+	if(eats_mice && !incapacitated())
 		turns_since_scan++
 		if(turns_since_scan > 5)
 			walk_to(src,0)
@@ -97,6 +98,7 @@
 	gender = FEMALE
 	flags = NO_BREATHE
 	faction = list("syndicate")
-	var/turns_since_scan = 0
-	var/mob/living/simple_animal/mouse/movement_target
-	gold_core_spawnable = CHEM_MOB_SPAWN_INVALID
\ No newline at end of file
+	gold_core_spawnable = CHEM_MOB_SPAWN_INVALID
+	eats_mice = 0
+	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+	minbodytemp = 0
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm
index 6463c830fed..c824351a7c8 100644
--- a/code/modules/mob/living/simple_animal/friendly/corgi.dm
+++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm
@@ -601,6 +601,8 @@
 	icon_state = "borgi"
 	icon_living = "borgi"
 	var/emagged = 0
+	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+	minbodytemp = 0
 
 /mob/living/simple_animal/pet/corgi/Ian/borgi/emag_act(user as mob)
 	if(!emagged)
diff --git a/code/modules/mob/living/simple_animal/friendly/fox.dm b/code/modules/mob/living/simple_animal/friendly/fox.dm
index 5bf03f083a2..a31c1cb099f 100644
--- a/code/modules/mob/living/simple_animal/friendly/fox.dm
+++ b/code/modules/mob/living/simple_animal/friendly/fox.dm
@@ -36,3 +36,5 @@
 	flags = NO_BREATHE
 	faction = list("syndicate")
 	gold_core_spawnable = CHEM_MOB_SPAWN_INVALID
+	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+	minbodytemp = 0
\ No newline at end of file