Merge branch 'master' into overlayport-pt1

BeeStation · May 11, 2024 · b194df5 · b194df5
2 parents aca3cc9 + aa322e1
commit b194df5
Show file tree

Hide file tree

Showing 999 changed files with 69,241 additions and 65,688 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -4,6 +4,10 @@
 # In the event that multiple org members are to be informed of changes
 # to the same file or dir, add them to the end under Multiple Owners
 
+# Mapping
+
+/_maps @BeeStation/beestation-mapping
+
 # crossedfall
 
 .dockerignore @crossedfall
@@ -26,10 +30,6 @@ Dockerfile @crossedfall
 /code/modules/shuttle/super_cruise @powerfulbacon
 /code/modules/shuttle/shuttle_creation @powerfulbacon
 
-# pestoverde322
-
-/_maps @pestoverde322
-
 # itsmeow
 
 /code/game/gamemodes/dynamic @itsmeow

diff --git a/_maps/Prefab/Departments.dmm b/_maps/Prefab/Departments.dmm
diff --git a/_maps/RandomRooms/10x10/sk_rdm106_sanitarium.dmm b/_maps/RandomRooms/10x10/sk_rdm106_sanitarium.dmm
diff --git a/_maps/RandomRooms/10x10/sk_rdm146_blastdoor_interchange.dmm b/_maps/RandomRooms/10x10/sk_rdm146_blastdoor_interchange.dmm
diff --git a/_maps/RandomRooms/10x10/sk_rdm148_botany_apiary.dmm b/_maps/RandomRooms/10x10/sk_rdm148_botany_apiary.dmm
diff --git a/_maps/RandomRooms/10x10/sk_rdm157_chess.dmm b/_maps/RandomRooms/10x10/sk_rdm157_chess.dmm
diff --git a/_maps/RandomRooms/10x5/sk_rdm031_deltarobotics.dmm b/_maps/RandomRooms/10x5/sk_rdm031_deltarobotics.dmm
diff --git a/_maps/RandomRooms/10x5/sk_rdm039_deltaclutter1.dmm b/_maps/RandomRooms/10x5/sk_rdm039_deltaclutter1.dmm
diff --git a/_maps/RandomRooms/10x5/sk_rdm045_deltacafeteria.dmm b/_maps/RandomRooms/10x5/sk_rdm045_deltacafeteria.dmm
diff --git a/_maps/RandomRooms/10x5/sk_rdm154_butchersden.dmm b/_maps/RandomRooms/10x5/sk_rdm154_butchersden.dmm
diff --git a/_maps/RandomRooms/3x3/sk_rdm005_wash.dmm b/_maps/RandomRooms/3x3/sk_rdm005_wash.dmm
diff --git a/_maps/RandomRooms/3x3/sk_rdm051_metagamergear.dmm b/_maps/RandomRooms/3x3/sk_rdm051_metagamergear.dmm
diff --git a/_maps/RandomRooms/3x3/sk_rdm108_communism.dmm b/_maps/RandomRooms/3x3/sk_rdm108_communism.dmm
diff --git a/_maps/RandomRooms/3x3/sk_rdm111_naughtyroom.dmm b/_maps/RandomRooms/3x3/sk_rdm111_naughtyroom.dmm
diff --git a/_maps/RandomRooms/3x5/sk_rdm087_junkcloset.dmm b/_maps/RandomRooms/3x5/sk_rdm087_junkcloset.dmm
diff --git a/_maps/RandomRooms/3x5/sk_rdm137_tinyshrink.dmm b/_maps/RandomRooms/3x5/sk_rdm137_tinyshrink.dmm
diff --git a/_maps/RandomRooms/5x3/sk_rdm054_metaclutter3.dmm b/_maps/RandomRooms/5x3/sk_rdm054_metaclutter3.dmm
diff --git a/_maps/RandomRooms/5x4/sk_rdm032_deltaEVA.dmm b/_maps/RandomRooms/5x4/sk_rdm032_deltaEVA.dmm
diff --git a/_maps/RandomRooms/5x4/sk_rdm038_deltadressing.dmm b/_maps/RandomRooms/5x4/sk_rdm038_deltadressing.dmm
diff --git a/_maps/RandomRooms/5x4/sk_rdm097_firemanroom.dmm b/_maps/RandomRooms/5x4/sk_rdm097_firemanroom.dmm
diff --git a/_maps/RandomRooms/fland/sk_rdm_fln_05_apiary.dmm b/_maps/RandomRooms/fland/sk_rdm_fln_05_apiary.dmm
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm