Merge branch 'master' into PvEMarines

cmss13-devs · Jul 29, 2024 · 6efa92c · 6efa92c
2 parents 93eb851 + 79b931c
commit 6efa92c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/html/changelogs/AutoChangeLog-pr-6695.yml b/html/changelogs/AutoChangeLog-pr-6695.yml
diff --git a/html/changelogs/archive/2024-07.yml b/html/changelogs/archive/2024-07.yml
@@ -247,3 +247,7 @@
   rythenx:
   - rscadd: more options for hats to ASO vendor to bring it in line with what SO has
       available
+2024-07-29:
+  TheManWithNoHands:
+  - code_imp: adds flags to cone, allowing it to be worn on head
+  - imageadd: added on mob sprites for cone