Merge branch 'master' into pr/233

cmss13-devs · Sep 11, 2024 · f747bc7 · f747bc7
2 parents 9bd8ffe + cc9cb73
commit f747bc7
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/html/changelogs/AutoChangeLog-pr-371.yml b/html/changelogs/AutoChangeLog-pr-371.yml
diff --git a/html/changelogs/AutoChangeLog-pr-383.yml b/html/changelogs/AutoChangeLog-pr-383.yml
diff --git a/html/changelogs/AutoChangeLog-pr-436.yml b/html/changelogs/AutoChangeLog-pr-436.yml
diff --git a/html/changelogs/archive/2024-09.yml b/html/changelogs/archive/2024-09.yml
@@ -18,3 +18,16 @@
   Noname995:
   - rscadd: Added king with changed abilities and AI to use abilities, new event boss
       or end game tool for GMs.
+2024-09-11:
+  AndroBetel:
+  - qol: Added platoon commander prefs
+  - rscadd: Added dropship camo, chosen by PLTCO
+  BonniePandora:
+  - qol: Adds a new 'nickname' for character slots
+  - ui: adjusted the character setup menu to have a field for the above
+  Meatstuff882:
+  - rscadd: Added Microwaved Burritos, Cheeseburgers, and Hot Dogs, and recipes for
+      these items.
+  - balance: 'Packaged food has more nutrition.
+
+      :cl:'