Merge branch 'master' into dbg

Lost-Paradise-Project · Sep 8, 2024 · f0b776a · f0b776a
2 parents d1be55d + cbae24f
commit f0b776a
Show file tree

Hide file tree

Showing 488 changed files with 714 additions and 582 deletions.
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
@@ -1,16 +1,14 @@
 name: Build & Test Debug Secrets
 
+
 on:
   push:
     branches: [ master, staging, trying ]
   merge_group:
-  pull_request:
-    types: [ opened, reopened, synchronize, ready_for_review ]
-    branches: [ master ]
 
 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/Locale/ru-RU/deltav/advertisements/vending/pride.ftl b/Resources/Locale/ru-RU/deltav/advertisements/vending/pride.ftl
@@ -1,5 +1,5 @@
 advertisement-pride-1 = Будь геем!
 advertisement-pride-2 = Полный цветов!
 advertisement-pride-3 = Ты правильный!
-thankyou-pride-1 = Вперёд, делай нарушения законов!
-thankyou-pride-2 = Хорошего цветного дня!
+thankyou-pride-1 = Вперёд, не нарушай законы!
+thankyou-pride-2 = Хорошего белого дня!
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
@@ -4,7 +4,7 @@
     sprite: Objects/Weapons/Guns/SMGs/wt550.rsi
     state: icon
   product: CrateArmorySMG
-  cost: 9000
+  cost: 13000
   category: cargoproduct-category-name-armory
   group: market
 
@@ -14,7 +14,7 @@
     sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi
     state: icon
   product: CrateArmoryShotgun
-  cost: 7000
+  cost: 11000
   category: cargoproduct-category-name-armory
   group: market
 
@@ -44,7 +44,7 @@
     sprite: Objects/Weapons/Guns/Battery/laser_gun.rsi
     state: icon
   product: CrateArmoryLaser
-  cost: 4800
+  cost: 8800
   category: cargoproduct-category-name-armory
   group: market
 
@@ -54,6 +54,6 @@
     sprite: Objects/Weapons/Guns/Pistols/mk58.rsi
     state: icon
   product: CrateArmoryPistols
-  cost: 5200
+  cost: 6000
   category: cargoproduct-category-name-armory
   group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml
@@ -34,7 +34,7 @@
     sprite: DeltaV/Clothing/OuterClothing/Armor/riot.rsi # DeltaV - resprite
     state: icon
   product: CrateSecurityRiot
-  cost: 5500
+  cost: 8000
   category: cargoproduct-category-name-security
   group: market
 

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
@@ -164,7 +164,7 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockSecTechFilled
-  cost: 2200
+  cost: 2590
   category: cargoproduct-category-name-security
   group: market
 

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
@@ -61,10 +61,16 @@
     LPPClothingUniformBlackTracksuit: 4
     LPPClothingUniformBlueTracksuit: 4
     LPPClothingUniformRedTracksuit: 4
+    LPPClothingNeckShemagGreen: 4
+    LPPClothingNeckShemagRed: 4
+    LPPClothingNeckShemagBrown: 4
+    LPPClothingNeckShemagPurple: 4
+    LPPClothingNeckShemagBlue: 4
+    LPPClothingNeckShemagWhite: 4
   contrabandInventory:
     ClothingMaskNeckGaiter: 2
-    ClothingUniformJumpsuitTacticool: 1
-    ClothingUniformJumpskirtTacticool: 1
+    ClothingUniformJumpsuitTacticool: 2
+    ClothingUniformJumpskirtTacticool: 2
     ClothingEyesGlassesSunglasses: 2
     ClothingHandsGlovesColorBlack: 4
     ClothingHandsGlovesColorGray: 4
@@ -74,4 +80,5 @@
     ClothingHandsGlovesColorBlue: 2
     ClothingHandsGlovesColorGreen: 2
     ClothingHandsGlovesColorOrange: 2
-    ClothingHandsGlovesColorPurple: 2
+    ClothingHandsGlovesColorPurple: 2
+    LPPClothingNeckShemagNPZ: 4
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
@@ -25,9 +25,10 @@
     ClothingOuterArmorDuraVest: 2
     ClothingHeadHelmetBasic: 2 # DeltaV - added helmets to the SecTech. Another line of defense between the tide and your grey matter.
     BreachingCharge: 8
+    LPPWeaponEnergyGunSoleil: 2 #LPP
+    LPPTelebaton: 3 #LPP
   # security officers need to follow a diet regimen!
   contrabandInventory:
     FoodDonutHomer: 12
     FoodBoxDonut: 2
     #box evidence
-    LPPTelebaton: 3 #LPP
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
@@ -49,5 +49,6 @@
     ClothingHeadBandBlack: 2
     ClothingHeadBandSkull: 1
     LPPClothingHeadSecHat: 2
-  # contrabandInventory:
-  #   ClothingMaskClownSecurity: 1
+    LPPClothingBalaclavawide: 4
+  contrabandInventory:
+    LPPClothingMaskKinkyMuzzle: 1
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -1736,7 +1736,7 @@
   id: LPPUplinkhelmetswat
   name: шлем спецназа синдиката
   description: Крепкий шлем, что защитит вашу голову от ненужных свинцовых, а так же лазерных выстрелов.
-  icon: { sprite: Clothing/Head/Helmets/swat_syndicate.rsi, state: icon }
+  icon: { sprite: /Textures/Clothing/Head/Helmets/swat_syndicate.rsi, state: icon }
   productEntity: ClothingHeadHelmetSwatSyndicate
   cost:
     Telecrystal: 2

diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml
@@ -4,6 +4,6 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockPrideFilled
-  cost: 1100
+  cost: 2330
   category: Service
   group: market
diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml
@@ -1,12 +1,18 @@
 - type: messagePack
   id: PrideDrobeAds
   messages:
-  - advertisement-pride-1
-  - advertisement-pride-2
-  - advertisement-pride-3
+  # - advertisement-pride-1
+  # - advertisement-pride-2
+  # - advertisement-pride-3
+# Увы (Нет бля УвУ)
+    - advertisement-sectech-1
+    - advertisement-sectech-2
+    - advertisement-sectech-3
+    - advertisement-sectech-4
+    - advertisement-sectech-5
 
 - type: messagePack
   id: PrideDrobeGoodbyes
   messages:
-  - thankyou-pride-1
-  - thankyou-pride-2
+   - thankyou-pride-1
+   - thankyou-pride-2
diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml
@@ -1,29 +1,15 @@
 - type: vendingMachineInventory
   id: PrideDrobeInventory
   startingInventory:
-       ClothingNeckLGBTPin: 3
-       ClothingNeckAromanticPin: 3
-       ClothingNeckAsexualPin: 3
-       ClothingNeckBisexualPin: 3
-       ClothingNeckIntersexPin: 3
-       ClothingNeckLesbianPin: 3
-       ClothingNeckNonBinaryPin: 3
-       ClothingNeckPansexualPin: 3
-       ClothingNeckTransPin: 3
-       PlushieSharkBlue: 2
-       PlushieSharkPink: 2
-       PlushieSharkGrey: 2
-       ClothingNeckCloakTrans: 2
-       ClothingNeckCloakAro: 2
-       ClothingNeckCloakAce: 2
-       ClothingNeckCloakBi: 2
-       ClothingNeckCloakIntersex: 2
-       ClothingNeckCloakEnby: 2
-       ClothingNeckCloakPan: 2
-       ClothingNeckCloakGay: 2
-       ClothingNeckCloakLesbian: 2
-       ClothingHeadHatXmasCrown: 2
-       BedsheetRainbow: 2
-       ClothingUniformColorRainbow: 2
-       ClothingUnderSocksCoder: 1
-       ClothingUnderSocksBee: 1
+       ClothingNeckRussianPin: 99
+       ClothingUnderSocksCoder: 99
+       ClothingNeckCloakTrans: 3
+       ClothingNeckCloakAce: 3
+       ClothingNeckCloakAro: 3
+       ClothingNeckCloakBi: 3
+       ClothingNeckCloakIntersex: 3
+       ClothingNeckCloakLesbian: 3
+       ClothingNeckCloakGay: 3
+       ClothingNeckCloakEnby: 3
+       ClothingNeckCloakPan: 3
+       #Простите Дельтовцы, но мы русские с нами УК и КОАП РФ
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