Merge branch 'master' into claymores

shiptest-ss13 · May 15, 2024 · 872235f · 872235f
2 parents db41fdd + 2234386
commit 872235f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 20 deletions.
diff --git a/html/changelogs/AutoChangeLog-pr-2949.yml b/html/changelogs/AutoChangeLog-pr-2949.yml
diff --git a/html/changelogs/AutoChangeLog-pr-2961.yml b/html/changelogs/AutoChangeLog-pr-2961.yml
diff --git a/html/changelogs/AutoChangeLog-pr-2965.yml b/html/changelogs/AutoChangeLog-pr-2965.yml
diff --git a/html/changelogs/AutoChangeLog-pr-2970.yml b/html/changelogs/AutoChangeLog-pr-2970.yml
diff --git a/html/changelogs/archive/2024-05.yml b/html/changelogs/archive/2024-05.yml
@@ -33,3 +33,16 @@
   meemofcourse:
   - rscadd: Helmets now have a small, two-item storage. You can put goggles in there,
       and it might overlay them.
+2024-05-14:
+  Gristlebee:
+  - rscadd: Elzu rooting
+  - tweak: Max age for elzu characters can be 300.
+  Martinpachu:
+  - tweak: Riot shield crates now contain only one shield but are priced at 600 credits.
+  MassiveMen:
+  - rscadd: Hawaiian Shirt is now in loadout
+  - tweak: Hawaiian Shirt is now Floral Shirt
+  - tweak: New item description teehee
+  SomeguyManperson:
+  - bugfix: static anomalies can now be safely approached if mindshielded, wearing
+      a research scanner, or deaf, not all three at the same time