Merge branch 'master' of https://github.com/Monkestation/Monkestation2.0

into icon-and-filter-optimization-stuff
Monkestation · Jan 16, 2025 · 99a60d1 · 99a60d1
2 parents da44121 + 917338e
commit 99a60d1
Show file tree

Hide file tree

Showing 338 changed files with 10,711 additions and 12,189 deletions.
diff --git a/_maps/RandomRuins/SpaceRuins/derelict_sulaco.dmm b/_maps/RandomRuins/SpaceRuins/derelict_sulaco.dmm
@@ -864,7 +864,7 @@
 /turf/open/floor/carpet,
 /area/ruin/space/has_grav/derelictsulaco)
 "BQ" = (
-/mob/living/basic/pet/cat{
+/mob/living/simple_animal/pet/cat{
 	name = "Jonesy";
 	desc = "Old and grumpy cat- wait, how the hell is he still alive?!"
 	},

diff --git a/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm b/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm
@@ -245,7 +245,7 @@
 /obj/structure/bed/dogbed{
 	name = "kitty bed"
 	},
-/mob/living/basic/pet/cat/space,
+/mob/living/simple_animal/pet/cat/space,
 /turf/open/floor/carpet,
 /area/ruin/space/has_grav/powered/cat_man)
 "aS" = (