Merge remote-tracking branch 'BeeStation/master'

SergeiKoralev · Apr 25, 2022 · 986f70b · 986f70b
2 parents 20e553b + 78db8c9
commit 986f70b
Show file tree

Hide file tree

Showing 433 changed files with 17,601 additions and 17,557 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM beestation/byond:514.1575 as base
+FROM beestation/byond:514.1583 as base
 
 # Install the tools needed to compile our rust dependencies
 FROM base as rust-build

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
diff --git a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
diff --git a/_maps/map_files/CorgStation/CorgStation.dmm b/_maps/map_files/CorgStation/CorgStation.dmm