Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…
Browse files Browse the repository at this point in the history
…to netur-my-wenior
  • Loading branch information
FalloutFalcon committed Oct 17, 2024
2 parents 4e77f76 + d922c74 commit 264be9a
Show file tree
Hide file tree
Showing 96 changed files with 6,428 additions and 666 deletions.
6 changes: 1 addition & 5 deletions _maps/RandomRuins/BeachRuins/beach_ocean_town.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1698,10 +1698,6 @@
},
/turf/open/floor/plasteel,
/area/ruin/beach/oceantown/shop)
"ww" = (
/obj/structure/statue/sandstone/assistant,
/turf/open/floor/plating/asteroid/sand/lit,
/area/overmap_encounter/planetoid/beachplanet/explored)
"wF" = (
/obj/structure/flora/ausbushes/fullgrass,
/obj/structure/flora/ausbushes/brflowers,
Expand Down Expand Up @@ -7687,7 +7683,7 @@ sa
sa
Ud
sa
ww
sa
sa
Ud
sa
Expand Down
Loading

0 comments on commit 264be9a

Please sign in to comment.