Фиксы (#518)

* fix rcd ammo predicting * fix tts preview * cleanups HumanoidProfileEditor * fix double chaplain bible * loadout fixes * fix handlabeler mispredicting * fix resources couldnt be extracted due to the whitelist * wd edit * add security filled leather satchel to loadouts
2024-07-31 05:39:38 +03:00
parent 49d6736a3e
commit f001e3dcc6
28 changed files with 146 additions and 118 deletions
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -207,7 +207,6 @@
  - type: StorageFill
    contents:
      - id: BoxSurvival
-      - id: Bible
      - id: RubberStampChaplain

 - type: entity
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
@@ -206,7 +206,6 @@
  - type: StorageFill
    contents:
      - id: BoxSurvival
-      - id: Bible
      - id: RubberStampChaplain

 - type: entity
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
@@ -16,6 +16,11 @@
    contents:
    - id: BoxSurvival

+- type: entity # WD
+  noSpawn: true
+  parent: [ClothingBackpackSatchelLeather, ClothingBackpackSatchelSecurityFilled]
+  id: ClothingBackpackSatchelLeatherFilledSecurity
+
 - type: entity
  noSpawn: true
  parent: ClothingBackpackSatchel
@@ -165,6 +170,17 @@
      - id: BoxSurvivalSecurity
      - id: Flash

+- type: entity
+  parent: ClothingBackpackSatchelInspector
+  id: ClothingBackpackSatchelInspectorFilled
+  name: inspector's leather satchel
+  description: A stylish leather bag made from the skin of those who failed to do their job. It's best not to even try to find out what's inside.
+  components:
+  - type: StorageFill
+    contents:
+    - id: BoxSurvivalSecurity
+    - id: Flash
+
 - type: entity
  noSpawn: true
  parent: ClothingBackpackSatchelEngineering
@@ -218,7 +234,6 @@
  - type: StorageFill
    contents:
      - id: BoxSurvival
-      - id: Bible
      - id: RubberStampChaplain

 - type: entity
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -24,9 +24,7 @@
    storageInsertSound:
      path: /Audio/Items/belt_equip.ogg
    # WD edit sounds end
-    # TODO: Fill this out more.
    maxItemSize: Normal
-    # TODO: Fill this out more.
    whitelist:
      tags:
        - Powerdrill
--- a/Resources/Prototypes/Loadouts/Jobs/Cargo/common.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/common.yml
@@ -6,7 +6,7 @@
    requirement:
      !type:RoleTimeRequirement
      role: JobSalvageSpecialist
-      time: 54000 # 15 hours
+      time: 9999999999 # 15 hours 54000

 # Head

--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml
@@ -6,7 +6,7 @@
    requirement:
      !type:RoleTimeRequirement
      role: JobClown
-      time: 108000 # 30 hours as clown required to ascend
+      time: 9999999999 # 30 hours as clown required to ascend 108000

 - type: loadoutEffectGroup # WD
  id: MedalClownTimer
@@ -15,7 +15,7 @@
    requirement:
      !type:RoleTimeRequirement
      role: JobClown
-      time: 36000 # 10 hours
+      time: 9999999999 # 10 hours 36000

 # Head
 - type: itemLoadout
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml
@@ -6,7 +6,7 @@
    requirement:
      !type:RoleTimeRequirement
      role: JobJanitor
-      time: 36000 # 10 hours
+      time: 9999999999 # 10 hours 36000

 # Head
 - type: itemLoadout
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml
@@ -6,7 +6,7 @@
    requirement:
      !type:RoleTimeRequirement
      role: JobPassenger
-      time: 36000 #10 hrs, silly reward for people who play passenger a lot
+      time: 9999999999 #10 hrs, silly reward for people who play passenger a lot 36000

 # Face
 - type: itemLoadout
--- a/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml
@@ -6,7 +6,7 @@
    requirement:
      !type:RoleTimeRequirement
      role: JobHeadOfPersonnel
-      time: 54000 #15 hrs, special reward for HoP mains
+      time: 9999999999 #15 hrs, special reward for HoP mains 54000

 # Jumpsuit
 - type: itemLoadout
--- a/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml
@@ -6,17 +6,17 @@
    requirement:
      !type:RoleTimeRequirement
      role: JobAtmosphericTechnician
-      time: 21600 #6 hrs
+      time: 9999999999 #6 hrs 21600
  - !type:JobRequirementLoadoutEffect
    requirement:
      !type:RoleTimeRequirement
      role: JobStationEngineer
-      time: 21600 #6 hrs
+      time: 9999999999 #6 hrs 21600
  - !type:JobRequirementLoadoutEffect
    requirement:
      !type:DepartmentTimeRequirement
      department: Engineering
-      time: 216000 # 60 hrs
+      time: 9999999999 # 60 hrs 216000

 # Head
 - type: itemLoadout
--- a/Resources/Prototypes/Loadouts/Jobs/Justice/inspector.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Justice/inspector.yml
@@ -130,7 +130,7 @@
 - type: startingGear
  id: InspectorSatchel
  equipment:
-    back: ClothingBackpackSatchelInspector
+    back: ClothingBackpackSatchelInspectorFilled

 # Gloves

--- a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml
@@ -6,17 +6,17 @@
    requirement:
      !type:RoleTimeRequirement
      role: JobChemist
-      time: 21600 #6 hrs
+      time: 9999999999 #6 hrs 21600
  - !type:JobRequirementLoadoutEffect
    requirement:
      !type:RoleTimeRequirement
      role: JobMedicalDoctor
-      time: 21600 #6 hrs
+      time: 9999999999 #6 hrs 21600
  - !type:JobRequirementLoadoutEffect
    requirement:
      !type:DepartmentTimeRequirement
      department: Medical
-      time: 216000 # 60 hrs
+      time: 9999999999 # 60 hrs 216000

 # Head
 - type: itemLoadout
--- a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml
@@ -6,7 +6,7 @@
    requirement:
      !type:DepartmentTimeRequirement
      department: Science
-      time: 216000 #60 hrs
+      time: 9999999999 #60 hrs 216000

 # Head

--- a/Resources/Prototypes/Loadouts/Jobs/Security/common.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Security/common.yml
@@ -62,6 +62,16 @@
  equipment:
    belt: ClothingBeltSecurityWebbing

+# Backpack
+
+- type: itemLoadout
+  id: CommonSatchelLeatherSecurity
+  equipment: CommonSatchelLeatherSecurity
+- type: startingGear
+  id: CommonSatchelLeatherSecurity
+  equipment:
+    back: ClothingBackpackSatchelLeatherFilledSecurity
+
 # Job trinkets

 - type: itemLoadout # WD
--- a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
@@ -6,12 +6,12 @@
    requirement:
      !type:RoleTimeRequirement
      role: JobWarden
-      time: 21600 #6 hrs
+      time: 9999999999 #6 hrs 21600
  - !type:JobRequirementLoadoutEffect
    requirement:
      !type:DepartmentTimeRequirement
      department: Security
-      time: 216000 # 60 hrs
+      time: 9999999999 # 60 hrs 216000

 # Head
 - type: itemLoadout
--- a/Resources/Prototypes/Loadouts/Jobs/common.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/common.yml
@@ -7,7 +7,7 @@
    requirement:
      !type:RoleTimeRequirement
      role: JobPassenger
-      time: 180000 # 50 hours
+      time: 9999999999 # 50 hours 180000

 # Eyes

--- a/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml
@@ -6,7 +6,7 @@
    requirement:
      !type:RoleTimeRequirement
      role: JobLibrarian
-      time: 3600 # 1 hour of being the biggest nerd on the station
+      time: 9999999999 # 1 hour of being the biggest nerd on the station 3600

 - type: loadoutEffectGroup
  id: JensenTimer
@@ -15,7 +15,7 @@
    requirement:
      !type:DepartmentTimeRequirement
      department: Cargo
-      time: 18000 #5 hours of being a space trucker
+      time: 9999999999 #5 hours of being a space trucker 18000

 # Basic options
 # Glasses
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -1530,7 +1530,6 @@
 - type: loadoutGroup
  id: DetectiveShoes
  name: loadout-group-shoes
-  minLimit: 0
  loadouts:
  - BootsLaceup
  - ShoesLeather
@@ -1604,6 +1603,12 @@
  loadouts:
  - SecurityHeadsetFull

+- type: loadoutGroup # WD
+  id: BasicSecurityHeadset
+  name: loadout-group-ears
+  loadouts:
+  - SecurityHeadset
+
 - type: loadoutGroup # WD
  id: CommonSecurityBackpack
  name: loadout-group-backpack
@@ -1611,7 +1616,7 @@
  - SecurityBackpack
  - SecuritySatchel
  - SecurityDuffel
-  - CommonSatchelLeather
+  - CommonSatchelLeatherSecurity

 - type: loadoutGroup # WD
  id: CommonSecurityBelt
--- a/Resources/Prototypes/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -575,7 +575,7 @@
  groups:
  - LawyerHead # WD
  - CommonGlasses # WD
-  - CommonSecurityHeadset
+  - BasicSecurityHeadset # WD
  - CommonMaskCigarette # WD
  - LawyerNeck
  - LawyerJumpsuit