Merge branch 'upstream-master' into merge-upstream

ss220club · Nov 23, 2024 · 201ec81 · 201ec81
2 parents 84ab340 + ef2ca85
commit 201ec81
Show file tree

Hide file tree

Showing 202 changed files with 2,145 additions and 1,481 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -94,6 +94,10 @@
 /code/game/area/ @san7890
 /icons/area/ @san7890
 
+# SmArtKar
+
+/code/modules/projectiles/projectile.dm @SmArtKar
+
 # stylemistake
 
 /code/__DEFINES/chat.dm @stylemistake