From f6cf993970e835ef5e786cd3be1f7024db2e4c0b Mon Sep 17 00:00:00 2001 From: Flybik Date: Sun, 8 Sep 2024 14:31:15 +0300 Subject: [PATCH 1/9] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=B8=D0=BA=D0=BE=D0=BD=D0=BE=D0=BA=20=D0=B8?= =?UTF-8?q?=D0=BD=D1=82=D0=B5=D0=BD=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Textures/Interface/Actions/disarm.png | Bin 336 -> 597 bytes .../Textures/Interface/Actions/disarmOff.png | Bin 336 -> 591 bytes Resources/Textures/Interface/Actions/harm.png | Bin 325 -> 659 bytes .../Textures/Interface/Actions/harmOff.png | Bin 611 -> 671 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Interface/Actions/disarm.png b/Resources/Textures/Interface/Actions/disarm.png index cfda495f74efaaeae827184c9b5186b021806cff..386139f26294d8a97868f83ac2aee87fddd5f422 100644 GIT binary patch delta 583 zcmV-N0=WIq0@VbN8Gi-<0047(dh`GQ00DDSM?wIu&K&6g00Iw5L_t(oh0RwzO9Md= zeJ5$+CFP|)QYZurq{yKl$aVgPSc$zU{SB6}msF;-whKZaqJ^M+xK7Bmew12xbI#4} z*QrEbb-Oz|@6E^VCcq!V1AyMi@ZFE2l@h;9Z*hM*@@fF!$A1xCrnd+l-c~}McI)ut z2sj1SX!57zv-1OITh3K;-W0SDhHU^qk}Qy>%L4i4=+bJZ!kTfFft<>3BB!Wyc0U%N z0+Dx~n&0-}EFei1rSILN3v`~E2*Wmlpry4l!KnwRuH-Nb+uHQ3cQ&of8TPR`HA1DL?~Y-DrR3`k;brxI?0YP}>t){56s+DYf8 zRO@_s06?&Nb@9GFx;F3rWxNjeFxx-y@(iTi`pU>TR}J|5qv*#GUgOmW@H5VTfe#Os VK;4B*(e?lU002ovPDHLkV1m#P8gl>u delta 320 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 LNkvXXu0mjfEGGia From 62dd255e7922bfa8fec25a36a0d6ef0a135f5587 Mon Sep 17 00:00:00 2001 From: Lost-Paradise-Bot <172407741+Lost-Paradise-Bot@users.noreply.github.com> Date: Sun, 8 Sep 2024 11:38:35 +0000 Subject: [PATCH 2/9] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20(#90)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Changelog/ChangelogLPP.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Resources/Changelog/ChangelogLPP.yml b/Resources/Changelog/ChangelogLPP.yml index 7f004ed560..ceeb46cfc1 100644 --- 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 From ded153516055ec881e6a1124a6820bba1ee4c26a Mon Sep 17 00:00:00 2001 From: TAZIKLIK <73418250+Evgencheg@users.noreply.github.com> Date: Sun, 8 Sep 2024 14:50:28 +0300 Subject: [PATCH 3/9] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/test-secrets1.yml | 2 +- .github/workflows/test-secrets2.yml | 2 +- .github/workflows/test-secrets3.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-secrets1.yml b/.github/workflows/test-secrets1.yml index 6954c8c846..2ca8c3818a 100644 --- a/.github/workflows/test-secrets1.yml +++ b/.github/workflows/test-secrets1.yml @@ -10,7 +10,7 @@ on: 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/checkout@v3.6.0 diff --git a/.github/workflows/test-secrets2.yml b/.github/workflows/test-secrets2.yml index cc6eb8c943..3585795bb2 100644 --- a/.github/workflows/test-secrets2.yml +++ b/.github/workflows/test-secrets2.yml @@ -29,7 +29,7 @@ on: 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 index 0ece1e06ff..d6831f1dfc 100644 --- a/.github/workflows/test-secrets3.yml +++ b/.github/workflows/test-secrets3.yml @@ -10,7 +10,7 @@ on: 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] From ca2db5e7ee721e49332ed7637c679bb49a3e7ad2 Mon Sep 17 00:00:00 2001 From: Evgencheg <73418250+Evgencheg@users.noreply.github.com> Date: Sun, 8 Sep 2024 14:54:03 +0300 Subject: [PATCH 4/9] Update conflict-labeler.yml --- .github/workflows/conflict-labeler.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/conflict-labeler.yml b/.github/workflows/conflict-labeler.yml index 7e79617b1c..84c1cfef80 100644 --- a/.github/workflows/conflict-labeler.yml +++ b/.github/workflows/conflict-labeler.yml @@ -15,5 +15,4 @@ jobs: uses: ike709/actions-label-merge-conflict@9eefdd17e10566023c46d2dc6dc04fcb8ec76142 with: dirtyLabel: "Статус: Конфликт" - repoToken: "${{ secrets.BOT_TOKEN }}" commentOnDirty: "В этом ПР'е есть конфликты, пожалуйста, устраните их, прежде чем мы сможем оценить ваш ПР." From 4ee41850319dcba01412c97cb740cf3bda099f4f Mon Sep 17 00:00:00 2001 From: TAZIKLIK <73418250+Evgencheg@users.noreply.github.com> Date: Sun, 8 Sep 2024 14:57:09 +0300 Subject: [PATCH 5/9] =?UTF-8?q?=D0=B2=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD?= =?UTF-8?q?=D0=BE=20=D1=83=D0=B1=D0=B5=D1=80=D1=83=20=D0=B2=D1=81=D0=B5?= =?UTF-8?q?=D0=BC=20carriable=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=BE=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Mobs/Species/vulpkanin.yml | 2 +- .../Prototypes/Entities/Mobs/NPCs/animals.yml | 48 +++++++++---------- .../Prototypes/Entities/Mobs/NPCs/carp.yml | 2 +- .../Entities/Mobs/NPCs/regalrat.yml | 2 +- .../Prototypes/Entities/Mobs/NPCs/slimes.yml | 2 +- .../Prototypes/Entities/Mobs/Player/ipc.yml | 2 +- .../Entities/Mobs/Species/arachnid.yml | 2 +- .../Entities/Mobs/Species/diona.yml | 2 +- .../Entities/Mobs/Species/dwarf.yml | 2 +- .../Entities/Mobs/Species/human.yml | 2 +- .../Prototypes/Entities/Mobs/Species/moth.yml | 2 +- .../Entities/Mobs/Species/reptilian.yml | 2 +- .../Entities/Mobs/Species/skeleton.yml | 2 +- .../Entities/Mobs/Species/slime.yml | 2 +- .../Shark/Entities/Mobs/Species/Shark.yml | 2 +- .../Tajaran/Entities/Mobs/Species/Tajaran.yml | 2 +- 16 files changed, 39 insertions(+), 39 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml index 819122d51a..98e5636a52 100644 --- 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 index 5d9b57bfe4..8c08c7ba33 100644 --- 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,7 +189,7 @@ noMovementLayers: movement: state: chicken-0 - - type: Carriable + #- type: Carriable freeHandsRequired: 1 - type: Fixtures fixtures: @@ -589,7 +589,7 @@ - MobMask layer: - MobLayer - - type: Carriable + #- type: Carriable freeHandsRequired: 1 - type: Tag tags: @@ -850,7 +850,7 @@ noMovementLayers: movement: state: crab - - type: Carriable + #- type: Carriable freeHandsRequired: 1 - type: Physics - type: 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,7 +1839,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: slug sprite: Mobs/Animals/slug.rsi - - type: Carriable + #- type: Carriable freeHandsRequired: 1 - type: Physics - type: Fixtures @@ -1893,7 +1893,7 @@ noMovementLayers: movement: state: frog - - type: Carriable + #- type: Carriable - type: Physics - type: Fixtures fixtures: @@ -1957,7 +1957,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: parrot sprite: Mobs/Animals/parrot.rsi - - type: Carriable + #- type: Carriable freeHandsRequired: 1 - type: Fixtures fixtures: @@ -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,7 +2978,7 @@ Base: kitten_dead Dead: Base: kitten_dead - - type: Carriable + #- type: Carriable freeHandsRequired: 1 - type: Butcherable spawned: @@ -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 index 9e1259994d..0265d5fb15 100644 --- 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 index 5779413947..8376f13f85 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml @@ -171,7 +171,7 @@ 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 + #- type: Carriable freeHandsRequired: 1 - type: CombatMode - type: MovementSpeedModifier diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml index f5a500c6b8..8efb0574d2 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Mobs/Player/ipc.yml b/Resources/Prototypes/Entities/Mobs/Player/ipc.yml index 0b6db530b0..64c6fd8a29 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/ipc.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/ipc.yml @@ -122,7 +122,7 @@ - type: PsionicInsulation - type: OfferItem - type: LayingDown - - type: Carriable + #- type: Carriable - type: entity save: false diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml index 84df9ac412..22a5bc0d32 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml @@ -12,7 +12,7 @@ species: Arachnid - type: Hunger baseDecayRate: 0.0125 # Spiders have slow metabolisms all things considered, so I decided to just make their hunger drain slower. - - type: Carriable # Carrying system from nyanotrasen. + #- type: Carriable # Carrying system from nyanotrasen. - type: Thirst - type: Sericulture action: ActionSericulture diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml index 42383d9a42..77df89b7f0 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/diona.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/diona.yml @@ -11,7 +11,7 @@ baseDecayRate: 0.0083 - type: Thirst baseDecayRate: 0.0083 - - type: Carriable # Carrying system from nyanotrasen. + #- type: Carriable # Carrying system from nyanotrasen. - type: Icon sprite: Mobs/Species/Diona/parts.rsi state: full diff --git a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml index 055c6522dd..d2f075383a 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml @@ -7,7 +7,7 @@ components: - type: Hunger - type: Thirst - - type: Carriable # Carrying system from nyanotrasen. + #- type: Carriable # Carrying system from nyanotrasen. - type: Icon sprite: Mobs/Species/Slime/parts.rsi # It was like this beforehand, no idea why. state: full diff --git a/Resources/Prototypes/Entities/Mobs/Species/human.yml b/Resources/Prototypes/Entities/Mobs/Species/human.yml index ac373725ce..06de920aaf 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/human.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml @@ -10,7 +10,7 @@ sprite: Mobs/Species/Human/parts.rsi state: full - type: Thirst - - type: Carriable # Carrying system from nyanotrasen. + #- type: Carriable # Carrying system from nyanotrasen. - type: Butcherable butcheringType: Spike spawned: diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml index 24555486cd..a9db891b52 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml @@ -9,7 +9,7 @@ species: Moth - type: Hunger - type: Thirst - - type: Carriable # Carrying system from nyanotrasen. + #- type: Carriable # Carrying system from nyanotrasen. - type: Icon sprite: Mobs/Species/Moth/parts.rsi state: full diff --git a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml index 0c93f283f4..2baead2d33 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml @@ -11,7 +11,7 @@ - type: Puller needsHands: false - type: Thirst - - type: Carriable # Carrying system from nyanotrasen. + #- type: Carriable # Carrying system from nyanotrasen. - type: Icon sprite: Mobs/Species/Reptilian/parts.rsi state: full diff --git a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml index 28ea5b030f..e0137505dd 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml @@ -9,7 +9,7 @@ components: - type: HumanoidAppearance species: Skeleton - - type: Carriable # Carrying system from nyanotrasen. + #- type: Carriable # Carrying system from nyanotrasen. - type: Icon sprite: Mobs/Species/Skeleton/parts.rsi state: full diff --git a/Resources/Prototypes/Entities/Mobs/Species/slime.yml b/Resources/Prototypes/Entities/Mobs/Species/slime.yml index 0e05b0c827..c10e68b2bb 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/slime.yml @@ -6,7 +6,7 @@ components: - type: Hunger - type: Thirst - - type: Carriable # Carrying system from nyanotrasen. + #- type: Carriable # Carrying system from nyanotrasen. - type: Icon sprite: Mobs/Species/Slime/parts.rsi state: full diff --git a/Resources/Prototypes/_LostParadise/Entities/Mobs/Species/Shark/Entities/Mobs/Species/Shark.yml b/Resources/Prototypes/_LostParadise/Entities/Mobs/Species/Shark/Entities/Mobs/Species/Shark.yml index 19f84064c5..34e7903bbd 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Mobs/Species/Shark/Entities/Mobs/Species/Shark.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Mobs/Species/Shark/Entities/Mobs/Species/Shark.yml @@ -63,7 +63,7 @@ - GalacticCommon # # - type: EmotePanel # race: Shark - - type: Carriable + #- type: Carriable - type: entity save: false diff --git a/Resources/Prototypes/_LostParadise/Entities/Mobs/Species/Tajaran/Entities/Mobs/Species/Tajaran.yml b/Resources/Prototypes/_LostParadise/Entities/Mobs/Species/Tajaran/Entities/Mobs/Species/Tajaran.yml index 1a3e117546..2fe2de7a09 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Mobs/Species/Tajaran/Entities/Mobs/Species/Tajaran.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Mobs/Species/Tajaran/Entities/Mobs/Species/Tajaran.yml @@ -15,7 +15,7 @@ Male: MaleTajaran Female: FemaleTajaran Unsexed: FemaleTajaran - - type: Carriable + #- type: Carriable - type: Hunger starvationDamage: types: From 82b66de5de613f690444be0e9079c33d9d050fe4 Mon Sep 17 00:00:00 2001 From: TAZIKLIK <73418250+Evgencheg@users.noreply.github.com> Date: Sun, 8 Sep 2024 15:01:02 +0300 Subject: [PATCH 6/9] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=D0=B8=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/changelog.yml | 1 - .github/workflows/close-master-pr.yml | 1 - .github/workflows/labeler-needsreview.yml | 2 -- .github/workflows/labeler-pr.yml | 2 +- .github/workflows/rsi-diff.yml | 3 --- 5 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 79cfdd83cd..c731940ee3 100644 --- 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 index 63a618cfdf..4ea39bb2de 100644 --- 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/labeler-needsreview.yml b/.github/workflows/labeler-needsreview.yml index caa0140889..75d27643bf 100644 --- 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 index 7197eec0bf..cd56f345da 100644 --- 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 index 2b65b3b439..5e9a5a2a8e 100644 --- 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 }} From 762140231db8911c1442ed2fce27284bd02f3d87 Mon Sep 17 00:00:00 2001 From: TAZIKLIK <73418250+Evgencheg@users.noreply.github.com> Date: Sun, 8 Sep 2024 15:02:42 +0300 Subject: [PATCH 7/9] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D1=82=D0=B5?= =?UTF-8?q?=D1=81=D1=82=D0=BE=D0=B2=20=D1=81=D0=B5=D0=BA=D1=80=D0=B5=D1=82?= =?UTF-8?q?=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/test-secrets1.yml | 3 --- .github/workflows/test-secrets2.yml | 12 ------------ .github/workflows/test-secrets3.yml | 6 +----- 3 files changed, 1 insertion(+), 20 deletions(-) diff --git a/.github/workflows/test-secrets1.yml b/.github/workflows/test-secrets1.yml index 2ca8c3818a..2f048e4a4c 100644 --- a/.github/workflows/test-secrets1.yml +++ b/.github/workflows/test-secrets1.yml @@ -3,9 +3,6 @@ name: YAML Linter Secrets on: push: branches: [ master, staging, trying ] - merge_group: - pull_request: - types: [ opened, reopened, synchronize, ready_for_review ] jobs: build: diff --git a/.github/workflows/test-secrets2.yml b/.github/workflows/test-secrets2.yml index 3585795bb2..ba27b41022 100644 --- a/.github/workflows/test-secrets2.yml +++ b/.github/workflows/test-secrets2.yml @@ -13,18 +13,6 @@ 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: diff --git a/.github/workflows/test-secrets3.yml b/.github/workflows/test-secrets3.yml index d6831f1dfc..e09b488f70 100644 --- a/.github/workflows/test-secrets3.yml +++ b/.github/workflows/test-secrets3.yml @@ -2,11 +2,7 @@ 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: From 263c0dbeef8255a36ad8f588a89b8f7f70ae7e38 Mon Sep 17 00:00:00 2001 From: Evgencheg <73418250+Evgencheg@users.noreply.github.com> Date: Sun, 8 Sep 2024 15:06:10 +0300 Subject: [PATCH 8/9] Update conflict-labeler.yml --- .github/workflows/conflict-labeler.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/conflict-labeler.yml b/.github/workflows/conflict-labeler.yml index 84c1cfef80..b91b9203bb 100644 --- a/.github/workflows/conflict-labeler.yml +++ b/.github/workflows/conflict-labeler.yml @@ -15,4 +15,5 @@ jobs: uses: ike709/actions-label-merge-conflict@9eefdd17e10566023c46d2dc6dc04fcb8ec76142 with: dirtyLabel: "Статус: Конфликт" + repoToken: "${{ secrets.GITHUB_TOKEN }}" commentOnDirty: "В этом ПР'е есть конфликты, пожалуйста, устраните их, прежде чем мы сможем оценить ваш ПР." From 903bb0f27e7c5dfc848300cf708a40e3d1621f55 Mon Sep 17 00:00:00 2001 From: TAZIKLIK <73418250+Evgencheg@users.noreply.github.com> Date: Sun, 8 Sep 2024 15:07:26 +0300 Subject: [PATCH 9/9] =?UTF-8?q?=D1=83=D0=B1=D1=80=D0=B0=D0=BB=20=D0=B4?= =?UTF-8?q?=D0=BE=20=D0=BA=D0=BE=D0=BD=D1=86=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/Entities/Mobs/NPCs/animals.yml | 12 ++++++------ Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 8c08c7ba33..087a40ae25 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -190,7 +190,7 @@ movement: state: chicken-0 #- type: Carriable - freeHandsRequired: 1 + # freeHandsRequired: 1 - type: Fixtures fixtures: fix1: @@ -590,7 +590,7 @@ layer: - MobLayer #- type: Carriable - freeHandsRequired: 1 + # freeHandsRequired: 1 - type: Tag tags: - DoorBumpOpener @@ -851,7 +851,7 @@ movement: state: crab #- type: Carriable - freeHandsRequired: 1 + # freeHandsRequired: 1 - type: Physics - type: Fixtures fixtures: @@ -1840,7 +1840,7 @@ state: slug sprite: Mobs/Animals/slug.rsi #- type: Carriable - freeHandsRequired: 1 + # freeHandsRequired: 1 - type: Physics - type: Fixtures fixtures: @@ -1958,7 +1958,7 @@ state: parrot sprite: Mobs/Animals/parrot.rsi #- type: Carriable - freeHandsRequired: 1 + # freeHandsRequired: 1 - type: Fixtures fixtures: fix1: @@ -2979,7 +2979,7 @@ Dead: Base: kitten_dead #- type: Carriable - freeHandsRequired: 1 + # freeHandsRequired: 1 - type: Butcherable spawned: - id: FoodMeat diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml index 8376f13f85..129484420d 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml @@ -172,7 +172,7 @@ noSpawn: true #Must be configured to a King or the AI breaks. components: #- type: Carriable - freeHandsRequired: 1 + # freeHandsRequired: 1 - type: CombatMode - type: MovementSpeedModifier baseWalkSpeed : 3.5