Merge remote-tracking branch 'Aurora/master' into paradise_lost

# Conflicts:
#	aurorastation.dme
#	code/modules/client/preference_setup/origin/origin.dm

Author: Matt Atlas

.github/CODEOWNERS

@@ -22,8 +22,8 @@
 /code/modules/http/ @Arrow768 @NonQueueingMatt
 /code/datums/api.dm @Arrow768 @NonQueueingMatt
 
-# Custom items, alb
-/code/modules/customitems/item_defines.dm @Alberyk
+# Custom items, Matt
+/code/modules/customitems/item_defines.dm @NonQueueingMatt
 
 # Mapping, inform dreamy
 /maps/ @DreamySkrell
@@ -43,7 +43,7 @@ code/__defines/tgui.dm @JohnWildkins
 code/modules/tgui @JohnWildkins
 
 # Tools, often binary in nature, let arrow and alb know
-/tools/ @Arrow768 @Alberyk
+/tools/ @Arrow768 @NonQueueingMatt
 
 # Pipeline/CI stuffs, arrow
 /scripts/ @Arrow768

.github/CONTRIBUTING.md

@@ -73,13 +73,6 @@ Changelogs should be written in a concise and clear manner. There is no need for
 specific numbers, values, etcetera) in a changelog. If necessary, the PR can be tagged as **wiki update** for a wiki article to be written
 about it.
 
-There also exist **IC changelogs**. These are presented in-game as a news article by NanoTrasen, and can be used to provide temporary fluff
-for in-game changes. To make use of these, simply put a IC changelog header into the description of the PR and write up the contents below
-it. An example:
-
-> # IC Changelog
-> A new weapon was commissioned by NanoTrasen. It is currently being tested aboard the NSS Aurora
-
 # Coding Standards
 
 ### Absolute Pathing