Updated various non-upstream entities components. Fixed YAML Linter errors.

Resources/Prototypes/Entities/Clothing/Head/misc.yml

@@ -196,8 +196,6 @@
     sprite: Clothing/Head/Misc/fancycrown.rsi
   - type: Clothing
     sprite: Clothing/Head/Misc/fancycrown.rsi
-  - type: TypingIndicatorClothing
-    proto: regal
   - type: StaticPrice
     price: 3000
 #  - type: AddAccentClothing # DeltaV - remove clothing-forced accents

Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

@@ -258,8 +258,6 @@
     fireCost: 50 #Delta-V was 62.5
   - type: StaticPrice
     price: 420
-    proto: RedLaser
-    fireCost: 62.5
 
 - type: entity
   name: practice laser carbine

Resources/Prototypes/_DV/Entities/Objects/Devices/shock_collar.yml

@@ -27,7 +27,6 @@
   - type: ShockOnTrigger
     damage: 5
     duration: 3
-    cooldown: 4
   - type: TriggerOnSignal
   - type: DeviceLinkSink
     ports:

Resources/Prototypes/_DV/Entities/Objects/Specific/Chemistry/skimmer.yml

@@ -13,8 +13,9 @@
       visible: false
   - type: Injector
     targetSmallest: true
-    minTransferAmount: 5
-    transferAmount: 5
+    transferAmounts:
+    - 5
+    currentTransferAmount: 5
   - type: Item
     sprite: _DV/Objects/Specific/Chemistry/skimmer.rsi
   - type: SolutionContainerVisuals

Resources/Prototypes/_DV/Objectives/asakim.yml

@@ -30,7 +30,16 @@
   - type: TargetObjective
     title: objective-condition-asakim-terminate-title
   - type: PickRandomPerson
-    onlyChoosableJobs: true
+    filters:
+    - !type:BodyMindFilter
+      whitelist:
+        components:
+        - CommandStaff
+    # Can't have multiple objectives to kill the same person.
+    - !type:TargetObjectiveMindFilter
+      blacklist:
+        components:
+        - KillPersonCondition
   - type: RerollAfterCompletion
     rerollObjectivePrototype: AsakimKillObjective
     rerollObjectiveMessage: objective-condition-asakim-terminate-reroll-message

Resources/Prototypes/_DV/Objectives/menaceskeleton.yml

@@ -37,7 +37,11 @@
   - type: TargetObjective
     title: objective-skeleton-haunt-title
   - type: PickRandomPerson
-    onlyChoosableJobs: true
+    filters:
+    - !type:TargetObjectiveMindFilter
+      blacklist:
+        components:
+        - KillPersonCondition
 
 - type: entity
   parent: SkeletonBaseObjective
@@ -52,7 +56,11 @@
   - type: TargetObjective
     title: objective-skeleton-frame-title
   - type: PickRandomPerson
-    onlyChoosableJobs: true
+    filters:
+    - !type:BodyMindFilter
+      whitelist:
+        components:
+        - CommandStaff
 
 - type: entity
   parent: SkeletonBaseObjective

Resources/Prototypes/_DV/Objectives/skia.yml

@@ -19,7 +19,12 @@
   - type: TargetObjective
     title: objective-condition-reap-soul-title
   - type: PickRandomPerson
-    onlyChoosableJobs: true
+    filters:
+    # Can't have multiple objectives to kill the same person.
+    - !type:TargetObjectiveMindFilter
+      blacklist:
+        components:
+        - KillPersonCondition
   - type: RerollAfterCompletion
     rerollObjectivePrototype: SkiaReapObjective
     rerollObjectiveMessage: objective-condition-reap-soul-reroll-message

Resources/Prototypes/_DV/Objectives/traitor.yml

@@ -100,7 +100,16 @@
   - type: TargetObjective
     title: objective-condition-teach-person-title
   - type: PickRandomPerson
-    onlyChoosableJobs: true
+    filters:
+    - !type:BodyMindFilter
+      whitelist:
+        components:
+        - CommandStaff
+    # Can't have multiple objectives to kill the same person.
+    - !type:TargetObjectiveMindFilter
+      blacklist:
+        components:
+        - KillPersonCondition
 
 # Kill fellow traitor objective
 - type: entity

Resources/Prototypes/_DV/Objectives/wizard.yml

@@ -88,7 +88,12 @@
   - type: TargetObjective
     title: objective-condition-wizard-preserve-person-title
   - type: PickRandomPerson
-    onlyChoosableJobs: true
+    filters:
+    - !type:BodyMindFilter
+      whitelist:
+        components:
+        - CommandStaff
+        - KillPersonCondition # Should also choose those who have targets on their heads by other antags :3
 
 - type: entity
   parent: [BaseWizardObjective, BaseKillObjective]
@@ -102,7 +107,12 @@
   - type: TargetObjective
     title: objective-condition-wizard-kill-person-title
   - type: PickRandomPerson
-    onlyChoosableJobs: true
+    filters:
+    # Can't have multiple objectives to kill the same person.
+    - !type:TargetObjectiveMindFilter
+      blacklist:
+        components:
+        - KillPersonCondition
   - type: KillPersonCondition
     requireDead: true
 

Resources/Prototypes/_Impstation/Entities/Mobs/Anomalites/anomalites.yml

@@ -147,7 +147,7 @@
   # apid-type always weightless movement
   - type: MovementAlwaysTouching
   - type: MovementIgnoreGravity
-    gravityState: true
+    weightless: true
   - type: Physics
     bodyStatus: InAir
   - type: CanMoveInAir

Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/emergency_pod.yml

@@ -60,7 +60,6 @@
       tags:
         - VimPilot # Pets
         - CanPilot # People
-    forceWhitelist: true # Frontier - force whitelist
   - type: Damageable
     damageContainer: StructuralInorganic
     damageModifierSet: Metallic

Resources/Prototypes/name_identifier_groups.yml

@@ -31,7 +31,7 @@
 
 - type: nameIdentifierGroup
   id: Xenoborg
-  format: name-identifier-format-xenoborg
+  prefix: XI # DeltaV - was don't have Format: Was name-identifier-format-xenoborg
   minValue: 1000
   maxValue: 9999
 
@@ -55,9 +55,9 @@
   prefix: TELE
   minValue: 0
   maxValue: 999
-  
+
 - type: nameIdentifierGroup
   id: XenoArtifactNode
   prefix: XAN
   minValue: 1
-  maxValue: 999
+  maxValue: 999