From 4707bc833b18bb8905c071417cd74b2c39c8fd1b Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Sat, 27 Feb 2021 13:35:37 +0100
Subject: [PATCH] Fix my CODEOWNERS (#3687)

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
---
 .github/CODEOWNERS | 78 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 8fb47412a63..42bdf6fb7bf 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -7,3 +7,81 @@
 # Maptainers
 /_maps/ @KathrinBailey
 
+<<<<<<< HEAD
+=======
+# Cyberboss
+
+/code/__HELPERS/jatum.dm @Cyberboss
+/code/controllers/subsystem/atoms.dm @Cyberboss
+/code/controllers/subsystem/mapping.dm @Cyberboss
+/code/controllers/globals.dm @Cyberboss
+/code/datums/helper_datums/getrev.dm @Cyberboss
+/code/datums/map_config.dm @Cyberboss
+/code/datums/forced_movement.dm @Cyberboss
+/code/datums/holocall.dm @Cyberboss
+/code/modules/admin/verbs/adminhelp.dm @Cyberboss
+/code/modules/admin/verbs/adminpm.dm @Cyberboss
+/code/modules/mapping/ @Cyberboss
+/tools/LinuxOneShot/ @Cyberboss
+/tools/tgs4_scripts/ @Cyberboss
+
+# Mothblocks
+
+/code/modules/unit_tests/ @Mothblocks
+
+# Jordie0608
+
+/SQL/ @Jordie0608
+/code/controllers/subsystem/dbcore.dm @Jordie0608
+/tools/SQLAlertEmail/ @Jordie0608
+
+# LemonInTheDark
+
+/code/__DEFINES/atmospherics.dm @LemonInTheDark
+/code/modules/atmospherics/ @LemonInTheDark
+
+# MrStonedOne
+
+/SQL/database_changelog.txt @MrStonedOne
+/code/__DEFINES/MC.dm @MrStonedOne
+/code/controllers/admin.dm @MrStonedOne
+/code/controllers/master.dm @MrStonedOne
+/code/controllers/failsafe.dm @MrStonedOne
+/code/controllers/subsystem.dm @MrStonedOne
+/code/controllers/subsystem/timer.dm @MrStonedOne
+/code/controllers/configuration/entries @MrStonedOne
+/config/ @MrStonedOne
+
+# ninjanomnom
+
+/code/__DEFINES/dcs/ @ninjanomnom
+/code/controllers/subsystem/dcs.dm @ninjanomnom
+/code/controllers/subsystem/shuttle.dm @ninjanomnom
+/code/datums/components/ @ninjanomnom
+/code/datums/elements/ @ninjanomnom
+/code/modules/shuttle/ @ninjanomnom
+
+# ShizCalev
+
+/sound/ @ShizCalev
+
+# stylemistake
+
+/code/__DEFINES/chat.dm @stylemistake
+/code/__DEFINES/tgui.dm @stylemistake
+/code/controllers/subsystem/chat.dm @stylemistake
+/code/controllers/subsystem/tgui.dm @stylemistake
+/code/modules/tgchat @stylemistake
+/code/modules/tgui @stylemistake
+/code/modules/tgui_panel @stylemistake
+/tgui @stylemistake
+
+# Multiple Owners
+
+/icons/ @Twaticus @ShizCalev
+/code/controllers/subsystem/air.dm @LemonInTheDark @MrStonedOne
+/_maps/ @EOBGames @ShizCalev
+
+#SIC SEMPER TYRANNIS
+/code/modules/hydroponics/grown/citrus.dm @optimumtact
+>>>>>>> 7f742ed0738 (Fix Mothblocks' CODEOWNERS (#57236))