Translate merge upstream 02.06.2024 (#288)

Merge upstream
ss220club · Jun 2, 2024 · f162cc6 · f162cc6
2 parents edba851 + 1f703cf
commit f162cc6
Show file tree

Hide file tree

Showing 246 changed files with 19,808 additions and 20,044 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" = (

diff --git a/_maps/deathmatch/ragin_mages.dmm b/_maps/deathmatch/ragin_mages.dmm
@@ -47,7 +47,7 @@
 /area/deathmatch/teleport)
 "ct" = (
 /obj/structure/flora/bush/grassy/style_random,
-/mob/living/simple_animal/pet/gondola{
+/mob/living/basic/pet/gondola{
 	name = "Jommy";
 	faction = list("gondola", "Wizard")
 	},