Merge remote-tracking branch 'origin/master' into weapon-modules

2024-03-24 21:07:21 +05:00
parent 5a408211e1 459750b34b
commit 21278b73ca
5 changed files with 26 additions and 20 deletions
--- a/Resources/Changelog/ChangelogWhite.yml
+++ b/Resources/Changelog/ChangelogWhite.yml
@@ -2889,3 +2889,12 @@
  id: 221
  time: '2024-03-24T10:31:18.0000000+00:00'
  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/241
+- author: ThereDrD
+  changes:
+  - message: "\u0412 \u043A\u043E\u043C\u043E\u0434 \u0445\u043E\u0441\u0430 \u0434\
+      \u043E\u0431\u0430\u0432\u043B\u0435\u043D \u043F\u0440\u043E\u043F\u0430\u0432\
+      \u0448\u0438\u0439 \u0442\u0440\u0435\u043D\u0447"
+    type: Fix
+  id: 222
+  time: '2024-03-24T15:23:56.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/243
--- a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
@@ -96,6 +96,7 @@
      - id: ClothingEyesGlassesSecurity
      - id: ClothingHeadsetAltSecurity
      - id: ClothingMaskGasSwat
+      - id: ClothingOuterCoatHoSTrench

 - type: entity
  id: DresserQuarterMasterFilled