Merge remote-tracking branch 'upstream/master'

Resources/Changelog/ChangelogWhite.yml

@@ -5921,3 +5921,68 @@
   id: 384
   time: '2024-07-17T11:14:59.0000000+00:00'
   url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/452
+- author: PointPNG
+  changes:
+  - message: "\u041E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u0438\u0435 \u041C\u0443\
+      \u0441\u0430."
+    type: Add
+  id: 385
+  time: '2024-07-17T11:56:53.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/453
+- author: ThereDrD
+  changes:
+  - message: "\u041A\u0430\u043F\u0438\u0442\u0430\u043D \u0442\u0435\u043F\u0435\u0440\
+      \u044C \u043C\u043E\u0436\u0435\u0442 \u0432\u044B\u0431\u0440\u0430\u0442\u044C\
+      \ \u043A\u0430\u043F\u0438\u0442\u0430\u043D\u0441\u043A\u0438\u0435 \u043F\u0435\
+      \u0440\u0447\u0430\u0442\u043A\u0438 \u0432 \u043B\u043E\u0430\u0434\u0430\u0443\
+      \u0442\u0430\u0445"
+    type: Add
+  - message: "\u0425\u043E\u043F \u0442\u0435\u043F\u0435\u0440\u044C \u0441\u043F\
+      \u0430\u0432\u043D\u0438\u0442\u0441\u044F \u0441\u043E \u0441\u0432\u043E\u0438\
+      \u043C \u041F\u0414\u0410"
+    type: Fix
+  id: 386
+  time: '2024-07-17T12:13:18.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/455
+- author: ThereDrD
+  changes:
+  - message: "\u0421\u0411 \u043F\u043E\u043B\u0443\u0447\u0438\u043B\u043E \u043F\
+      \u0435\u0440\u0447\u0430\u0442\u043A\u0438"
+    type: Add
+  id: 387
+  time: '2024-07-17T12:20:27.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/456
+- author: Spatison
+  changes:
+  - message: "\u0412 \u0432\u043E\u043B\u0448\u0435\u0431\u043D\u043E\u043C \u0437\
+      \u0435\u0440\u043A\u0430\u043B\u0435 \u0442\u0435\u043F\u0435\u0440\u044C \u043C\
+      \u043E\u0436\u043D\u043E \u043C\u0435\u043D\u044F\u0442\u044C \u0447\u0435\u0440\
+      \u0442\u044B \u0432\u043D\u0435\u0448\u043D\u043E\u0441\u0442\u0438"
+    type: Tweak
+  id: 388
+  time: '2024-07-17T13:42:53.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/457
+- author: ThereDrD
+  changes:
+  - message: "\u0422\u0440\u043E\u0441\u0442\u044C \u0431\u0438\u0431\u043B\u0438\u043E\
+      \u0442\u0435\u043A\u0430\u0440\u044F \u0442\u0435\u043F\u0435\u0440\u044C \u043D\
+      \u0435 \u043B\u043E\u043C\u0430\u0435\u0442 \u043B\u043E\u0430\u0434\u0430\u0443\
+      \u0442\u044B \u0438 \u043E\u0434\u0435\u0432\u0430\u0435\u0442\u0441\u044F"
+    type: Fix
+  - message: "\u041A\u043E\u0436\u0430\u043D\u0430\u044F \u0441\u0443\u043C\u043A\u0430\
+      \ \u043F\u043E\u043B\u0443\u0447\u0438\u043B\u0430 \u0441\u0442\u0430\u0440\u0442\
+      \u043E\u0432\u044B\u0439 \u044D\u043A\u0441\u0442\u0440\u0435\u043D\u043D\u044B\
+      \u0439 \u043D\u0430\u0431\u043E\u0440"
+    type: Fix
+  id: 389
+  time: '2024-07-17T13:42:21.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/458
+- author: Spatison
+  changes:
+  - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0430 \u0430\u043D\
+      \u0438\u043C\u0430\u0446\u0438\u044F \u0431\u043E\u0442\u0438\u043D\u043E\u043A\
+      \ \u043A\u043B\u043E\u0443\u043D\u0430"
+    type: Fix
+  id: 390
+  time: '2024-07-17T18:06:22.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/459

Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml

@@ -7,6 +7,15 @@
     contents:
       - id: BoxSurvival
 
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackSatchelLeather
+  id: ClothingBackpackSatchelLeatherFilled
+  components:
+  - type: StorageFill
+    contents:
+    - id: BoxSurvival
+
 - type: entity
   noSpawn: true
   parent: ClothingBackpackSatchel

Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml

@@ -19,7 +19,7 @@
 
 # Ears
 
-- type: itemLoadout
+- type: itemLoadout # WD
   id: QuartermasterHeadset
   equipment: QuartermasterHeadset
 - type: startingGear
@@ -27,6 +27,14 @@
   equipment:
     ears: ClothingHeadsetQM
 
+- type: itemLoadout # WD
+  id: QuartermasterHeadsetAlt
+  equipment: QuartermasterHeadsetAlt
+- type: startingGear
+  id: QuartermasterHeadsetAlt
+  equipment:
+    ears: ClothingHeadsetAltCargo
+
 # Jumpsuit
 - type: itemLoadout
   id: QuartermasterJumpsuit

Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml

@@ -1,3 +1,13 @@
+# Ears
+
+- type: itemLoadout # WD
+  id: SalvageSpecialistHeadset
+  equipment: SalvageSpecialistHeadset
+- type: startingGear
+  id: SalvageSpecialistHeadset
+  equipment:
+    ears: ClothingHeadsetMining
+
 # Mask
 
 - type: itemLoadout # WD

Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml

@@ -97,6 +97,17 @@
   equipment:
     outerClothing: ClothingOuterWinterJani
 
+- type: itemLoadout # WD
+  id: JanitorWetFloorSign
+  equipment: JanitorWetFloorSign
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: TimerJanitorFunnyHeads
+- type: startingGear
+  id: JanitorWetFloorSign
+  equipment:
+    outerClothing: WetFloorSign
+
 # PDA
 
 - type: itemLoadout # WD

Resources/Prototypes/Loadouts/Jobs/Command/captain.yml

@@ -120,6 +120,15 @@
   equipment:
     outerClothing: ClothingOuterWinterCap
 
+# Gloves
+- type: itemLoadout
+  id: CaptainGloves
+  equipment: CaptainGloves
+- type: startingGear
+  id: CaptainGloves
+  equipment:
+    gloves: ClothingHandsGlovesCaptain
+
 # PDA
 
 - type: itemLoadout # WD

Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml

@@ -122,7 +122,7 @@
 - type: startingGear
   id: HoPPDA
   equipment:
-    gloves: HoPPDA
+    id: HoPPDA
 
 # Ears
 - type: itemLoadout # WD

Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml

@@ -1,3 +1,13 @@
+# Glasses
+
+- type: itemLoadout
+  id: ChemistGlasses
+  equipment: ChemistGlasses
+- type: startingGear
+  id: ChemistGlasses
+  equipment:
+    eyes: ClothingEyesGlassesChemical
+
 # Jumpsuit
 - type: itemLoadout
   id: ChemistJumpsuit

Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml

@@ -103,6 +103,14 @@
   equipment:
     ears: ClothingHeadsetCMO
 
+- type: itemLoadout # WD
+  id: CMOHeadsetAlt
+  equipment: CMOHeadsetAlt
+- type: startingGear
+  id: CMOHeadsetAlt
+  equipment:
+    ears: ClothingHeadsetAltMedical
+
 # PDA
 
 - type: itemLoadout # WD

Resources/Prototypes/Loadouts/Jobs/Medical/medical_intern.yml

@@ -25,4 +25,4 @@
 - type: startingGear
   id: MedicalInternPDA
   equipment:
-    jumpsuit: MedicalInternPDA
+    id: MedicalInternPDA

Resources/Prototypes/Loadouts/Jobs/Wildcards/reporter.yml

@@ -23,4 +23,4 @@
 - type: startingGear
   id: ReporterPDA
   equipment:
-    jumpsuit: ReporterPDA
+    id: ReporterPDA

Resources/Prototypes/Loadouts/Jobs/common.yml

@@ -1,4 +1,15 @@
-# Eyes
+# Timers
+
+- type: loadoutEffectGroup # WD
+  id: TimerTrueAssistant
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobPassenger
+      time: 180000 # 50 hours
+
+# Eyes
 
 - type: itemLoadout
   id: GlassesGarOrange
@@ -141,6 +152,17 @@
   equipment:
     outerClothing: ClothingOuterHoodieBlack
 
+- type: itemLoadout
+  id: CoatSpaceAsshole
+  equipment: CoatSpaceAsshole
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: TimerTrueAssistant
+- type: startingGear
+  id: CoatSpaceAsshole
+  equipment:
+    outerClothing: ClothingOuterCoatSpaceAsshole
+
 # Gloves
 
 - type: itemLoadout
@@ -337,7 +359,7 @@
 - type: startingGear
   id: CommonSatchelLeather
   equipment:
-    back: ClothingBackpackSatchelLeather
+    back: ClothingBackpackSatchelLeatherFilled
 
 # Mask
 
@@ -443,12 +465,13 @@
   equipment:
     belt: ClothingBeltUtility
 
-# Inhands
+# Job trinkets
 
 - type: itemLoadout
   id: Cane
   equipment: Cane
 - type: startingGear
   id: Cane
-  equipment:
-    belt: Cane
+  storage:
+    back:
+    - Cane

Resources/Prototypes/Loadouts/loadout_groups.yml

@@ -65,6 +65,7 @@
   - CaptainBackpack
   - CaptainSatchel
   - CaptainDuffel
+  - CaptainDuffel
   - CommonSatchelLeather # WD
 
 - type: loadoutGroup
@@ -75,6 +76,13 @@
   - CaptainOuterClothing
   - CaptainWintercoat
 
+- type: loadoutGroup
+  id: CaptainOuterClothing
+  name: loadout-group-gloves
+  minLimit: 0
+  loadouts:
+  - CaptainGloves
+
 - type: loadoutGroup
   id: CaptainShoes
   name: loadout-group-shoes
@@ -209,6 +217,7 @@
   - CoatGentle
   - AssistantWintercoat
   - CoatBomber
+  - CoatSpaceAsshole
 
 - type: loadoutGroup # WD
   id: AssistantPDA
@@ -405,6 +414,7 @@
   minLimit: 0
   loadouts:
   - JanitorWintercoat
+  - JanitorWetFloorSign # WD
 
 - type: loadoutGroup
   id: JanitorPDA
@@ -724,8 +734,8 @@
   - BootsWinter
 
 - type: loadoutGroup # WD
-  id: InhandCane
-  name: loadout-group-inhand
+  id: ItemCane
+  name: loadout-group-job-trinkets
   minLimit: 0
   loadouts:
   - Cane
@@ -749,6 +759,7 @@
   name: loadout-group-ears
   loadouts:
   - QuartermasterHeadset
+  - QuartermasterHeadsetAlt
 
 - type: loadoutGroup
   id: QuartermasterJumpsuit
@@ -858,6 +869,12 @@
   - MercenaryBand
   - MercenaryBeret
 
+- type: loadoutGroup # WD
+  id: SalvageSpecialistHeadset
+  name: loadout-group-ears
+  loadouts:
+  - SalvageSpecialistHeadset
+
 - type: loadoutGroup # WD
   id: SalvageSpecialistEyes
   name: loadout-group-eyes
@@ -1582,12 +1599,6 @@
 
 # Medical
 
-- type: loadoutGroup
-  id: ChiefMedicalOfficerEars
-  name: loadout-group-ears
-  loadouts:
-  - CMOHeadset
-
 - type: loadoutGroup
   id: ChiefMedicalOfficerHead
   name: loadout-group-head
@@ -1600,6 +1611,13 @@
   - PurpleSurgeryCap
   - CowboyWhite
 
+- type: loadoutGroup # WD
+  id: ChiefMedicalOfficerEars
+  name: loadout-group-ears
+  loadouts:
+  - CMOHeadset
+  - CMOHeadsetAlt
+
 - type: loadoutGroup
   id: ChiefMedicalOfficerJumpsuit
   name: loadout-group-jumpsuit
@@ -1749,7 +1767,7 @@
 
 - type: loadoutGroup
   id: MedicalInternPDA
-  name: loadout-group-jumpsuit
+  name: loadout-group-pda
   loadouts:
   - MedicalInternPDA
 
@@ -1764,11 +1782,12 @@
   - PurpleSurgeryCap
   - CowboyWhite
 
-- type: loadoutGroup
+- type: loadoutGroup # WD
   id: ChemistEyes
   name: loadout-group-eyes
   minLimit: 0
   loadouts:
+  - ChemistGlasses
   - GlassesGarOrange
 
 - type: loadoutGroup

Resources/Prototypes/Loadouts/role_loadouts.yml

@@ -96,7 +96,7 @@
   - CommonBackpack
   - CommonShoes # WD
   - LibrarianPDA
-  - InhandCane
+  - ItemCane # WD
   - Trinkets
 
 - type: roleLoadout
@@ -224,7 +224,7 @@
   id: JobSalvageSpecialist
   groups:
   - SalvageSpecialistHead # WD
-  - CommonCargoEars # WD
+  - SalvageSpecialistHeadset # WD
   - SalvageSpecialistEyes # WD
   - SalvageSpecialistMask # WD
   - SalvageSpecialistJumpsuit # WD
@@ -372,6 +372,7 @@
   - HeadofSecurityJumpsuit
   - CommonSecurityBackpack
   - HeadofSecurityOuterClothing
+  - CommonGloves # WD
   - CommonSecurityShoes
   - HeadofSecurityPDA
   - Trinkets
@@ -385,6 +386,7 @@
   - CommonSecurityNeck
   - WardenJumpsuit
   - CommonSecurityBackpack
+  - CommonGloves # WD
   - CommonSecurityShoes
   - WardenPDA
   - Trinkets
@@ -399,6 +401,7 @@
   - SeniorOfficerJumpsuit
   - CommonSecurityBackpack
   - SecurityOuterClothing
+  - CommonGloves # WD
   - CommonSecurityShoes
   - SeniorOfficerPDA
   - Trinkets
@@ -413,6 +416,7 @@
   - SecurityJumpsuit
   - CommonSecurityBackpack
   - SecurityOuterClothing
+  - CommonGloves # WD
   - CommonSecurityShoes
   - SecurityPDA
   - SecurityBelt
@@ -440,6 +444,7 @@
   - CommonSecurityNeck
   - SecurityCadetJumpsuit
   - CommonSecurityBackpack
+  - CommonGloves # WD
   - CommonSecurityShoes
   - SecurityCadetPDA
   - Trinkets