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

into Digitigrade-A
Monkestation · Nov 20, 2023 · 64c7faa · 64c7faa
2 parents 31a1d96 + c019575
commit 64c7faa
Show file tree

Hide file tree

Showing 1,237 changed files with 173,639 additions and 22,027 deletions.
diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm
@@ -818,7 +818,7 @@
 /turf/open/floor/engine/vacuum,
 /area/ruin/planetengi)
 "yF" = (
-/mob/living/simple_animal/hostile/construct/proteon,
+/mob/living/basic/construct/proteon,
 /turf/open/floor/iron,
 /area/ruin/planetengi)
 "Ai" = (
@@ -829,7 +829,7 @@
 /turf/open/floor/iron/icemoon,
 /area/ruin/planetengi)
 "Iy" = (
-/mob/living/simple_animal/hostile/construct/proteon,
+/mob/living/basic/construct/proteon,
 /obj/effect/turf_decal/tile/yellow,
 /turf/open/floor/iron/icemoon,
 /area/ruin/planetengi)