From a8d61c1b6ae2293aadae454a51f37560c70b488d Mon Sep 17 00:00:00 2001
From: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
Date: Wed, 5 Jun 2024 02:57:35 +0300
Subject: [PATCH 1/2] [MIRROR] i broke codeowner

---
 .github/CODEOWNERS | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index a0be7d2f92a7..962b4ba82939 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -19,7 +19,35 @@
 /whitesands/icons/ @MrCat15352
 
 # CI and tool chains
+<<<<<<< ours
 /tools/ @MysticalFaceLesS
+=======
+/tools/ @shiptest-ss13/admins
+
+
+# MAINTAINERS
+
+# FalloutFalcon
+
+/code/game/objects/items/storage/ration.dm @FalloutFalcon
+/code/modules/food_and_drinks/drinks/drinks/breakawayflask.dm @FalloutFalcon
+/code/modules/food_and_drinks/food/ration.dm @FalloutFalcon
+/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @FalloutFalcon
+/code/modules/projectiles/ @FalloutFalcon
+/code/modules/reagents/chemistry/reagents/trickwine_reagents.dm @FalloutFalcon
+/code/modules/unit_tests/icons/ @FalloutFalcon
+
+# MarkSuckerberg
+
+/code/controllers/subsystem/shuttle.dm @MarkSuckerberg
+/code/modules/shuttle/ @MarkSuckerberg
+/code/modules/overmap/ @MarkSuckerberg
+/_maps/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm @MarkSuckerberg
+
+
+# CONTRIBUTORS
+
+>>>>>>> theirs
 
 #SIC SEMPER TYRANNIS
 #/_maps/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm @MrCat15352

From 76e19878f21732fc8d9b958cc79a648f990e4d89 Mon Sep 17 00:00:00 2001
From: MrCat15352 <125268716+MrCat15352@users.noreply.github.com>
Date: Wed, 5 Jun 2024 12:14:03 +0500
Subject: [PATCH 2/2] Update CODEOWNERS

Signed-off-by: MrCat15352 <125268716+MrCat15352@users.noreply.github.com>
---
 .github/CODEOWNERS | 35 +++++++++++++++--------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 962b4ba82939..4570ffe0b40b 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -5,6 +5,7 @@
 # to the same file or dir, add them to the end under Multiple Owners
 
 # MrCat15352
+
 /code/controllers/subsystem/shuttle.dm @MrCat15352
 /code/modules/shuttle/ @MrCat15352
 /code/modules/overmap/ @MrCat15352
@@ -19,35 +20,29 @@
 /whitesands/icons/ @MrCat15352
 
 # CI and tool chains
-<<<<<<< ours
-/tools/ @MysticalFaceLesS
-=======
-/tools/ @shiptest-ss13/admins
 
+/tools/ @MysticalFaceLesS
 
 # MAINTAINERS
 
-# FalloutFalcon
+# MysticalFaceLesS
 
-/code/game/objects/items/storage/ration.dm @FalloutFalcon
-/code/modules/food_and_drinks/drinks/drinks/breakawayflask.dm @FalloutFalcon
-/code/modules/food_and_drinks/food/ration.dm @FalloutFalcon
-/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @FalloutFalcon
-/code/modules/projectiles/ @FalloutFalcon
-/code/modules/reagents/chemistry/reagents/trickwine_reagents.dm @FalloutFalcon
-/code/modules/unit_tests/icons/ @FalloutFalcon
+/code/game/objects/items/storage/ration.dm @MysticalFaceLesS
+/code/modules/food_and_drinks/drinks/drinks/breakawayflask.dm @MysticalFaceLesS
+/code/modules/food_and_drinks/food/ration.dm @MysticalFaceLesS
+/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @MysticalFaceLesS
+/code/modules/projectiles/ @MysticalFaceLesS
+/code/modules/reagents/chemistry/reagents/trickwine_reagents.dm @MysticalFaceLesS
+/code/modules/unit_tests/icons/ @MysticalFaceLesS
 
-# MarkSuckerberg
-
-/code/controllers/subsystem/shuttle.dm @MarkSuckerberg
-/code/modules/shuttle/ @MarkSuckerberg
-/code/modules/overmap/ @MarkSuckerberg
-/_maps/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm @MarkSuckerberg
+# molnizz
 
+/code/controllers/subsystem/shuttle.dm @molnizz
+/code/modules/shuttle/ @molnizz
+/code/modules/overmap/ @molnizz
+/_maps/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm @molnizz
 
 # CONTRIBUTORS
 
->>>>>>> theirs
-
 #SIC SEMPER TYRANNIS
 #/_maps/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm @MrCat15352