Merge branch 'master' of https://github.com/MegaDaimond/Lost-Othimradise

Lost-Paradise-Project · Sep 8, 2024 · bc020c4 · bc020c4
2 parents 4c7c1fe + 9096c0e
commit bc020c4
Show file tree

Hide file tree

Showing 30 changed files with 59 additions and 78 deletions.
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -19,7 +19,6 @@ jobs:
     - name: Checkout Master
       uses: actions/checkout@v3
       with:
-        token: ${{ secrets.BOT_TOKEN }}
         ref: ${{ vars.CHANGELOG_BRANCH }}
 
     - name: Setup Git

diff --git a/.github/workflows/close-master-pr.yml b/.github/workflows/close-master-pr.yml
@@ -11,7 +11,6 @@ jobs:
     steps:
     - uses: superbrothers/close-pull-request@v3
       with:
-        github_token: ${{ secrets.BOT_TOKEN }}
         comment: "Благодарим вас за вклад в наш репозиторий. К сожалению, похоже, что вы отправили ПР из master ветки. Мы рекомендуем вам следовать [документации](https://docs.spacestation14.com/en/general-development/setup/git-for-the-ss14-developer.html). \n\n Вы можете перенести свою текущую работу из основной ветки в другую ветку с помощью [создания новой](https://git-scm.com/docs/git-branch) и [очистки](https://git-scm.com/docs/git-reset) master ветки."
 
     # If you prefer to just comment on the pr and not close it, uncomment the bellow and comment the above

diff --git a/.github/workflows/conflict-labeler.yml b/.github/workflows/conflict-labeler.yml
@@ -15,5 +15,5 @@ jobs:
         uses: ike709/actions-label-merge-conflict@9eefdd17e10566023c46d2dc6dc04fcb8ec76142
         with:
           dirtyLabel: "Статус: Конфликт"
-          repoToken: "${{ secrets.BOT_TOKEN }}"
+          repoToken: "${{ secrets.GITHUB_TOKEN }}"
           commentOnDirty: "В этом ПР'е есть конфликты, пожалуйста, устраните их, прежде чем мы сможем оценить ваш ПР."
diff --git a/.github/workflows/labeler-needsreview.yml b/.github/workflows/labeler-needsreview.yml
@@ -11,8 +11,6 @@ jobs:
     - uses: actions-ecosystem/action-add-labels@v1
       with:
         labels: "Статус: Требуется одобрение"
-        repo-token: "${{ secrets.BOT_TOKEN }}"
     - uses: actions-ecosystem/action-remove-labels@v1
       with:
         labels: "Статус: Ожидание изменений"
-        repo-token: "${{ secrets.BOT_TOKEN }}"
diff --git a/.github/workflows/labeler-pr.yml b/.github/workflows/labeler-pr.yml
@@ -10,4 +10,4 @@ jobs:
     steps:
     - uses: actions/labeler@v3
       with:
-        repo-token: "${{ secrets.BOT_TOKEN }}"
+        repo-token: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.github/workflows/rsi-diff.yml b/.github/workflows/rsi-diff.yml
@@ -44,7 +44,6 @@ jobs:
         uses: peter-evans/create-or-update-comment@v1
         with:
           issue-number: ${{ github.event.number }}
-          token: ${{ secrets.BOT_TOKEN }}
           body: |
             ${{ steps.diff.outputs.summary-details }}
 
@@ -53,7 +52,6 @@ jobs:
         uses: peter-evans/create-or-update-comment@v1
         with:
           comment-id: ${{ steps.fc.outputs.comment-id }}
-          token: ${{ secrets.BOT_TOKEN }}
           edit-mode: replace
           body: |
             ${{ steps.diff.outputs.summary-details }}
@@ -63,7 +61,6 @@ jobs:
         uses: peter-evans/create-or-update-comment@v1
         with:
           comment-id: ${{ steps.fc.outputs.comment-id }}
-          token: ${{ secrets.BOT_TOKEN }}
           edit-mode: append
           body: |
             Edit: diff updated after ${{ github.event.pull_request.head.sha }}
diff --git a/.github/workflows/test-secrets1.yml b/.github/workflows/test-secrets1.yml
@@ -3,14 +3,11 @@ name: YAML Linter Secrets
 on:
   push:
     branches: [ master, staging, trying ]
-  merge_group:
-  pull_request:
-    types: [ opened, reopened, synchronize, ready_for_review ]
 
 jobs:
   build:
     name: YAML Linter Secrets
-    if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14' && github.actor != 'Lost-Paradise-Bot'
+    if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14' && github.actor != 'Lost-Paradise-Bot' && github.repository == 'Lost-Paradise-Project/Lost-Paradise'
     runs-on: ubuntu-latest
     steps:
     - uses: actions/[email protected]

diff --git a/.github/workflows/test-secrets2.yml b/.github/workflows/test-secrets2.yml
@@ -13,23 +13,11 @@ on:
     # why not just do both
     - 'RobustToolbox'
     - 'RobustToolbox/**'
-  merge_group:
-  pull_request:
-    types: [ opened, reopened, synchronize, ready_for_review ]
-    branches: [ master ]
-    paths:
-    - '**.cs'
-    - '**.csproj'
-    - '**.sln'
-    - '**.git**'
-    - '**.yml'
-    - 'RobustToolbox'
-    - 'RobustToolbox/**'
 
 jobs:
   build:
     name: Test Packaging Secrets
-    if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'Lost-Paradise-Bot'
+    if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'Lost-Paradise-Bot' && github.repository == 'Lost-Paradise-Project/Lost-Paradise
     runs-on: ubuntu-latest
 
     steps:

diff --git a/.github/workflows/test-secrets3.yml b/.github/workflows/test-secrets3.yml
@@ -2,15 +2,11 @@
 
 on:
   push:
-    branches: [ master, staging, trying ]
-  merge_group:
-  pull_request:
-    types: [ opened, reopened, synchronize, ready_for_review ]
-    branches: [ master ]
+    branches: [ master, staging, trying ]]
 
 jobs:
   build:
-    if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14' && github.actor != 'Lost-Paradise-Bot'
+    if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14' && github.actor != 'Lost-Paradise-Bot' && github.repository == 'Lost-Paradise-Project/Lost-Paradise
     strategy:
       matrix:
         os: [ubuntu-latest]

diff --git a/Resources/Changelog/ChangelogLPP.yml b/Resources/Changelog/ChangelogLPP.yml
@@ -181,3 +181,10 @@ Entries:
   id: 20
   time: '2024-09-07T18:06:06.0000000+00:00'
   url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/85
+- author: JayJacobs
+  changes:
+    - type: Tweak
+      message: Изменены иконки интентов.
+  id: 21
+  time: '2024-09-08T11:38:09.0000000+00:00'
+  url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/90
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml
@@ -9,7 +9,7 @@
     species: Vulpkanin
   - type: Hunger
     baseDecayRate: 0.02083333332 # 25% more than default
-  - type: Carriable # Carrying system from nyanotrasen.
+  #- type: Carriable # Carrying system from nyanotrasen.
   - type: Inventory # Allows vulps to wear properly shaped helmets
     speciesId: vulpkanin
   - type: Thirst

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -13,7 +13,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: bat
       sprite: Mobs/Animals/bat.rsi
-  - type: Carriable
+  #- type: Carriable
   - type: Speech
     speechSounds: Squeak
     speechVerb: SmallMob
@@ -189,8 +189,8 @@
     noMovementLayers:
       movement:
         state: chicken-0
-  - type: Carriable
-    freeHandsRequired: 1
+  #- type: Carriable
+  #  freeHandsRequired: 1
   - type: Fixtures
     fixtures:
       fix1:
@@ -589,8 +589,8 @@
         - MobMask
         layer:
         - MobLayer
-  - type: Carriable
-    freeHandsRequired: 1
+  #- type: Carriable
+  #  freeHandsRequired: 1
   - type: Tag
     tags:
     - DoorBumpOpener
@@ -850,8 +850,8 @@
     noMovementLayers:
       movement:
         state: crab
-  - type: Carriable
-    freeHandsRequired: 1
+  #- type: Carriable
+  #  freeHandsRequired: 1
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -919,7 +919,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: goat
       sprite: Mobs/Animals/goat.rsi
-  - type: Carriable
+  #- type: Carriable
   - type: Fixtures
     fixtures:
       fix1:
@@ -1011,7 +1011,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: goose
       sprite: Mobs/Animals/goose.rsi
-  - type: Carriable
+  #- type: Carriable
   - type: Fixtures
     fixtures:
       fix1:
@@ -1258,7 +1258,7 @@
       sprite: "Effects/creampie.rsi"
       state: "creampie_human"
       visible: false
-  - type: Carriable
+  #- type: Carriable
   - type: Hands
   - type: GenericVisualizer
     visuals:
@@ -1784,7 +1784,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: lizard
       sprite: Mobs/Animals/lizard.rsi
-  - type: Carriable
+  #- type: Carriable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -1839,8 +1839,8 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: slug
       sprite: Mobs/Animals/slug.rsi
-  - type: Carriable
-    freeHandsRequired: 1
+  #- type: Carriable
+  #  freeHandsRequired: 1
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -1893,7 +1893,7 @@
     noMovementLayers:
       movement:
         state: frog
-  - type: Carriable
+  #- type: Carriable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -1957,8 +1957,8 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: parrot
       sprite: Mobs/Animals/parrot.rsi
-  - type: Carriable
-    freeHandsRequired: 1
+  #- type: Carriable
+  #  freeHandsRequired: 1
   - type: Fixtures
     fixtures:
       fix1:
@@ -2014,7 +2014,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: penguin
       sprite: Mobs/Animals/penguin.rsi
-  - type: Carriable
+  #- type: Carriable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -2148,7 +2148,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: snake
       sprite: Mobs/Animals/snake.rsi
-  - type: Carriable
+  #- type: Carriable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -2211,7 +2211,7 @@
     noMovementLayers:
       movement:
         state: tarantula
-  - type: Carriable
+  #- type: Carriable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -2397,7 +2397,7 @@
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: possum
-  - type: Carriable
+  #- type: Carriable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -2479,7 +2479,7 @@
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: raccoon
-  - type: Carriable
+  #- type: Carriable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -2549,7 +2549,7 @@
     noMovementLayers:
       movement:
         state: fox
-  - type: Carriable
+  #- type: Carriable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -2630,7 +2630,7 @@
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: corgi
-  - type: Carriable
+  #- type: Carriable
   - type: Physics
   - type: Speech
     speechVerb: Canine
@@ -2787,7 +2787,7 @@
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: cat
-  - type: Carriable
+  #- type: Carriable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -2978,8 +2978,8 @@
         Base: kitten_dead
       Dead:
         Base: kitten_dead
-  - type: Carriable
-    freeHandsRequired: 1
+  #- type: Carriable
+  #  freeHandsRequired: 1
   - type: Butcherable
     spawned:
     - id: FoodMeat
@@ -3021,7 +3021,7 @@
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: sloth
-  - type: Carriable
+  #- type: Carriable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -3088,7 +3088,7 @@
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: ferret
-  - type: Carriable
+  #- type: Carriable
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -3298,7 +3298,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: pig
       sprite: Mobs/Animals/pig.rsi
-  - type: Carriable
+  #- type: Carriable
   - type: Fixtures
     fixtures:
       fix1:
@@ -3374,7 +3374,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: nymph
       sprite: Mobs/Animals/nymph.rsi
-  - type: Carriable
+  #- type: Carriable
   - type: Physics
   - type: Fixtures
     fixtures:

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -22,7 +22,7 @@
       layers:
       - map: [ "enum.DamageStateVisualLayers.Base" ]
         state: alive
-    - type: Carriable # This one is for you, deltanedas o7
+    #- type: Carriable # This one is for you, deltanedas o7
     - type: CombatMode
     - type: Physics
     - type: Fixtures

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -171,8 +171,8 @@
   description: He's da mini rat. He don't make da roolz.
   noSpawn: true #Must be configured to a King or the AI breaks.
   components:
-  - type: Carriable
-    freeHandsRequired: 1
+  #- type: Carriable
+  #  freeHandsRequired: 1
   - type: CombatMode
   - type: MovementSpeedModifier
     baseWalkSpeed : 3.5

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
@@ -17,7 +17,7 @@
     layers:
     - map: [ "enum.DamageStateVisualLayers.Base" ]
       state: blue_adult_slime
-  - type: Carriable
+  #- type: Carriable
   - type: Fixtures
     fixtures:
       fix1: