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

into cassette-refactor
Monkestation · Jan 19, 2025 · fc09f66 · fc09f66
2 parents e32a955 + 7d69a0f
commit fc09f66
Show file tree

Hide file tree

Showing 596 changed files with 29,359 additions and 371,738 deletions.
diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml
@@ -70,6 +70,10 @@ jobs:
           key: ${{ runner.os }}-rust-${{ hashFiles('tools/ci/ci_dependencies.sh')}}
           restore-keys: |
             ${{ runner.os }}-rust-
+      - name: Setup .NET SDK
+        uses: actions/[email protected]
+        with:
+          dotnet-version: 9.x
       - name: Install OpenDream
         uses: robinraju/[email protected]
         with:

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" = (