From e5b668a1d13bc02fe95fc220bd5b5936b0a124f2 Mon Sep 17 00:00:00 2001
From: Ninetoes3 <146674096+Ninetoes3@users.noreply.github.com>
Date: Tue, 31 Oct 2023 16:48:20 +0100
Subject: [PATCH] Return of Var on Cyberiad (#22674)

* Update cat.dm

* forsaken cat change

* Update code/modules/mob/living/simple_animal/friendly/cat.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update feral_cat.dm

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
---
 _maps/map_files/cyberiad/cyberiad.dmm                  |  2 +-
 code/modules/mob/living/simple_animal/friendly/cat.dm  |  5 +++++
 .../mob/living/simple_animal/hostile/feral_cat.dm      | 10 ----------
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm
index b56f3abb9df..50659985481 100644
--- a/_maps/map_files/cyberiad/cyberiad.dmm
+++ b/_maps/map_files/cyberiad/cyberiad.dmm
@@ -74470,7 +74470,7 @@
 /turf/simulated/floor/plating,
 /area/station/science/xenobiology)
 "mSV" = (
-/mob/living/simple_animal/hostile/feral_cat/forsaken,
+/mob/living/simple_animal/pet/cat/Var,
 /turf/simulated/floor/wood,
 /area/station/maintenance/apmaint)
 "mTj" = (
diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index d01d0c3ec8e..cf27a9e6f60 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -176,6 +176,11 @@
 	gold_core_spawnable = NO_SPAWN
 	unique_pet = TRUE
 
+/mob/living/simple_animal/pet/cat/Var
+	name = "Var"
+	desc = "Maintenance Cat!"
+	gold_core_spawnable = NO_SPAWN
+
 /mob/living/simple_animal/pet/cat/kitten
 	name = "kitten"
 	desc = "D'aaawwww"
diff --git a/code/modules/mob/living/simple_animal/hostile/feral_cat.dm b/code/modules/mob/living/simple_animal/hostile/feral_cat.dm
index 80d97421099..b10cd9c761d 100644
--- a/code/modules/mob/living/simple_animal/hostile/feral_cat.dm
+++ b/code/modules/mob/living/simple_animal/hostile/feral_cat.dm
@@ -27,13 +27,3 @@
 	atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
 	unsuitable_atmos_damage = 5
 	pass_flags = PASSTABLE
-
-/mob/living/simple_animal/hostile/feral_cat/forsaken
-	name = "forsaken cat"
-	desc = "This cat is waiting for its owner, it hisses at you..."
-	speak = list("Meow!", "Esp!", "HSSSSS")
-	maxHealth = 30
-	health = 25
-	melee_damage_lower = 15
-	melee_damage_upper = 10
-	gold_core_spawnable = NO_SPAWN