Merge branch 'master' into MattressDouble

Lost-Paradise-Project · Dec 22, 2024 · 4eba3ca · 4eba3ca
2 parents 50a95ec + 7294b7e
commit 4eba3ca
Show file tree

Hide file tree

Showing 1,367 changed files with 217,341 additions and 10,074 deletions.
diff --git a/.github/workflows/publish-lostparadise.yml b/.github/workflows/publish-lostparadise.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4.1.1
+    - uses: actions/checkout@v3.6.0
       with:
         submodules: 'recursive'
 
@@ -24,8 +24,13 @@ jobs:
         mv Secrets/_PrivateServer Content.Server/_PrivateServer
         mv Secrets/_PrivateClient Content.Client/_PrivateClient
 
+    - name: Install dependencies
+      run: sudo apt-get install -y python3-paramiko python3-lxml
+
     - name: Setup .NET Core
-      uses: actions/[email protected]
+      uses: actions/[email protected]
+      with:
+        dotnet-version: 8.0.100
 
     - name: Get Engine Tag
       run: |
@@ -39,29 +44,20 @@ jobs:
       run: dotnet build Content.Packaging --configuration Release --no-restore /m
 
     - name: Package server
-      run: dotnet run --project Content.Packaging server --platform linux-x64 --platform win-x64
+      run: dotnet run --project Content.Packaging server --platform win-x64 --platform linux-x64
 
     - name: Package client
       run: dotnet run --project Content.Packaging client --no-wipe-release
 
-    - name: Upload build artifact
-      id: artifact-upload-step
-      uses: actions/upload-artifact@v4
-      with:
-        name: build
-        path: release/*.zip
-        compression-level: 0
-        retention-days: 0
-
     - name: Publish version
-      run: Tools/publish_github_artifact.py
+      run: Tools/publish_multi_request.py
       env:
-        BOT_TOKEN: ${{ secrets.BOT_TOKEN }}
         PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
-        ARTIFACT_ID: ${{ steps.artifact-upload-step.outputs.artifact-id }}
         GITHUB_REPOSITORY: ${{ vars.GITHUB_REPOSITORY }}
 
-    - uses: geekyeggo/delete-artifact@v5
-      if: always()
-      with:
-        name: build
+    - name: Publish changelog
+      run: Tools/actions_changelogs_since_last_run.py
+      env:
+        CHANGELOG_DIR: ${{ vars.CHANGELOG_DIR }}
+        CHANGELOG_WEBHOOK: ${{ secrets.CHANGELOG_WEBHOOK }}
+        GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -67,6 +67,7 @@ public sealed class PostMapInitTest
             "LPPNormandy", //LPP
             "LPPPebble", //LPP
             "LPPSubmarine", //LPP
+            "LPPIceBox", //LPP
             "H_LPPKerberos", //LPP
             "H_LPPAsterisk", //LPP
             "H_LPPNormandy", //LPP

diff --git a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
@@ -137,6 +137,11 @@ protected virtual void OnGotEquipped(EntityUid uid, ClothingComponent component,
         component.InSlot = args.Slot;
         CheckEquipmentForLayerHide(args.Equipment, args.Equipee);
 
+        if (_tagSystem.HasTag(args.Equipment, TailTag))
+        {
+            _humanoidSystem.SetLayerVisibility(args.Equipee, HumanoidVisualLayers.Tail, false);
+        }
+
         if ((component.Slots & args.SlotFlags) != SlotFlags.NONE)
         {
             var gotEquippedEvent = new ClothingGotEquippedEvent(args.Equipee, component);
@@ -160,10 +165,10 @@ protected virtual void OnGotUnequipped(EntityUid uid, ClothingComponent componen
 
         component.InSlot = null;
         CheckEquipmentForLayerHide(args.Equipment, args.Equipee);
-        if ((new string[] { "outerClothing" }).Contains(args.Slot) && _tagSystem.HasTag(args.Equipee, TailTag) && _tagSystem.HasTag(args.Equipment, TailTag))
+
+        if (_tagSystem.HasTag(args.Equipment, TailTag))
         {
             _humanoidSystem.SetLayerVisibility(args.Equipee, HumanoidVisualLayers.Tail, true);
-            TryComp(args.Equipee, out AppearanceComponent? appearance);
         }
     }
 

diff --git a/README.md b/README.md
@@ -50,7 +50,7 @@
 
 ### Основные решения проблем
 
-Попробуйте удалить папку bin и внутренности robusttoolbox.
+Попробуйте удалить папку bin и внутренности RobustToolBox.
 
 # Лицензия
 Пожалуйста прочитайте файл [LEGAL.md](./LEGAL.md) для получения информации о лицензиях на все ресурсы в этом репозитории.
diff --git a/Resources/Audio/_LostParadise/Weapons/Guns/Gunshots/Boomstick.ogg b/Resources/Audio/_LostParadise/Weapons/Guns/Gunshots/Boomstick.ogg
diff --git a/Resources/Audio/_LostParadise/Weapons/Guns/Gunshots/Gauss.ogg b/Resources/Audio/_LostParadise/Weapons/Guns/Gunshots/Gauss.ogg
diff --git a/Resources/Changelog/ChangelogLPP.yml b/Resources/Changelog/ChangelogLPP.yml
@@ -2827,3 +2827,83 @@
   id: 148
   time: '2024-11-16T12:47:09.0000000+00:00'
   url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/329
+- author: Farrellka
+  changes:
+  - message: "\u041F\u0440\u043E\u0432\u0435\u0434\u0451\u043D \u0430\u043F\u0441\u0442\
+      \u0440\u0438\u043C! (\u043D\u0430\u043A\u043E\u043D\u0435\u0446-\u0442\u043E\
+      ...)"
+    type: Add
+  id: 149
+  time: '2024-11-21T17:55:47.0000000+00:00'
+  url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/323
+- author: JayJacobs
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0410\u0439\u0441\u0411\
+      \u043E\u043A\u0441"
+    type: Add
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0448\u0430\u0442\u0442\
+      \u043B \u044D\u0432\u0430\u043A\u0443\u0430\u0446\u0438\u0438 \u0434\u043B\u044F\
+      \ \u0410\u0439\u0441\u0411\u043E\u043A\u0441"
+    type: Add
+  id: 150
+  time: '2024-12-21T10:38:34.0000000+00:00'
+  url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/341
+- author: Farrellka
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0441\u0438\u0441\
+      \u0442\u0435\u043C\u0430 \u0442\u0430\u0441\u043A\u0430\u043D\u0438\u044F \u0432\
+      \u0430\u0448\u0438\u0445 \u0432\u0442\u043E\u0440\u044B\u0445 \u043F\u043E\u043B\
+      \u043E\u0432\u0438\u043D\u043E\u043A \u043D\u0430 \u0440\u0443\u043A\u0430\u0445\
+      !"
+    type: Add
+  - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043E \u0441\u043A\
+      \u0440\u044B\u0442\u0438\u0435 \u0445\u0432\u043E\u0441\u0442\u043E\u0432 \u0434\
+      \u043B\u044F \u0440\u0430\u0441 \u0441 \u0445\u0432\u043E\u0441\u0442\u0430\u043C\
+      \u0438!"
+    type: Fix
+  id: 151
+  time: '2024-12-21T10:38:14.0000000+00:00'
+  url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/344
+- author: MegaDaimond
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0442\u043E\u043D\
+      \u043D\u0430 \u043A\u043E\u043D\u0442\u0435\u043D\u0442\u0430 \u0434\u043B\u044F\
+      \ \u042F\u041E"
+    type: Add
+  - message: "\u0414\u0440\u043E\u0437\u0434, \u041B\u0435\u043A\u0442\u0435\u0440\
+      \ \u0438 \u0412\u0443\u043B\u043A\u0430\u043D \u0442\u0435\u043F\u0435\u0440\
+      \u044C \u0441\u0442\u0440\u0435\u043B\u044F\u044E\u0442 \u043E\u0447\u0435\u0440\
+      \u0435\u0434\u044F\u043C\u0438"
+    type: Tweak
+  - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u044B \u0440\u0430\u0441\u0446\
+      \u0435\u043D\u043A\u0438 \u0438 \u0442\u043E\u0432\u0430\u0440\u044B \u0432\
+      \ \u043F\u043B\u0430\u043D\u0448\u0435\u0442\u0435 \u0437\u0430\u043A\u0443\u043F\
+      \u0430 \u0421\u0411"
+    type: Tweak
+  - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B RSI \u0431\
+      \u0430\u0433\u0438"
+    type: Fix
+  id: 152
+  time: '2024-12-21T10:36:33.0000000+00:00'
+  url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/346
+- author: JayJacobs
+  changes:
+  - message: "\u0417\u0430\u043C\u0435\u043D\u0451\u043D \u0441\u043F\u0430\u0432\u043D\
+      \ \u043A\u0440\u0438\u043C.\u043A\u043E\u043D\u0441\u043E\u043B\u0435\u0439\
+      \ \u043C\u0438\u0433\u0440\u0430\u0446\u0438\u044F\u043C\u0438."
+    type: Tweak
+  id: 153
+  time: '2024-12-21T11:10:29.0000000+00:00'
+  url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/349
+- author: JayJacobs
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0410\u0439\u0441\u0411\
+      \u043E\u043A\u0441 \u0432 \u043F\u0443\u043B\u043B \u043A\u0430\u0440\u0442."
+    type: Add
+  - message: "\u0423\u0431\u0440\u0430\u043D\u0430 \u043A\u0440\u0438\u043C.\u043A\
+      \u043E\u043D\u0441\u043E\u043B\u044C \u0438\u0437 \u043C\u0438\u0433\u0440\u0430\
+      \u0446\u0438\u0439."
+    type: Remove
+  id: 154
+  time: '2024-12-21T14:26:43.0000000+00:00'
+  url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/350