From 37e783174a60e14ae5cff09556d7cd56263fd437 Mon Sep 17 00:00:00 2001 From: Aviu00 <93730715+Aviu00@users.noreply.github.com> Date: Tue, 4 Jun 2024 11:24:17 +0000 Subject: [PATCH] - fix: YAML linter fixes. (#327) --- .../_White/Cult/Components/BloodSpearComponent.cs | 2 +- Content.Shared/_White/Economy/BankCardComponent.cs | 8 ++++---- .../Entities/Clothing/OuterClothing/hardsuits.yml | 2 -- .../Entities/Markers/Spawners/techspawner.yml | 8 +++----- Resources/Prototypes/Entities/Mobs/NPCs/borer.yml | 5 +---- .../Entities/Objects/Fun/unocards_blue.yml | 6 ++++++ .../Entities/Objects/Specific/Medical/patch.yml | 4 ++-- .../Objects/Weapons/Guns/Projectiles/projectiles.yml | 1 - .../Objects/Weapons/Guns/Snipers/snipers.yml | 1 - .../Entities/Objects/Weapons/Melee/e_sword.yml | 1 - .../Entities/Structures/Machines/lathe.yml | 2 -- .../Structures/Storage/Closets/Lockers/lockers.yml | 12 ++++++------ Resources/Prototypes/Maps/Whitebox.yml | 3 +-- Resources/Prototypes/Species/skrell.yml | 1 - Resources/Prototypes/StatusEffects/security.yml | 7 +++++++ .../Objects/Specific/Medical/expanded_medkit.yml | 3 --- .../_White/Entities/Objects/Weapons/Guns/tempgun.yml | 4 ++-- .../_White/Entities/Objects/Weapons/energy_axe.yml | 1 - Resources/Prototypes/_White/Fluff/fluff.yml | 1 - Resources/Prototypes/_White/Mobs/Player/felinid.yml | 2 +- Resources/Prototypes/_White/Mobs/Species/felinid.yml | 1 - Resources/Prototypes/_White/Species/felinid.yml | 1 - Resources/Prototypes/_White/Species/harpy.yml | 1 - .../Prototypes/_White/Structures/Windows/paper.yml | 1 - Resources/Prototypes/_White/Tiles/cult.yml | 2 +- 25 files changed, 35 insertions(+), 45 deletions(-) diff --git a/Content.Shared/_White/Cult/Components/BloodSpearComponent.cs b/Content.Shared/_White/Cult/Components/BloodSpearComponent.cs index c4f93b605a..61912bebbb 100644 --- a/Content.Shared/_White/Cult/Components/BloodSpearComponent.cs +++ b/Content.Shared/_White/Cult/Components/BloodSpearComponent.cs @@ -9,7 +9,7 @@ public sealed partial class BloodSpearComponent : Component [ViewVariables] public Entity? User; - [DataField] + [DataField(required: true)] public EntProtoId Action; [DataField] diff --git a/Content.Shared/_White/Economy/BankCardComponent.cs b/Content.Shared/_White/Economy/BankCardComponent.cs index 4be65e84bb..3fb513562a 100644 --- a/Content.Shared/_White/Economy/BankCardComponent.cs +++ b/Content.Shared/_White/Economy/BankCardComponent.cs @@ -1,16 +1,16 @@ -using Robust.Shared.GameStates; +using Robust.Shared.GameStates; namespace Content.Shared._White.Economy; [RegisterComponent, NetworkedComponent] public sealed partial class BankCardComponent : Component { - [ViewVariables(VVAccess.ReadOnly)] + [DataField] public int? AccountId; - [DataField("startingBalance")] + [DataField] public int StartingBalance; - [DataField("commandBudgetCard")] + [DataField] public bool CommandBudgetCard; } diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index e7a3cfe30f..0498ea6e45 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -692,8 +692,6 @@ tags: - PowerCell - PowerCellSmall - - PowerCellHyper - - PowerCellMicroreactor - type: EnergyDomeGenerator damageEnergyDraw: 3 domePrototype: EnergyDomeSmallPink diff --git a/Resources/Prototypes/Entities/Markers/Spawners/techspawner.yml b/Resources/Prototypes/Entities/Markers/Spawners/techspawner.yml index 5ebc39f60b..d017841c8e 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/techspawner.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/techspawner.yml @@ -26,8 +26,6 @@ - BookMedicalReferenceBook - BookHowToSurvive - BookChemicalCompendium - - BookEscalation - - BookEscalationSecurity - BookAtmosDistro - BookAtmosWaste - BookAtmosAirAlarms @@ -290,7 +288,7 @@ - MedkitFilled - MedkitCombat - MedkitRadiationFilled - - MedkilOxygenFilled + - MedkitOxygenFilled - MedkitBruteFilled - MedkitToxinFilled - MedkitBurnFilled @@ -300,7 +298,7 @@ - Medkit - MedkitCombatFilled - MedkitRadiation - - MedkilOxygen + - MedkitO2 - MedkitBrute - MedkitToxin - MedkitBurn @@ -518,7 +516,7 @@ - CowToolboxFilled - CowToolbox - ToolboxGoldFilled - - ToolboxGold + - ToolboxGolden rareChance: 0.5 # random vomit spawner diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/borer.yml b/Resources/Prototypes/Entities/Mobs/NPCs/borer.yml index a6b576d859..f31b606858 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/borer.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/borer.yml @@ -38,7 +38,6 @@ - type: Tag tags: - CannotSuicide - maxSaturation: 15 - type: Bloodstream bloodReagent: Slime bloodlossDamage: @@ -67,9 +66,7 @@ parent: MobBorerBase id: MobSimpleBorer components: - - type: Borer - reproduceCost: 100 - assumeControlCost: 250 + - type: Borer - type: entity id: SpawnPointGhostBorer diff --git a/Resources/Prototypes/Entities/Objects/Fun/unocards_blue.yml b/Resources/Prototypes/Entities/Objects/Fun/unocards_blue.yml index 0ba13243a1..072a45d825 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/unocards_blue.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/unocards_blue.yml @@ -10,8 +10,11 @@ components: - type: Item size: Small + - type: SpawnItemsOnUse sound: path: /Audio/Effects/unwrap.ogg + items: + - id: UnoCardUnknownBlue0 - type: Tag tags: - UnoCard @@ -29,8 +32,11 @@ scale: 0.5, 0.5 - type: Item size: Small + - type: SpawnItemsOnUse sound: path: /Audio/Effects/unwrap.ogg + items: + - id: UnoCardBlue0 - type: Tag tags: - UnoCard diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/patch.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/patch.yml index a3c6f738d9..ccf31b1f3a 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/patch.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/patch.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity parent: BaseItem id: BasePatch abstract: true @@ -23,7 +23,7 @@ - type: Appearance - type: SolutionContainerVisuals - type: Patch - OnlyMobs: false + onlyMobs: false - type: StaticPrice price: 30 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 9297a66492..71ba30fb3e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -1412,7 +1412,6 @@ Heat: 0 soundHit: collection: WeakHit - soundForce: true - type: entity name: cold beam diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index bef349e8af..485c2a9f0c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -66,7 +66,6 @@ capacity: 5 proto: CartridgeAntiMateriel - type: Wieldable - wieldTime: 0 forceTwoHanded: True - type: Telescope diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml index e5b12de9e2..a5f62ab8af 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml @@ -251,7 +251,6 @@ size: Small sprite: Objects/Weapons/Melee/double_esword.rsi - type: Wieldable - wieldTime: 0 - type: IncreaseDamageOnWield damage: types: diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 2446d73d87..7b6dcee709 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -356,7 +356,6 @@ - WeaponDisablerSMG - ClothingHandsGlovesMagnetic - ClothingHandsGlovesMagneticAdvanced - - ClothingEyesGlassesSecurity - ExplosivePayload - FlashPayload - PowerCageSmall @@ -745,7 +744,6 @@ - CartridgeMagnumRubber - CartridgePistolRubber - CartridgeRifleRubber - - ClothingEyesGlassesSecurity - ExplosivePayload - FlashPayload - HoloprojectorSecurity diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml index 41e55f8de6..102fbdb4cf 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -501,16 +501,16 @@ - id: ClothingUniformJumpskirtMime - id: ClothingMaskMime prob: 0.25 - onGroup: mimemask + orGroup: mimemask - id: ClothingMaskSadMime prob: 0.25 - onGroup: mimemask + orGroup: mimemask - id: ClothingMaskScaredMime prob: 0.25 - onGroup: mimemask + orGroup: mimemask - id: ClothingMaskSexyMime prob: 0.25 - onGroup: mimemask + orGroup: mimemask - id: ClothingShoesColorWhite - id: ClothingHeadHatBeret - id: ClothingHandsGlovesLatex @@ -519,10 +519,10 @@ - id: CrayonMime - id: ClothingBackpackSatchelMime prob: 0.5 - onGroup: mimebackpack + orGroup: mimebackpack - id: ClothingBackpackMime prob: 0.5 - onGroup: mimebackpack + orGroup: mimebackpack - id: ClothingOuterWinterMime prob: 0.5 - id: ClothingOuterHardsuitMime diff --git a/Resources/Prototypes/Maps/Whitebox.yml b/Resources/Prototypes/Maps/Whitebox.yml index 176c892613..437b96a65f 100644 --- a/Resources/Prototypes/Maps/Whitebox.yml +++ b/Resources/Prototypes/Maps/Whitebox.yml @@ -1,4 +1,4 @@ -- type: gameMap +- type: gameMap id: WhiteBox mapName: 'Box Station' mapPath: /Maps/White/Whitebox.yml @@ -56,5 +56,4 @@ SeniorResearcher: [ 1, 1 ] SeniorPhysician: [ 1, 1 ] SeniorEngineer: [ 1, 1 ] - SeniorSalvageSpecialist: [ 1, 1 ] Borg: [ 2, 2 ] diff --git a/Resources/Prototypes/Species/skrell.yml b/Resources/Prototypes/Species/skrell.yml index 25942a4f55..527af35914 100644 --- a/Resources/Prototypes/Species/skrell.yml +++ b/Resources/Prototypes/Species/skrell.yml @@ -6,7 +6,6 @@ bodyTypes: - SkrellNormal - SkrellSlim - sprites: MobSkrellSprites defaultSkinTone: "#50ff6d" markingLimits: MobSkrellMarkingLimits dollPrototype: MobSkrellDummy diff --git a/Resources/Prototypes/StatusEffects/security.yml b/Resources/Prototypes/StatusEffects/security.yml index ca25f746f2..dcf08fbb09 100644 --- a/Resources/Prototypes/StatusEffects/security.yml +++ b/Resources/Prototypes/StatusEffects/security.yml @@ -40,3 +40,10 @@ icon: sprite: /Textures/Interface/Misc/security_icons.rsi state: hud_wanted + +- type: statusIcon + parent: SecurityIcon + id: CriminalRecordIconRemove + icon: + sprite: /Textures/Interface/Misc/security_icons.rsi + state: hud_discharged diff --git a/Resources/Prototypes/_White/Entities/Objects/Specific/Medical/expanded_medkit.yml b/Resources/Prototypes/_White/Entities/Objects/Specific/Medical/expanded_medkit.yml index 32f06e8bde..695b14fc40 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Specific/Medical/expanded_medkit.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Specific/Medical/expanded_medkit.yml @@ -3,9 +3,6 @@ parent: Medkit id: ExpandedMedkit components: - - type: Storage - capacity: 40 - sprite: White/Specific/expmedkit.rsi - type: Sprite sprite: White/Specific/expmedkit.rsi state: icon diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/tempgun.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/tempgun.yml index 7485f1a394..01a7e5725b 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/tempgun.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/tempgun.yml @@ -17,8 +17,8 @@ laserFireCost: 64 stunProjectileSpeed: 48 laserProjectileSpeed: 48 - projSound: "/Audio/Weapons/Guns/Gunshots/laser.ogg" - hitscanSound: "/Audio/Weapons/Guns/Gunshots/laser.ogg" + stunSound: "/Audio/Weapons/Guns/Gunshots/laser.ogg" + laserSound: "/Audio/Weapons/Guns/Gunshots/laser.ogg" modeNames: Stun: Cool Laser: Heat diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/energy_axe.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/energy_axe.yml index 0c9b8a0517..eda522b79a 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Weapons/energy_axe.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/energy_axe.yml @@ -5,7 +5,6 @@ description: Гарантирует быструю смерть. components: - type: Wieldable - wieldTime: 0 - type: ItemToggle soundActivate: path: /Audio/Weapons/ebladeon.ogg diff --git a/Resources/Prototypes/_White/Fluff/fluff.yml b/Resources/Prototypes/_White/Fluff/fluff.yml index 8870e64398..5746a3a9c9 100644 --- a/Resources/Prototypes/_White/Fluff/fluff.yml +++ b/Resources/Prototypes/_White/Fluff/fluff.yml @@ -902,7 +902,6 @@ state: icon - type: Item sprite: White/Fluff/Geraldiy/blade.rsi - state: icon - type: MeleeWeapon wideAnimationRotation: -135 damage: diff --git a/Resources/Prototypes/_White/Mobs/Player/felinid.yml b/Resources/Prototypes/_White/Mobs/Player/felinid.yml index 813ae49c4f..ff84f4a1b1 100644 --- a/Resources/Prototypes/_White/Mobs/Player/felinid.yml +++ b/Resources/Prototypes/_White/Mobs/Player/felinid.yml @@ -6,7 +6,7 @@ components: - type: CombatMode canDisarm: true - - type: Mind + - type: MindContainer showExamineInfo: true - type: Input context: "human" diff --git a/Resources/Prototypes/_White/Mobs/Species/felinid.yml b/Resources/Prototypes/_White/Mobs/Species/felinid.yml index 2328210e9a..0cd7d91cc7 100644 --- a/Resources/Prototypes/_White/Mobs/Species/felinid.yml +++ b/Resources/Prototypes/_White/Mobs/Species/felinid.yml @@ -124,7 +124,6 @@ soundHit: path: /Audio/Effects/hit_kick.ogg - type: Stamina - excess: 85 - type: Perishable - type: entity diff --git a/Resources/Prototypes/_White/Species/felinid.yml b/Resources/Prototypes/_White/Species/felinid.yml index 7aab46d81c..9aa6b7cf2f 100644 --- a/Resources/Prototypes/_White/Species/felinid.yml +++ b/Resources/Prototypes/_White/Species/felinid.yml @@ -3,7 +3,6 @@ name: species-name-felinid roundStart: true prototype: MobFelinid - sprites: MobHumanSprites markingLimits: MobFelinidMarkingLimits dollPrototype: MobFelinidDummy skinColoration: HumanToned diff --git a/Resources/Prototypes/_White/Species/harpy.yml b/Resources/Prototypes/_White/Species/harpy.yml index d1f29c8d69..b0bc025270 100644 --- a/Resources/Prototypes/_White/Species/harpy.yml +++ b/Resources/Prototypes/_White/Species/harpy.yml @@ -6,7 +6,6 @@ markingLimits: MobHarpyMarkingLimits dollPrototype: MobHarpyDummy skinColoration: HumanToned - sprites: MobHumanSprites bodyTypes: - HumanNormal diff --git a/Resources/Prototypes/_White/Structures/Windows/paper.yml b/Resources/Prototypes/_White/Structures/Windows/paper.yml index 4df348afde..aa8491283c 100644 --- a/Resources/Prototypes/_White/Structures/Windows/paper.yml +++ b/Resources/Prototypes/_White/Structures/Windows/paper.yml @@ -13,7 +13,6 @@ arc: 360 # interact despite grilles - type: Tag tags: - - RCDDeconstructWhitelist - ForceFixRotations - Window - type: Sprite diff --git a/Resources/Prototypes/_White/Tiles/cult.yml b/Resources/Prototypes/_White/Tiles/cult.yml index ae49e33345..41d1d3efa0 100644 --- a/Resources/Prototypes/_White/Tiles/cult.yml +++ b/Resources/Prototypes/_White/Tiles/cult.yml @@ -5,7 +5,7 @@ variants: 1 baseTurf: Plating isSubfloor: false - canCrowbar: true + deconstructTools: [ Prying ] footstepSounds: collection: FootstepFloor itemDrop: FloorTileItemSteel