From: MaxSMokeSkaarj <vnazarov@smokeofanarchy.ru>
Date: Sat, 11 Oct 2025 03:31:00 +0000 (+1000)
Subject: Merge branch 'master' of ssh://github/space-wizards/space-station-14
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=318ccd1b8b7ad54ac4e8604dc338981cbfc273d3;p=space-station-14.git

Merge branch 'master' of ssh://github/space-wizards/space-station-14
---

318ccd1b8b7ad54ac4e8604dc338981cbfc273d3
diff --cc Resources/Changelog/Changelog.yml
index 377d808480,ee1518ce25..1a98690dd3
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@@ -1,63 -1,4 +1,4 @@@
 -Entries:
 +Entries:
- - author: TiniestShark
-   changes:
-   - message: Added inhand sprites for the bartender utensils and mugs.
-     type: Add
-   id: 8561
-   time: '2025-05-24T17:32:27.0000000+00:00'
-   url: https://github.com/space-wizards/space-station-14/pull/37771
- - author: K-Dynamic
-   changes:
-   - message: Shutters and blast doors now appear welded when welded.
-     type: Fix
-   id: 8562
-   time: '2025-05-25T15:57:18.0000000+00:00'
-   url: https://github.com/space-wizards/space-station-14/pull/37807
- - author: Stop-Signs
-   changes:
-   - message: Meals now better reflect the amount of ingredients put into them.
-     type: Tweak
-   id: 8563
-   time: '2025-05-25T18:02:04.0000000+00:00'
-   url: https://github.com/space-wizards/space-station-14/pull/34138
- - author: brainfood1183
-   changes:
-   - message: Kangaroos can now be equipped with northstars and knuckle dusters.
-     type: Tweak
-   id: 8564
-   time: '2025-05-25T18:03:01.0000000+00:00'
-   url: https://github.com/space-wizards/space-station-14/pull/37789
- - author: Moomoobeef
-   changes:
-   - message: Added new variants to dirty tiles.
-     type: Tweak
-   id: 8565
-   time: '2025-05-25T18:11:40.0000000+00:00'
-   url: https://github.com/space-wizards/space-station-14/pull/37800
- - author: AsnDen
-   changes:
-   - message: Tile-aligned bar sign version was added.
-     type: Add
-   - message: Bar signs now have proper collision.
-     type: Fix
-   id: 8566
-   time: '2025-05-25T18:36:00.0000000+00:00'
-   url: https://github.com/space-wizards/space-station-14/pull/37756
- - author: Fildrance
-   changes:
-   - message: Spray nozzle now can consume liquids from puddles and put it right into
-       backpacked tank.
-     type: Add
-   id: 8567
-   time: '2025-05-26T03:36:16.0000000+00:00'
-   url: https://github.com/space-wizards/space-station-14/pull/30600
- - author: Southbridge
-   changes:
-   - message: On Amber, gave security its missing beacon and barriers.
-     type: Fix
-   id: 8568
-   time: '2025-05-26T07:29:58.0000000+00:00'
-   url: https://github.com/space-wizards/space-station-14/pull/37700
  - author: jessicamaybe
    changes:
    - message: NPC Gorillas can now pry open doors and vault/smash tables!