Merge branch 'master' of https://github.com/tgstation/tgstation

.github/CODEOWNERS

@@ -126,7 +126,6 @@
 # tralezab
 /code/__DEFINES/basic_mobs.dm @tralezab
 /code/datums/ai @tralezab
-/code/modules/mob/living/basic/ @tralezab
 
 # Watermelon914
 
@@ -187,19 +186,29 @@
 /SQL/ @Jordie0608 @MrStonedOne
 
 /_maps/ @EOBGames @Maurukas @MMMiracles @san7890 @ShizCalev
+
 /icons/ @Imaginos16 @Krysonism @Twaticus @Wallemations
 /icons/ass/ @Ghilker @tralezab
 
 /code/__DEFINES/atmospherics/ @Ghilker @LemonInTheDark
+
 /code/__HELPERS/logging/ @dragomagol @ZephyrTFA
+
 /code/controllers/subsystem/air.dm @LemonInTheDark @MrStonedOne
+
 /code/modules/atmospherics/ @Ghilker @LemonInTheDark
+
 /code/modules/client/preferences.dm @Mothblocks @ZephyrTFA
 /code/modules/client/preferences_savefile.dm @Mothblocks @ZephyrTFA
+
 /code/modules/jobs/job_types/chief_medical_officer.dm @ExcessiveUseOfCobblestone @Ryll-Ryll
 /code/modules/jobs/job_types/medical_doctor.dm @ExcessiveUseOfCobblestone @Ryll-Ryll
 /code/modules/jobs/job_types/paramedic.dm @ExcessiveUseOfCobblestone @Ryll-Ryll
+
+/code/modules/mob/living/basic/ @Jacquerel @san7890 @tralezab
+
 /code/modules/surgery/ @ExcessiveUseOfCobblestone @Ryll-Ryll
+
 /tools/build/ @MrStonedOne @stylemistake
 /tools/tgs_scripts/ @Cyberboss @MrStonedOne
 

README.md

@@ -7,12 +7,14 @@
 
 [![resentment](.github/images/badges/built-with-resentment.svg)](.github/images/comics/131-bug-free.png) [![technical debt](.github/images/badges/contains-technical-debt.svg)](.github/images/comics/106-tech-debt-modified.png) [![forinfinityandbyond](.github/images/badges/made-in-byond.gif)](https://www.reddit.com/r/SS13/comments/5oplxp/what_is_the_main_problem_with_byond_as_an_engine/dclbu1a)
 
-* **Website:** https://www.tgstation13.org
-* **Code:** https://github.com/tgstation/tgstation
-* **Wiki:** https://tgstation13.org/wiki/Main_Page
-* **Codedocs:** https://codedocs.tgstation13.org/
-* **/tg/station Discord:** https://tgstation13.org/phpBB/viewforum.php?f=60
-* **Coderbus Discord:** https://discord.gg/Vh8TJp9
+| Website                   | Link                                           |
+|---------------------------|------------------------------------------------|
+| Website                   | [https://www.tgstation13.org](https://www.tgstation13.org)          |
+| Code                      | [https://github.com/tgstation/tgstation](https://github.com/tgstation/tgstation)    |
+| Wiki                      | [https://tgstation13.org/wiki/Main_Page](https://tgstation13.org/wiki/Main_Page)   |
+| Codedocs                  | [https://codedocs.tgstation13.org/](https://codedocs.tgstation13.org/)       |
+| /tg/station Discord       | [https://tgstation13.org/phpBB/viewforum.php?f=60](https://tgstation13.org/phpBB/viewforum.php?f=60) |
+| Coderbus Discord          | [https://discord.gg/Vh8TJp9](https://discord.gg/Vh8TJp9)               |
 
 This is the codebase for the /tg/station flavoured fork of SpaceStation 13.