Merge branch 'master' into BLcorp-Fixs

Lost-Paradise-Project · Sep 30, 2024 · 92cfdd3 · 92cfdd3
2 parents 991d3d8 + 63e18f9
commit 92cfdd3
Show file tree

Hide file tree

Showing 134 changed files with 1,253 additions and 15 deletions.
diff --git a/Resources/Changelog/ChangelogLPP.yml b/Resources/Changelog/ChangelogLPP.yml
@@ -902,3 +902,40 @@ Entries:
   id: 79
   time: '2024-09-29T17:39:16.0000000+00:00'
   url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/228
+- author: MrDarkSide
+  changes:
+    - type: Add
+      message: Добавлен новый чокер
+    - type: Add
+      message: Добавлены беспалые тактические боевые перчатки
+    - type: Add
+      message: Добавлены новостные газеты для репортёров.
+    - type: Tweak
+      message: Изменение спрайта некоторых ручек.
+    - type: Add
+      message: Добавлен обычный карандаш
+    - type: Tweak
+      message: Изменение спрайтов таких печатей как  Отказ, Одобрено, Изменить.
+    - type: Add
+      message: Добавлена упаковка бумаг
+    - type: Add
+      message: Добавлены три новых Пижамы Акулы которые можно найти в Одеждомате
+    - type: Add
+      message: >-
+        Добавлено более 5-ти новых кошельков. В кошельках появляются деньги от
+        1000 до 2500 кредитов.
+    - type: Add
+      message: Добавлены новые папки для службы безопасности, капитана и прочих ролей.
+    - type: Add
+      message: >-
+        Добавлено появление кодов авторизации к боеголовке в сверх секретную
+        папку капитана
+    - type: Add
+      message: Добавлено появление новых папок в шкаф к должностям
+    - type: Add
+      message: Добавлены новые постеры!
+    - type: Fix
+      message: Исправлен баг с взаимодействиями. Теперь настроение работает как нужно
+  id: 80
+  time: '2024-09-30T17:44:46.0000000+00:00'
+  url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/220
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
@@ -33,7 +33,7 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockClothesFilled
-  cost: 2700
+  cost: 2920
   category: cargoproduct-category-name-service
   group: market
 

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -49,6 +49,10 @@
       - id: RubberStampCaptain
 #     - id: WeaponAntiqueLaser # DeltaV - Remove in favor of the glass box
       - id: JetpackCaptainFilled
+      # - < DarkSide
+      - id: LPPBoxFolderSecretCap
+      - id: LPPBoxFolderCap
+      # - >
       - id: MedalCase
       - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
         prob: 0.3
@@ -68,6 +72,10 @@
       - id: CommsComputerCircuitboard
       - id: ClothingHeadsetAltCommand
       - id: SpaceCash1000
+      # - < DarkSide
+      - id: LPPBoxFolderSecretCap
+      - id: LPPBoxFolderCap
+      # - >
       - id: PlushieNuke
         prob: 0.1
       - id: CigarGoldCase
@@ -91,6 +99,10 @@
     contents:
       - id: ClothingOuterArmorCaptainCarapace
       - id: NukeDisk
+      # - < DarkSide
+      - id: LPPBoxFolderSecretCap
+      - id: LPPBoxFolderCap
+      # - >
       - id: PinpointerNuclear
 #      - id: CaptainIDCard # Delta V - Replaced by spare ID system. The funny biscuit that I cant even eat.
       - id: WeaponDisabler
@@ -140,6 +152,10 @@
       - id: ClothingHandsGlovesInspection # DeltaV - Add inspection gloves for HoP.
       - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
         prob: 0.3
+  # -< DarkSide
+      - id: LPPBoxFolderSecretBlue
+        prob: 0.6
+  # - >
 
 - type: entity
   id: LockerChiefEngineerFilledHardsuit

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -31,6 +31,9 @@
       - id: LPPWeaponPistolPF20
       - id: LPPMagazinePistolPF20lethal
       - id: LPPMagazinePistolPF20Rubber
+      - id: LPPBoxFolderSecretRed
+      - id: LPPBoxFolderSecDoc
+        prob: 0.5
       - id: LPPHOSUplinkShop #На будущее, будет хайриском
 
 - type: entity
@@ -66,6 +69,11 @@
       - id: LPPMagazinePistolPF20lethal
       - id: LPPMagazinePistolPF20Rubber
         prob: 0.5 #Кибербуллинг метаюзеров :D
+      # -< DarkSide
+      - id: LPPBoxFolderSecretRed
+      - id: LPPBoxFolderSecDoc
+        prob: 0.5
+      # - >
 
 - type: entity
   id: LockerSecurityFilled
@@ -119,6 +127,10 @@
         prob: 0.01
       - id: ClothingMaskClown
         prob: 0.1
+      # -< DarkSide
+      - id: LPPBoxFolderSecDoc
+        prob: 0.5
+      # - >
       - id: WeaponDisabler
         prob: 0.33
 
@@ -222,6 +234,11 @@
         prob: 0.3
 #LPP
       - id: LPPClothingOuterDetectiveHardsuit
+      # -< DarkSide
+      - id: LPPBoxFolderSecDoc
+        amount: 2
+        prob: 0.5
+      # - >
 
 - type: entity
   id: ClosetBombFilled

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
@@ -67,6 +67,11 @@
     LPPClothingNeckShemagPurple: 4
     LPPClothingNeckShemagBlue: 4
     LPPClothingNeckShemagWhite: 4
+    # - < DarkSide
+    LPPClothingOuterCoatPajamsSharkGray: 2
+    LPPClothingOuterCoatPajamsSharkPink: 2
+    LPPClothingOuterCoatPajamsSharkBlue: 2
+    # - >
   contrabandInventory:
     ClothingMaskNeckGaiter: 2
     ClothingUniformJumpsuitTacticool: 2

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
@@ -24,6 +24,7 @@
     ClothingOuterArmorDuraVest: 2
     ClothingHeadHelmetBasic: 2 # DeltaV - added helmets to the SecTech. Another line of defense between the tide and your grey matter.
     # BreachingCharge: 8
+    LPPClothingHandsGlovesTacticalFingerless: 1  # Lost Paradise - Добавление тактических беспалых боевых перчаток
     LPPTelebaton: 3 #LPP
   # security officers need to follow a diet regimen!
   contrabandInventory:

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml
@@ -169,4 +169,12 @@
       - PosterLegitShoukou # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmount/Signs/posters.yml
       - PosterLegitCornzza # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmount/Signs/posters.yml
       - PosterLegitFuckAround # DeltaV Poster, see Resources/Prototypes/DeltaV/Entities/Structures/Wallmount/Signs/posters.yml
+
+      # - < DarkSide - LOST PARADISE, see Resources/Prototypes/_LostParadise/Entities/Structures/Wallmounts/posters.yml
+      - LPPPosterHappyNewYear
+      - LPPPosterNoAlcohol
+      - LPPPosterSport
+      - LPPPosterTimeTea
+      # - >
+
     chance: 1
diff --git a/Resources/Prototypes/Loadouts/items.yml b/Resources/Prototypes/Loadouts/items.yml
@@ -757,3 +757,14 @@
   cost: 1
   items:
     - DrinkVacuumFlask
+
+# - < DarkSide - LOST PARADISE
+
+- type: loadout
+  id: LPPLoadoutPaperIdCardUSSP
+  category: Items
+  cost: 3
+  items:
+    - LPPPaperIdCardUSSP
+
+# - > 
diff --git a/Resources/Prototypes/_LostParadise/Catalog/VendingMachines/Inventories/ERPMachine.yml b/Resources/Prototypes/_LostParadise/Catalog/VendingMachines/Inventories/ERPMachine.yml
@@ -61,6 +61,7 @@
     LPPClothingNeckBellCollarPurple: 3
     LPPClothingNeckBellCollarOrange: 3
     LPPClothingNeckCollarSpiked: 3
+    LPPClothingNeckCollarHeart: 3 # < DarkSide >
     LPPClothingMaskKinkyMuzzle: 3
     LPPClothingUniformboobasuit: 3
     LPPClothingHeadHatMaid: 3

diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Hand/gloves.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Hand/gloves.yml
@@ -17,4 +17,19 @@
     attackRate: 1.5
     damage:
       types:
-        Blunt: 7
+        Blunt: 7
+
+# - < DarkSide
+
+- type: entity
+  parent: ClothingHandsGlovesCombat
+  id: LPPClothingHandsGlovesTacticalFingerless
+  name: тактические беспалые боевые перчатки
+  description: Эти тактические перчатки огнеупорны и ударопрочны.
+  components:
+  - type: Sprite
+    sprite: _LostParadise/Clothing/Hands/Gloves/CombatFingerless.rsi
+  - type: Clothing
+    sprite: _LostParadise/Clothing/Hands/Gloves/CombatFingerless.rsi
+
+# - >
diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Neck/chokers.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Neck/chokers.yml
@@ -90,4 +90,20 @@
   - type: Sprite
     sprite: _LostParadise/Clothing/Neck/chokers/spiked.rsi
   - type: Clothing
-    sprite: _LostParadise/Clothing/Neck/chokers/spiked.rsi
+    sprite: _LostParadise/Clothing/Neck/chokers/spiked.rsi
+
+# Made DarkSide - <
+
+- type: entity
+  parent: ClothingNeckBase
+  id: LPPClothingNeckCollarHeart
+  name: чокер c сердцем
+  description: Чокер с сердцем, вы либо милашка, либо питомец, раз решились такое носить.
+  components:
+  - type: Sprite
+    sprite: _LostParadise/Clothing/Neck/chokers/heart.rsi
+  - type: Clothing
+    sprite: _LostParadise/Clothing/Neck/chokers/heart.rsi
+
+
+# - >
diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/SharkPajamas.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/SharkPajamas.yml
@@ -0,0 +1,121 @@
+# - < DarkSide
+# Пижамы акул 
+
+- type: entity
+  parent: ClothingOuterWinterCoat
+  id: LPPClothingOuterCoatPajamsSharkPink
+  name: Розовая пижама акулы
+  description: А я рыба, я рыба, я рыба....
+  components:
+  - type: Sprite
+    sprite: _LostParadise/Clothing/OuterClothing/Pajams/shark_pink.rsi
+  - type: Clothing
+    sprite: _LostParadise/Clothing/OuterClothing/Pajams/shark_pink.rsi
+  - type: Tag
+    tags:
+    - ClothMade
+    - WhitelistChameleon
+    - HidesHarpyWings
+    - HidesTail
+  - type: ToggleableClothing
+    clothingPrototype: LPPHelmetPajamsSharkPink
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+      storagebase: !type:Container
+        ents: []
+
+- type: entity
+  parent: ClothingHeadBase
+  id: LPPHelmetPajamsSharkPink
+  noSpawn: true
+  name: капюшон пижамы акулы
+  description: Милота :3
+  components:
+  - type: Sprite
+    sprite: _LostParadise/Clothing/Head/Pajams/shark_pink.rsi
+  - type: Clothing
+    sprite: _LostParadise/Clothing/Head/Pajams/shark_pink.rsi
+  - type: Tag
+    tags:
+    - HidesHair
+
+- type: entity
+  parent: ClothingOuterWinterCoat
+  id: LPPClothingOuterCoatPajamsSharkBlue
+  name: Синия пижама акулы
+  description: А я рыба, я рыба, я рыба....
+  components:
+  - type: Sprite
+    sprite: _LostParadise/Clothing/OuterClothing/Pajams/shark_blue.rsi
+  - type: Clothing
+    sprite: _LostParadise/Clothing/OuterClothing/Pajams/shark_blue.rsi
+  - type: Tag
+    tags:
+    - ClothMade
+    - WhitelistChameleon
+    - HidesHarpyWings
+    - HidesTail
+  - type: ToggleableClothing
+    clothingPrototype: LPPHelmetPajamsSharkBlue
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+      storagebase: !type:Container
+        ents: []
+
+- type: entity
+  parent: ClothingHeadBase
+  id: LPPHelmetPajamsSharkBlue
+  noSpawn: true
+  name: капюшон пижамы акулы
+  description: Милота :3
+  components:
+  - type: Sprite
+    sprite: _LostParadise/Clothing/Head/Pajams/shark_blue.rsi
+  - type: Clothing
+    sprite: _LostParadise/Clothing/Head/Pajams/shark_blue.rsi
+  - type: Tag
+    tags:
+    - HidesHair
+
+- type: entity
+  parent: ClothingOuterWinterCoat
+  id: LPPClothingOuterCoatPajamsSharkGray
+  name: Серая пижама акулы
+  description: А я рыба, я рыба, я рыба....
+  components:
+  - type: Sprite
+    sprite: _LostParadise/Clothing/OuterClothing/Pajams/shark_gray.rsi
+  - type: Clothing
+    sprite: _LostParadise/Clothing/OuterClothing/Pajams/shark_gray.rsi
+  - type: Tag
+    tags:
+    - ClothMade
+    - WhitelistChameleon
+    - HidesHarpyWings
+    - HidesTail
+  - type: ToggleableClothing
+    clothingPrototype: LPPHelmetPajamsSharkGray
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+      storagebase: !type:Container
+        ents: []
+
+- type: entity
+  parent: ClothingHeadBase
+  id: LPPHelmetPajamsSharkGray
+  noSpawn: true
+  name: капюшон пижамы акулы
+  description: Милота :3
+  components:
+  - type: Sprite
+    sprite: _LostParadise/Clothing/Head/Pajams/shark_gray.rsi
+  - type: Clothing
+    sprite: _LostParadise/Clothing/Head/Pajams/shark_gray.rsi
+  - type: Tag
+    tags:
+    - HidesHair
+
+# - >