Skip to content

Commit

Permalink
Merge branch 'Monkestation:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@Noot-Toot
Noot-Toot authored Dec 4, 2023
2 parents c2b572f + a752a83 commit 89af771
Show file tree
Hide file tree
Showing 1,899 changed files with 230,868 additions and 55,219 deletions.
4 changes: 2 additions & 2 deletions _maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand All @@ -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)
Expand Down
Loading

0 comments on commit 89af771

Please sign in to comment.