Merge branch 'BeeStation:master' into master

DrDuckedGoose · Jan 26, 2024 · 01f4fc0 · 01f4fc0
2 parents 977c6f3 + b01c2da
commit 01f4fc0
Show file tree

Hide file tree

Showing 152 changed files with 1,690 additions and 878 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -16,12 +16,15 @@ Dockerfile @crossedfall
 /tools @crossedfall
 /config @crossedfall
 
+# crossedfall (explicitly disowned)
+
+/tools/UpdatePaths/Scripts/
+
 # powerfulbacon
 
 /code/game/machinery/shuttle @powerfulbacon
 /code/modules/shuttle/super_cruise @powerfulbacon
 /code/modules/shuttle/shuttle_creation @powerfulbacon
-/_maps/map_files/CorgStation @powerfulbacon
 
 # pestoverde322
 
@@ -30,7 +33,6 @@ Dockerfile @crossedfall
 # itsmeow
 
 /code/game/gamemodes/dynamic @itsmeow
-/code/modules/modular_computers @itsmeow
 /tools/MapTileAggregator.py @itsmeow
 /code/modules/admin/player_panel.dm @itsmeow
 /code/modules/tgui/ @itsmeow

diff --git a/_maps/holodeck/workshop/donut.dmm b/_maps/holodeck/workshop/donut.dmm