From cc726bec256457ce821d8cfb15c343b643f7c318 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Fri, 21 Nov 2025 18:31:07 -0600 Subject: [PATCH] Updated various non-upstream entities components. Fixed YAML Linter errors. --- .../Prototypes/Entities/Clothing/Head/misc.yml | 2 -- .../Objects/Weapons/Guns/Battery/battery_guns.yml | 2 -- .../_DV/Entities/Objects/Devices/shock_collar.yml | 1 - .../Objects/Specific/Chemistry/skimmer.yml | 5 +++-- Resources/Prototypes/_DV/Objectives/asakim.yml | 11 ++++++++++- .../Prototypes/_DV/Objectives/menaceskeleton.yml | 12 ++++++++++-- Resources/Prototypes/_DV/Objectives/skia.yml | 7 ++++++- Resources/Prototypes/_DV/Objectives/traitor.yml | 11 ++++++++++- Resources/Prototypes/_DV/Objectives/wizard.yml | 14 ++++++++++++-- .../Entities/Mobs/Anomalites/anomalites.yml | 2 +- .../Structures/Storage/Crates/emergency_pod.yml | 1 - Resources/Prototypes/name_identifier_groups.yml | 6 +++--- 12 files changed, 55 insertions(+), 19 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml index 094e60a7c9..2e5e0b6584 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 490d73db4c..1b473c5688 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/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 diff --git a/Resources/Prototypes/_DV/Entities/Objects/Devices/shock_collar.yml b/Resources/Prototypes/_DV/Entities/Objects/Devices/shock_collar.yml index de99ddbfe8..4dfbb2f7eb 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Devices/shock_collar.yml +++ b/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: diff --git a/Resources/Prototypes/_DV/Entities/Objects/Specific/Chemistry/skimmer.yml b/Resources/Prototypes/_DV/Entities/Objects/Specific/Chemistry/skimmer.yml index 7f213a430f..05abc869b6 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Specific/Chemistry/skimmer.yml +++ b/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 diff --git a/Resources/Prototypes/_DV/Objectives/asakim.yml b/Resources/Prototypes/_DV/Objectives/asakim.yml index 5f26741d3b..5d35de88f3 100644 --- a/Resources/Prototypes/_DV/Objectives/asakim.yml +++ b/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 diff --git a/Resources/Prototypes/_DV/Objectives/menaceskeleton.yml b/Resources/Prototypes/_DV/Objectives/menaceskeleton.yml index 6e97a3c237..f81377bee0 100644 --- a/Resources/Prototypes/_DV/Objectives/menaceskeleton.yml +++ b/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 diff --git a/Resources/Prototypes/_DV/Objectives/skia.yml b/Resources/Prototypes/_DV/Objectives/skia.yml index 4c31fb0a02..927e0c4ed2 100644 --- a/Resources/Prototypes/_DV/Objectives/skia.yml +++ b/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 diff --git a/Resources/Prototypes/_DV/Objectives/traitor.yml b/Resources/Prototypes/_DV/Objectives/traitor.yml index 910da7e585..1e080e647b 100644 --- a/Resources/Prototypes/_DV/Objectives/traitor.yml +++ b/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 diff --git a/Resources/Prototypes/_DV/Objectives/wizard.yml b/Resources/Prototypes/_DV/Objectives/wizard.yml index f33e4c0398..748038c707 100644 --- a/Resources/Prototypes/_DV/Objectives/wizard.yml +++ b/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 diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Anomalites/anomalites.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Anomalites/anomalites.yml index 7e899e2b35..c64be9915b 100644 --- a/Resources/Prototypes/_Impstation/Entities/Mobs/Anomalites/anomalites.yml +++ b/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 diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/emergency_pod.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/emergency_pod.yml index 3a70437ecf..69ee63053b 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/emergency_pod.yml +++ b/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 diff --git a/Resources/Prototypes/name_identifier_groups.yml b/Resources/Prototypes/name_identifier_groups.yml index 847508938c..be0d3daefd 100644 --- a/Resources/Prototypes/name_identifier_groups.yml +++ b/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 \ No newline at end of file + maxValue: 999