Merge remote-tracking branch 'refs/remotes/origin/master'

tgstation · Jul 29, 2024 · 9261ac9 · 9261ac9
2 parents 9fee9dd + 9c9bd13
commit 9261ac9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/html/changelogs/AutoChangeLog-pr-16302.yml b/html/changelogs/AutoChangeLog-pr-16302.yml
diff --git a/html/changelogs/AutoChangeLog-pr-16317.yml b/html/changelogs/AutoChangeLog-pr-16317.yml
diff --git a/html/changelogs/AutoChangeLog-pr-16391.yml b/html/changelogs/AutoChangeLog-pr-16391.yml
diff --git a/html/changelogs/archive/2024-07.yml b/html/changelogs/archive/2024-07.yml
@@ -328,3 +328,10 @@
 2024-07-27:
   PibeCantina:
   - qol: Neuraline shows up on scanner now
+2024-07-29:
+  Lauwma:
+  - balance: Harvester weapons now apply 5 stacks of fire when loaded with kelotane
+  Lumipharon:
+  - code_imp: Cleaned up some acid code
+  - balance: Plasma SMG scatter increased slightly
+  - balance: Plasma SMG bouncy mode damage decreases slightly for each bounce