From 012bf3c3579103365c3df9d85022d43da4137881 Mon Sep 17 00:00:00 2001 From: Aviu00 <93730715+Aviu00@users.noreply.github.com> Date: Fri, 9 Aug 2024 14:20:16 +0000 Subject: [PATCH] - fix: YAML linter fixes. (#598) --- .../Mobs/Cyborgs/base_borg_chassis.yml | 2 +- .../Consumable/Drinks/drinks_bottles.yml | 2 +- .../Prototypes/Entities/Objects/Fun/toys.yml | 2 +- .../Objects/Weapons/Throwable/bola.yml | 3 ++- .../mannequin_inventory_template.yml | 3 --- .../Prototypes/Procedural/salvage_loot.yml | 2 +- .../Prototypes/Stacks/Materials/materials.yml | 12 --------- .../Prototypes/Stacks/consumable_stacks.yml | 6 ++--- .../Prototypes/Stacks/medical_stacks.yml | 1 - .../Prototypes/_White/Catalog/Cargo/cargo.yml | 2 +- .../Objects/Weapons/Guns/Launcher/shinano.yml | 1 - Resources/Prototypes/_White/Fluff/sponsor.yml | 18 ++++++------- .../_White/SoundCollections/harpy.yml | 26 +++++++++++++------ Resources/Prototypes/_White/Wizard/wizard.yml | 3 --- 14 files changed, 36 insertions(+), 47 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml index 7dd7d1750e..0cba3593d1 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml @@ -149,7 +149,7 @@ - type: Lock locked: true breakOnEmag: false - unlockOnClick: false + lockOnClick: false - type: ActivatableUIRequiresLock - type: LockedWiresPanel - type: Damageable diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml index 435fd2636d..99bdd21319 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml @@ -896,7 +896,7 @@ Quantity: 300 - type: Drink - type: Label - currentLabel: холодный чай + currentLabel: холодный чай - type: entity parent: DrinkBottlePlasticBaseFull diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 8c05823005..7ce1101054 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -1252,7 +1252,7 @@ path: /Audio/Weapons/eblade1.ogg params: variation: 0.250 - volume: -10 + volume: -10 activatedSoundOnSwing: path: /Audio/Weapons/eblademiss.ogg params: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml index 4d878e8c1c..4d454cd185 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml @@ -86,4 +86,5 @@ walkSpeed: 0.6 sprintSpeed: 0.6 - type: EmitSoundOnLand - collection: sparks + sound: + collection: sparks diff --git a/Resources/Prototypes/InventoryTemplates/mannequin_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/mannequin_inventory_template.yml index 92d8fa4227..7332f079b0 100644 --- a/Resources/Prototypes/InventoryTemplates/mannequin_inventory_template.yml +++ b/Resources/Prototypes/InventoryTemplates/mannequin_inventory_template.yml @@ -51,12 +51,9 @@ uiWindowPos: 2,0 strippingWindowPos: 1,3 dependsOn: outerClothing - dependsOnComponents: - - type: AllowSuitStorage displayName: Suit Storage - name: back slotTexture: back - fullTextureName: template_small slotFlags: BACK stripTime: 3 uiWindowPos: 3,0 diff --git a/Resources/Prototypes/Procedural/salvage_loot.yml b/Resources/Prototypes/Procedural/salvage_loot.yml index 58dc5cea8e..a3f08bd671 100644 --- a/Resources/Prototypes/Procedural/salvage_loot.yml +++ b/Resources/Prototypes/Procedural/salvage_loot.yml @@ -200,7 +200,7 @@ cost: 3 - proto: LaserModule cost: 8 - - proto: HolograpicSightModule + - proto: HolographicSightModule cost: 8 - proto: FlameHiderModule cost: 3 diff --git a/Resources/Prototypes/Stacks/Materials/materials.yml b/Resources/Prototypes/Stacks/Materials/materials.yml index 4ecf0bae5a..305203c79f 100644 --- a/Resources/Prototypes/Stacks/Materials/materials.yml +++ b/Resources/Prototypes/Stacks/Materials/materials.yml @@ -4,7 +4,6 @@ icon: { sprite: /Textures/Objects/Misc/monkeycube.rsi, state: cube } spawn: MaterialBiomass1 maxCount: 100 - itemSize: 1 - type: stack id: WoodPlank @@ -12,7 +11,6 @@ icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: wood } spawn: MaterialWoodPlank1 maxCount: 30 - itemSize: 1 - type: stack id: Cardboard @@ -20,7 +18,6 @@ icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cardboard } spawn: MaterialCardboard1 maxCount: 30 - itemSize: 1 - type: stack id: Cloth @@ -28,7 +25,6 @@ icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cloth } spawn: MaterialCloth1 maxCount: 30 - itemSize: 1 - type: stack id: Durathread @@ -36,7 +32,6 @@ icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: durathread } spawn: MaterialDurathread1 maxCount: 30 - itemSize: 1 - type: stack id: Diamond @@ -44,7 +39,6 @@ icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: diamond } spawn: MaterialDiamond1 maxCount: 30 - itemSize: 2 - type: stack id: Cotton @@ -52,7 +46,6 @@ icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cotton } spawn: MaterialCotton1 maxCount: 30 - itemSize: 1 - type: stack id: Pyrotton @@ -67,7 +60,6 @@ icon: { sprite: /Textures/White/Objects/Materials/materials.rsi, state: bananium } spawn: MaterialBananium1 maxCount: 10 - itemSize: 2 - type: stack id: MeatSheets @@ -75,7 +67,6 @@ icon: { sprite: /Textures/Objects/Materials/Sheets/meaterial.rsi, state: meat } spawn: MaterialSheetMeat1 maxCount: 30 - itemSize: 1 - type: stack id: WebSilk @@ -83,7 +74,6 @@ icon: { sprite: /Textures/Objects/Materials/silk.rsi, state: icon } spawn: MaterialWebSilk1 maxCount: 50 - itemSize: 1 - type: stack id: Bones @@ -91,7 +81,6 @@ icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: bones} spawn: MaterialBones1 maxCount: 30 - itemSize: 1 - type: stack id: RunicMetalSheets @@ -106,4 +95,3 @@ icon: { sprite: /Textures/Objects/Misc/reagent_fillings.rsi, state: powderpile } spawn: MaterialGunpowder maxCount: 60 - itemSize: 1 diff --git a/Resources/Prototypes/Stacks/consumable_stacks.yml b/Resources/Prototypes/Stacks/consumable_stacks.yml index 5a9fac2f52..b4eec40bfe 100644 --- a/Resources/Prototypes/Stacks/consumable_stacks.yml +++ b/Resources/Prototypes/Stacks/consumable_stacks.yml @@ -43,15 +43,14 @@ name: ground cannabis icon: { sprite: /Textures/Objects/Misc/reagent_fillings.rsi, state: powderpile } spawn: GroundCannabis - maxCount: + maxCount: 5 - type: stack id: GroundCannabisRainbow name: ground rainbow cannabis icon: { sprite: /Textures/Objects/Specific/Hydroponics/rainbow_cannabis.rsi, state: powderpile_rainbow } spawn: GroundCannabisRainbow - maxCount: - itemSize: 1 + maxCount: 5 - type: stack id: LeavesTobaccoDried @@ -73,4 +72,3 @@ icon: { sprite: /Textures/Objects/Specific/Hydroponics/rainbow_cannabis.rsi, state: dried } spawn: LeavesCannabisRainbowDried maxCount: 5 - itemSize: 5 diff --git a/Resources/Prototypes/Stacks/medical_stacks.yml b/Resources/Prototypes/Stacks/medical_stacks.yml index 31a53fe543..75270bb869 100644 --- a/Resources/Prototypes/Stacks/medical_stacks.yml +++ b/Resources/Prototypes/Stacks/medical_stacks.yml @@ -39,7 +39,6 @@ icon: { sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: tourniquet } spawn: Tourniquet maxCount: 3 # WD - itemSize: 1 - type: stack id: MedicatedSuture diff --git a/Resources/Prototypes/_White/Catalog/Cargo/cargo.yml b/Resources/Prototypes/_White/Catalog/Cargo/cargo.yml index 2367576f48..ce6b19814d 100644 --- a/Resources/Prototypes/_White/Catalog/Cargo/cargo.yml +++ b/Resources/Prototypes/_White/Catalog/Cargo/cargo.yml @@ -184,7 +184,7 @@ description: проверенная временем автоматическая винтовка. id: cargoCV47 icon: - sprite: White/Objects/Weapons/Guns/Rifles/ak.rsi + sprite: White/Objects/Weapons/Guns/Rifles/ak-icons.rsi state: icon product: CrateCV47 cost: 10000 diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Launcher/shinano.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Launcher/shinano.yml index 0910c5352f..f04b4e31ad 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Launcher/shinano.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Launcher/shinano.yml @@ -24,7 +24,6 @@ fireRate: 1 selectedMode: SemiAuto projectileSpeed: 15 - projectileSpeedModified: 15 availableModes: - SemiAuto soundGunshot: diff --git a/Resources/Prototypes/_White/Fluff/sponsor.yml b/Resources/Prototypes/_White/Fluff/sponsor.yml index cff5cc943d..db4429cc88 100644 --- a/Resources/Prototypes/_White/Fluff/sponsor.yml +++ b/Resources/Prototypes/_White/Fluff/sponsor.yml @@ -73,55 +73,55 @@ # id: LeerBootsLoadout # entity: LeerBoots # sponsorOnly: true -# whitelistedJobs: [HeadOfSecurity] +# whitelistJobs: [HeadOfSecurity] - type: sponsorLoadout id: LeerCapLoadout entity: LeerCap sponsorOnly: true - whitelistedJobs: [HeadOfSecurity] + whitelistJobs: [HeadOfSecurity] - type: sponsorLoadout id: LeerCloakLoadout entity: LeerCloak sponsorOnly: true - whitelistedJobs: [HeadOfSecurity] + whitelistJobs: [HeadOfSecurity] #- type: sponsorLoadout # id: LeerGlovesLoadout # entity: LeerGloves # sponsorOnly: true -# whitelistedJobs: [HeadOfSecurity] +# whitelistJobs: [HeadOfSecurity] - type: sponsorLoadout id: LeerHardsuitLoadout entity: LeerHardsuit sponsorOnly: true - whitelistedJobs: [HeadOfSecurity] + whitelistJobs: [HeadOfSecurity] - type: sponsorLoadout id: LeerHelmetLoadout entity: LeerHelmet sponsorOnly: true - whitelistedJobs: [HeadOfSecurity] + whitelistJobs: [HeadOfSecurity] - type: sponsorLoadout id: LeerJumpsuitLoadout entity: LeerJumpsuit sponsorOnly: true - whitelistedJobs: [HeadOfSecurity] + whitelistJobs: [HeadOfSecurity] - type: sponsorLoadout id: LeerMaskLoadout entity: LeerMask sponsorOnly: true - whitelistedJobs: [HeadOfSecurity] + whitelistJobs: [HeadOfSecurity] - type: sponsorLoadout id: LeerTrenchLoadout entity: LeerTrench sponsorOnly: true - whitelistedJobs: [HeadOfSecurity] + whitelistJobs: [HeadOfSecurity] # мурка - type: sponsorLoadout diff --git a/Resources/Prototypes/_White/SoundCollections/harpy.yml b/Resources/Prototypes/_White/SoundCollections/harpy.yml index d129af60c9..3f881f4a88 100644 --- a/Resources/Prototypes/_White/SoundCollections/harpy.yml +++ b/Resources/Prototypes/_White/SoundCollections/harpy.yml @@ -63,14 +63,24 @@ - type: soundCollection id: HarpyCry files: - - /Audio/Voice/Human/cry_male_1.ogg - - /Audio/Voice/Human/cry_male_2.ogg - - /Audio/Voice/Human/cry_male_3.ogg - - /Audio/Voice/Human/cry_male_4.ogg - - /Audio/Voice/Human/cry_female_1.ogg - - /Audio/Voice/Human/cry_female_2.ogg - - /Audio/Voice/Human/cry_female_3.ogg - - /Audio/Voice/Human/cry_female_4.ogg + - /Audio/White/Voice/Human/Male/crying1.ogg + - /Audio/White/Voice/Human/Male/crying2.ogg + - /Audio/White/Voice/Human/Male/crying3.ogg + - /Audio/White/Voice/Human/Male/crying4.ogg + - /Audio/White/Voice/Human/Male/crying5.ogg + - /Audio/White/Voice/Human/Male/crying6.ogg + - /Audio/White/Voice/Human/Female/crying1.ogg + - /Audio/White/Voice/Human/Female/crying2.ogg + - /Audio/White/Voice/Human/Female/crying3.ogg + - /Audio/White/Voice/Human/Female/crying4.ogg + - /Audio/White/Voice/Human/Female/crying5.ogg + - /Audio/White/Voice/Human/Female/crying6.ogg + - /Audio/White/Voice/Human/Female/crying7.ogg + - /Audio/White/Voice/Human/Female/crying8.ogg + - /Audio/White/Voice/Human/Female/crying9.ogg + - /Audio/White/Voice/Human/Female/crying10.ogg + - /Audio/White/Voice/Human/Female/crying11.ogg + - /Audio/White/Voice/Human/Female/crying12.ogg - type: soundCollection id: HarpyMeows diff --git a/Resources/Prototypes/_White/Wizard/wizard.yml b/Resources/Prototypes/_White/Wizard/wizard.yml index 68a091ed63..f0f845a74e 100644 --- a/Resources/Prototypes/_White/Wizard/wizard.yml +++ b/Resources/Prototypes/_White/Wizard/wizard.yml @@ -45,9 +45,6 @@ outerClothing: ClothingOuterRealWizardFancy shoes: ClothingShoesWizard pocket1: SpellBook - innerClothingSkirt: ClothingUniformJumpskirtColorDarkBlue - satchel: ClothingBackpackSatchelFilled - duffelbag: ClothingBackpackDuffelFilled - type: entity noSpawn: true