Merge branch 'CeladonSS13:beta-dev' into master

Mirag1993 · Jun 28, 2024 · 64d3c50 · 64d3c50
2 parents b715ad6 + 6a48657
commit 64d3c50
Show file tree

Hide file tree

Showing 80 changed files with 26,276 additions and 14,392 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -8,21 +8,21 @@
 
 # Code Maintainers
 
-# MrCat15352
-
-/strings/ @MrCat15352
-/tgui/ @MrCat15352
-/sound/ @MrCat15352
-/code/controllers/subsystem/shuttle.dm @MrCat15352
-/code/modules/shuttle/ @MrCat15352
-/code/modules/overmap/ @MrCat15352
-/code/game/objects/items/storage/ration.dm @MrCat15352
-/code/modules/food_and_drinks/drinks/drinks/breakawayflask.dm @MrCat15352
-/code/modules/food_and_drinks/food/ration.dm @MrCat15352
-/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @MrCat15352
-/code/modules/projectiles/ @MrCat15352
-/code/modules/reagents/chemistry/reagents/trickwine_reagents.dm @MrCat15352
-/**/*.dm
+# MrCat15352, Mirag1993
+
+/strings/ @MrCat15352 @Mirag1993
+/tgui/ @MrCat15352 @Mirag1993
+/sound/ @MrCat15352 @Mirag1993
+/code/controllers/subsystem/shuttle.dm @MrCat15352 @Mirag1993
+/code/modules/shuttle/ @MrCat15352 @Mirag1993
+/code/modules/overmap/ @MrCat15352 @Mirag1993
+/code/game/objects/items/storage/ration.dm @MrCat15352 @Mirag1993
+/code/modules/food_and_drinks/drinks/drinks/breakawayflask.dm @MrCat15352 @Mirag1993
+/code/modules/food_and_drinks/food/ration.dm @MrCat15352 @Mirag1993
+/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @MrCat15352 @Mirag1993
+/code/modules/projectiles/ @MrCat15352 @Mirag1993
+/code/modules/reagents/chemistry/reagents/trickwine_reagents.dm @MrCat15352 @Mirag1993
+/**/*.dm @MrCat15352 @Mirag1993
 
 
 # Map Maintainers