Merge branch 'Lost-Paradise-Project:master' into MapFix

Resources/Changelog/ChangelogLPP.yml

@@ -2907,3 +2907,68 @@
   id: 154
   time: '2024-12-21T14:26:43.0000000+00:00'
   url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/350
+- author: Remuchi
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u044D\u043B\u044C\
+      \u0444\u0438\u0439\u0441\u043A\u0438\u0435 \u0443\u0448\u043A\u0438 \u0434\u043B\
+      \u044F \u0441\u043B\u0430\u0439\u043C\u043E\u043B\u044E\u0434\u0435\u0439."
+    type: Add
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0436\u0438\u0432\
+      \u043E\u0442\u043D\u044B\u0435 \u0443\u0448\u043A\u0438 \u0438 \u0445\u0432\u043E\
+      \u0441\u0442\u0438\u043A\u0438 \u0434\u043B\u044F \u0441\u043B\u0430\u0439\u043C\
+      \u043E\u043B\u044E\u0434\u0435\u0439 \u0434\u043B\u044F \u0441\u043F\u043E\u043D\
+      \u0441\u043E\u0440\u043E\u0432."
+    type: Add
+  id: 155
+  time: '2024-12-22T15:34:20.0000000+00:00'
+  url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/345
+- author: Kest
+  changes:
+  - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u0434\u043B\u044F \u0438\u0433\
+      \u0440\u044B \u043D\u0430 \u043E\u0444\u0438\u0446\u0435\u0440\u0435 \u0441\u043D\
+      \u043E\u0432\u0430 \u043D\u0443\u0436\u043D\u043E \u043D\u0430\u0438\u0433\u0440\
+      \u0430\u0442\u044C 4 \u0447\u0430\u0441\u0430 \u0432 \u0441\u0431! (\u0431\u044B\
+      \u043B\u043E 0\u0447)"
+    type: Tweak
+  id: 156
+  time: '2024-12-22T22:02:35.0000000+00:00'
+  url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/358
+- author: Kest
+  changes:
+  - message: "\u0423\u0431\u0440\u0430\u043D\u0430 \u043F\u0430\u043F\u043A\u0430\
+      \ \u0441 \u043A\u043E\u0434\u0430\u043C\u0438 \u044F\u0434\u0435\u0440\u043D\
+      \u043E\u0439 \u0430\u0432\u0442\u043E\u0440\u0438\u0437\u0430\u0446\u0438\u0438\
+      \ \u0438\u0437 \u0448\u043A\u0430\u0444\u0430 \u043A\u0430\u043F\u0438\u0442\
+      \u0430\u043D\u0430"
+    type: Remove
+  - message: "\u0423\u0431\u0440\u0430\u043D\u0430 \u0432\u043E\u0437\u043C\u043E\u0436\
+      \u043D\u043E\u0441\u0442\u044C \u043A\u0443\u043F\u0438\u0442\u044C \u0441\u043A\
+      \u0430\u0444\u0430\u043D\u0434\u0440 Guan-Yu \u0432 \u043A\u0430\u0440\u0433\
+      \u043E"
+    type: Remove
+  - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u044B \u0441\u043F\u0440\u0430\
+      \u0439\u0442\u044B \u043A\u0430\u0431\u0435\u043B\u0435\u0439"
+    type: Tweak
+  - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u0430 \u0441\u0438\u0441\u0442\
+      \u0435\u043C\u0430 \u0440\u0430\u0431\u043E\u0442\u044B \u043D\u043E\u0436\u0435\
+      \u043D \u0443 \u043A\u0430\u0442\u0430\u043D\u044B"
+    type: Tweak
+  - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0430 \u0430\u043D\
+      \u0438\u043C\u0430\u0446\u0438\u044F \u043A\u0440\u0438\u043E\u043A\u0430\u043F\
+      \u0441\u0443\u043B\u044B"
+    type: Fix
+  - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D \u043D\u0435\u043E\
+      \u043D\u043E\u0432\u044B\u0439 \u0431\u043E\u0442\u0438\u043D\u043E\u043A \u0443\
+      \ \u0441\u043A\u0430\u0444\u0430\u043D\u0434\u0440\u0430 \u042D\u0421"
+    type: Fix
+  id: 157
+  time: '2024-12-23T10:37:56.0000000+00:00'
+  url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/325
+- author: Evgencheg
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u043E\u0437\u0432\
+      \u0443\u0447\u043A\u0430 \u0430\u0444\u043E\u043D\u0438. CASSIE"
+    type: Add
+  id: 158
+  time: '2024-12-24T13:08:56.0000000+00:00'
+  url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/362

Resources/Locale/en-US/_LostParadise/update20.ftl

@@ -4,7 +4,8 @@ trait-desc-ElfLanguage = Вы знаете Эльфийский (Нет, не OO
 trait-name-DwarfLanguage = Дворфийский
 trait-desc-DwarfLanguage = Если не вслушиваться похоже на бубнёж русских пьяниц
 changelog-tab-title-ChangelogLPP = Обновления Lost Paradise
-announcer-NTH-name = N.T.H
+announcer-NTH-name = N.T.H.
+announcer-AFONYA-name = C.A.S.S.I.E.
 chatsan-awoo = воет
 chatsan-hiss = шипит
 chatsan-nyaaa = някает

Resources/Locale/ru-RU/_LostParadise/update20.ftl

@@ -4,7 +4,8 @@ trait-desc-ElfLanguage = Вы знаете Эльфийский (Нет, не OO
 trait-name-DwarfLanguage = Дворфийский
 trait-desc-DwarfLanguage = Если не вслушиваться похоже на бубнёж русских пьяниц
 changelog-tab-title-ChangelogLPP = Обновления Lost Paradise
-announcer-NTH-name = N.T.H
+announcer-NTH-name = N.T.H.
+announcer-AFONYA-name = C.A.S.S.I.E.
 chatsan-awoo = воет
 chatsan-hiss = шипит
 chatsan-nyaaa = някает

Resources/Prototypes/Announcers/!randomAnnouncers.yml

@@ -1,4 +1,5 @@
 - type: weightedRandom
   id: RandomAnnouncers
   weights:
-    NTH: 1
+    NTH: 0.5
+    AFONYA: 0.5

Resources/Prototypes/Catalog/Cargo/cargo_hardsuits.yml

@@ -47,10 +47,20 @@
     sprite: Nyanotrasen/Clothing/OuterClothing/ReverseEngineering/syndicate.rsi
     state: icon
   product: CrateSecurityShanlinTacsuit
-  cost: 30000
+  cost: 17500
   category: cargoproduct-category-name-hardsuits
   group: market
 
+#- type: cargoProduct
+#  id: SecurityGuanYuTacsuit
+#  icon:
+#    sprite: Nyanotrasen/Clothing/OuterClothing/ReverseEngineering/juggernaut.rsi
+#    state: icon
+#  product: CrateSecurityGuanYuTacsuit
+#  cost: 30000
+#  category: cargoproduct-category-name-hardsuits
+#  group: market
+
 - type: cargoProduct
   id: SecurityBaghaturTacsuit
   icon:

Resources/Prototypes/Catalog/Fills/Lockers/heads.yml

@@ -52,10 +52,6 @@
       - 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
@@ -75,11 +71,6 @@
       - id: WeaponDisabler
       - id: CommsComputerCircuitboard
       - id: ClothingHeadsetAltCommand
-      - id: SpaceCash1000
-      # - < DarkSide
-      - id: LPPBoxFolderSecretCap
-      - id: LPPBoxFolderCap
-      # - >
       - id: PlushieNuke
         prob: 0.1
       - id: CigarGoldCase
@@ -104,10 +95,6 @@
     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

Resources/Prototypes/DeltaV/Catalog/Fills/Items/Belts/belts.yml

@@ -3,10 +3,12 @@
   parent: ClothingBeltKatanaSheath
   suffix: Filled
   components:
-  - type: StorageFill
-    contents:
-      - id: Wakizashi
-      - id: Katana
+  - type: ContainerFill
+    containers:
+      katana:
+      - Katana
+      wakizashi:
+      - Wakizashi
 
 - type: entity
   id: ClothingBeltKatanaSheathFilledHoS

Resources/Prototypes/Entities/Structures/Power/cables.yml

@@ -69,6 +69,12 @@
   - type: Cable
     cableDroppedOnCutPrototype: CableHVStack1
     cableType: HighVoltage
+  - type: DamageVisuals
+    thresholds: [4, 8, 12]
+    damageDivisor: 3.333
+    trackAllDamage: true
+    damageOverlay:
+      sprite: Structures/Power/Cables/hv_cable_damage.rsi
   - type: Destructible
     thresholds:
     - trigger:
@@ -105,11 +111,9 @@
   description: A medium voltage power cable.
   components:
   - type: Sprite
-    color: Yellow
     sprite: Structures/Power/Cables/mv_cable.rsi
     state: mvcable_0
   - type: Icon
-    color: Yellow
     sprite: Structures/Power/Cables/mv_cable.rsi
     state: mvcable_4
   - type: NodeContainer
@@ -149,11 +153,9 @@
   description: A cable used to connect machines to an APC. #APCs aren't area defined anymore so need this cable to connect things to the APC. This description should be dynamic in future.
   components:
   - type: Sprite
-    color: Green
     sprite: Structures/Power/Cables/lv_cable.rsi
     state: lvcable_0
   - type: Icon
-    color: Green
     sprite: Structures/Power/Cables/lv_cable.rsi
     state: lvcable_4
   - type: NodeContainer

Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml

@@ -37,7 +37,7 @@
     sprite: Nyanotrasen/Clothing/Belt/Martial/black.rsi
 
 - type: entity
-  parent: ClothingBeltStorageBase
+  parent: [ClothingBeltBase, ClothingSlotBase]
   id: ClothingBeltKatanaSheath
   name: katana sheaths
   description: An ornate belt designed to hold a pair of samurai's blades, or daisho.
@@ -47,18 +47,42 @@
     state: sheath
   - type: Clothing
     sprite: Nyanotrasen/Clothing/Belt/katanasheath.rsi
-  - type: Storage
-    grid:
-      - 0,0,3,1
-    whitelist:
-      tags:
-        - Katana
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: []
+      katana: !type:ContainerSlot
+      wakizashi: !type:ContainerSlot
+  - type: ItemSlots
+    slots:
+      katana:
+        name: Katana
+        insertVerbText: sheath-insert-verb
+        ejectVerbText: sheath-eject-verb
+        insertSound: /Audio/SimpleStation14/Items/Handling/sword_sheath.ogg
+        ejectSound: /Audio/SimpleStation14/Items/Handling/sword_unsheath.ogg
+        whitelist:
+          tags:
+          - Katana
+      wakizashi:
+        name: Wakizashi
+        insertVerbText: sheath-insert-verb
+        ejectVerbText: sheath-eject-verb
+        insertSound: /Audio/SimpleStation14/Items/Handling/sword_sheath.ogg
+        ejectSound: /Audio/SimpleStation14/Items/Handling/sword_unsheath.ogg
+        whitelist:
+          tags:
+          - Wakizashi
   - type: ItemMapper
     mapLayers:
-      sheath-sabre:
+      sheath-katana:
         whitelist:
           tags:
           - Katana
+      sheath-wakizashi:
+        whitelist:
+          tags:
+          - Wakizashi
   - type: Appearance
   - type: Tag
     tags:

Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/sword.yml

@@ -6,7 +6,7 @@
   components:
   - type: Tag
     tags:
-    - Katana
+    - Wakizashi
   - type: Sharp
   - type: Utensil
     types:

Resources/Prototypes/Roles/Jobs/Security/security_officer.yml

@@ -8,6 +8,7 @@
       min: 160
     - !type:CharacterDepartmentTimeRequirement
       department: Security
+      min: 14400 # DeltaV - 4 hours
   startingGear: SecurityOfficerGear
   icon: "JobIconSecurityOfficer"
   supervisors: job-supervisors-hos