Merge branch 'Bubberstation:master' into master

SPLURT-Station · Jun 9, 2024 · 5a8a715 · 5a8a715
2 parents 665cd50 + f6004e0
commit 5a8a715
Show file tree

Hide file tree

Showing 468 changed files with 21,613 additions and 18,250 deletions.
diff --git a/_maps/RandomRuins/SpaceRuins/gondolaasteroid.dmm b/_maps/RandomRuins/SpaceRuins/gondolaasteroid.dmm
@@ -27,7 +27,7 @@
 /turf/open/floor/grass,
 /area/ruin/space/has_grav)
 "h" = (
-/mob/living/simple_animal/pet/gondola,
+/mob/living/basic/pet/gondola,
 /turf/open/floor/grass,
 /area/ruin/space/has_grav)
 "i" = (