Merge branch 'master' into landmines

shiptest-ss13 · Feb 28, 2024 · 8f6afe5 · 8f6afe5
2 parents 0fcf855 + 0fdfa75
commit 8f6afe5
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 19 deletions.
diff --git a/html/changelogs/AutoChangeLog-pr-2736.yml b/html/changelogs/AutoChangeLog-pr-2736.yml
diff --git a/html/changelogs/AutoChangeLog-pr-2751.yml b/html/changelogs/AutoChangeLog-pr-2751.yml
diff --git a/html/changelogs/AutoChangeLog-pr-2756.yml b/html/changelogs/AutoChangeLog-pr-2756.yml
diff --git a/html/changelogs/AutoChangeLog-pr-2768.yml b/html/changelogs/AutoChangeLog-pr-2768.yml
diff --git a/html/changelogs/archive/2024-02.yml b/html/changelogs/archive/2024-02.yml
@@ -240,3 +240,16 @@
   - rscdel: NT-SVG and AK-74 have been merged into a single gun
   - balance: 7.62x40mm now contains eighty rounds per ammo box
   - bugfix: 45-70 hollow point ammo boxes now no longer contains 357 for some reason
+2024-02-27:
+  Martinpachu:
+  - bugfix: Removed mention of clowns in the butcher cleaver's description.
+  - balance: Cargo gun crates are more granularized, having only one gun at a time
+      and a price reflecting that. Prices were rebalanced making automatics more expensive
+      overall.
+  - balance: Changes combat knives in cargo to survival knives and cheapens their
+      crate.
+  SomeguyManperson:
+  - rscadd: admins can now blacklist ships, preventing them from docking at a station.
+2024-02-28:
+  PositiveEntropy:
+  - imageadd: The Second Cratening has been deployed!
diff --git a/icons/obj/crates.dmi b/icons/obj/crates.dmi