From 44149a6db855e9babe3223c0f5311848550a5e8a Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Fri, 30 May 2025 14:04:04 +0300 Subject: [PATCH] global whitelist fix --- .../CP14SharedFarmingSystem.Interactions.cs | 3 +- Resources/Prototypes/_CP14/Alerts/alerts.yml | 4 +- .../Prototypes/_CP14/Catalog/Fills/crates.yml | 4 +- .../_CP14/Datasets/Names/species-names.yml | 2 +- Resources/Prototypes/_CP14/Decal/nature.yml | 6 +- .../Actions/Spells/Death/cure_dead.yml | 2 +- .../Spells/Death/cure_dead_ballade.yml | 2 +- .../Actions/Spells/Fire/flame_creation.yml | 2 +- .../Actions/Spells/Fire/hell_ballade.yml | 2 +- .../Spells/Fire/tiefling_inner_fire.yml | 2 +- .../Actions/Spells/Life/cure_heat.yml | 2 +- .../Actions/Spells/Life/cure_wounds.yml | 2 +- .../Actions/Spells/Life/heal_ballade.yml | 2 +- .../Actions/Spells/Life/peace_ballade.yml | 2 +- .../Actions/Spells/Life/sheep_polymorph.yml | 2 +- .../Actions/Spells/Life/speed_ballade.yml | 2 +- .../Actions/Spells/Light/flash_light.yml | 2 +- .../Actions/Spells/Light/signal_light.yml | 12 +- .../Entities/Actions/Spells/Lurker/Fear.yml | 6 +- .../Actions/Spells/Meta/mana_ballade.yml | 2 +- .../Actions/Spells/Meta/mana_consume.yml | 2 +- .../Actions/Spells/Meta/mana_splitting.yml | 2 +- .../Actions/Spells/Meta/mana_trance.yml | 2 +- .../Actions/Spells/Vampire/T0_Bite.yml | 4 +- .../Actions/Spells/Vampire/T1_Hypnosis.yml | 2 +- .../_CP14/Entities/Actions/ghost.yml | 6 +- .../Entities/Clothing/Back/backpacks.yml | 2 +- .../Clothing/Cloak/Roles/alchemist.yml | 4 +- .../Clothing/Cloak/Roles/blacksmith.yml | 4 +- .../Entities/Clothing/Cloak/Roles/captain.yml | 2 +- .../Clothing/Cloak/Roles/commandant.yml | 2 +- .../Clothing/Cloak/Roles/guard_commander.yml | 2 +- .../Clothing/Cloak/Roles/guildmaster.yml | 2 +- .../Entities/Clothing/Cloak/sort_later.yml | 2 +- .../_CP14/Entities/Clothing/Eyes/eyes.yml | 2 +- .../_CP14/Entities/Clothing/Gloves/gloves.yml | 2 +- .../Entities/Clothing/Head/Roles/general.yml | 2 +- .../Clothing/Head/Roles/guildmaster.yml | 2 +- .../Entities/Clothing/Shirt/Roles/general.yml | 38 +-- .../Entities/Clothing/Shirt/Roles/guard.yml | 2 +- .../_CP14/Entities/Clothing/Shoes/shoes.yml | 4 +- .../Entities/Effects/alchemy_effects.yml | 2 +- .../_CP14/Entities/Effects/visual_effect.yml | 2 +- .../Markers/Spawners/demiplane_rifts.yml | 2 +- .../_CP14/Entities/Markers/Spawners/jobs.yml | 2 +- .../Markings/human_facial_hair.yml | 2 +- .../Customization/Markings/human_hair.yml | 306 +++++++++--------- .../Markings/silva_body_bark.yml | 12 +- .../Markings/silva_head_bark.yml | 18 +- .../_CP14/Entities/Mobs/NPC/Slimes/ice.yml | 2 +- .../_CP14/Entities/Mobs/NPC/ice_ghost.yml | 4 +- .../_CP14/Entities/Mobs/NPC/zombie.yml | 2 +- .../Player/DemiplaneAntag/Skeletons/T1.yml | 4 +- .../Entities/Mobs/Player/TownRaids/undead.yml | 2 +- .../_CP14/Entities/Mobs/Player/tiefling.yml | 1 - .../Entities/Objects/Bureaucracy/pen.yml | 2 +- .../Entities/Objects/Consumable/Food/egg.yml | 2 +- .../_CP14/Entities/Objects/Economy/coins.yml | 2 +- .../Objects/Economy/trade_contracts.yml | 4 +- .../_CP14/Entities/Objects/Flora/wild.yml | 8 +- .../Objects/Keys/Catalog/alchemist.yml | 2 +- .../Objects/Keys/Catalog/blacksmith.yml | 4 +- .../Objects/Keys/Catalog/personalHouse.yml | 30 +- .../_CP14/Entities/Objects/Keys/key.yml | 2 +- .../_CP14/Entities/Objects/Keys/locks.yml | 2 +- .../Entities/Objects/Materials/simple.yml | 2 +- .../Entities/Objects/ModularTools/rod.yml | 2 +- .../Objects/Specific/Alchemy/vial_bomb.yml | 2 +- .../Objects/Specific/Alchemy/vials.yml | 2 +- .../Objects/Specific/Thaumaturgy/tools.yml | 6 +- .../_CP14/Entities/Objects/Tools/bucket.yml | 2 +- .../Entities/Objects/Tools/flashlight.yml | 8 +- .../_CP14/Entities/Objects/Tools/torch.yml | 2 +- .../Objects/Weapons/Melee/Tools/janitor.yml | 2 +- .../Objects/Weapons/Melee/Tools/wrench.yml | 2 +- .../Entities/Objects/Weapons/Melee/shield.yml | 2 +- .../Objects/Weapons/ModularPresets/rapier.yml | 2 +- .../Entities/Objects/Weapons/Ranged/bow.yml | 2 +- .../Structures/Decorations/garland.yml | 1 - .../Structures/Doors/Locked/alchemist.yml | 6 +- .../Structures/Doors/Locked/blacksmith.yml | 6 +- .../Structures/Doors/Locked/merchant.yml | 6 +- .../Structures/Doors/Locked/tavern.yml | 4 +- .../Structures/Doors/wooden_doors.yml | 2 +- .../Doors/wooden_doors_windowed.yml | 2 +- .../Entities/Structures/Fence/big_fence.yml | 4 +- .../Entities/Structures/Fence/big_gate.yml | 4 +- .../Entities/Structures/Fence/cliffs.yml | 2 +- .../_CP14/Entities/Structures/Fence/fence.yml | 2 +- .../_CP14/Entities/Structures/Fence/gate.yml | 2 +- .../Entities/Structures/Fence/window.yml | 2 +- .../Structures/Flora/Crystal/elemental.yml | 4 +- .../Flora/Gatherable/Wild/water_lilies.yml | 5 +- .../Structures/Flora/Gatherable/base.yml | 4 +- .../Entities/Structures/Furniture/beds.yml | 2 +- .../Entities/Structures/Furniture/bench.yml | 2 +- .../Structures/Furniture/bookshelf.yml | 2 +- .../Entities/Structures/Furniture/chairs.yml | 4 +- .../Structures/Furniture/curtains.yml | 2 +- .../Structures/Furniture/glass_showcase.yml | 2 +- .../Structures/Furniture/lamppost.yml | 4 +- .../Structures/Furniture/mannequin.yml | 2 +- .../Entities/Structures/Furniture/pallets.yml | 3 +- .../Entities/Structures/Furniture/target.yml | 4 +- .../Entities/Structures/Furniture/torch.yml | 2 +- .../Structures/Furniture/wallmount.yml | 2 +- .../Structures/Furniture/wallmount_lamp.yml | 8 +- .../Furniture/wallmount_order_border.yml | 2 +- .../_CP14/Entities/Structures/Roof/base.yml | 7 +- .../Structures/Specific/Alchemy/cleaner.yml | 2 +- .../Structures/Specific/Alchemy/vat.yml | 2 +- .../Specific/Blacksmith/furnace.yml | 2 +- .../Specific/Device/pressure_plate.yml | 8 +- .../Specific/Device/wallmount_buttons.yml | 2 +- .../Specific/Thaumaturgy/essence_nodes.yml | 2 +- .../Specific/Thaumaturgy/essence_splitter.yml | 2 +- .../Structures/Specific/Thaumaturgy/misc.yml | 4 +- .../Structures/Storage/Crates/chests.yml | 2 +- .../Structures/Storage/Crates/crates.yml | 4 +- .../Entities/Structures/Walls/natural.yml | 4 +- .../Entities/Structures/Walls/wooden.yml | 2 +- .../Entities/Structures/Windows/misc.yml | 2 +- .../Entities/Structures/Windows/wooden.yml | 2 +- Resources/Prototypes/_CP14/Entities/fire.yml | 2 +- .../_CP14/Loadouts/Jobs/alchemist.yml | 2 +- .../_CP14/Loadouts/Jobs/blacksmith.yml | 2 +- .../_CP14/Loadouts/Jobs/general.yml | 22 +- .../_CP14/Loadouts/Jobs/guildmaster.yml | 2 +- .../_CP14/LockCategories/lockTypes.yml | 8 +- Resources/Prototypes/_CP14/NPCs/base.yml | 2 +- .../Demiplane/Modifiers/Fun/lol.yml | 4 +- .../Demiplane/Modifiers/Ore/ores.yml | 20 +- .../Demiplane/Modifiers/Reward/crystals.yml | 2 +- .../Demiplane/Modifiers/Reward/herbals.yml | 14 +- .../Demiplane/Modifiers/Reward/misc.yml | 2 +- .../Demiplane/Modifiers/Weather/weather.yml | 4 +- .../Demiplane/Modifiers/special.yml | 6 +- .../Prototypes/_CP14/Procedural/caves.yml | 2 +- .../_CP14/Procedural/grasslands.yml | 7 +- .../Prototypes/_CP14/Procedural/snow.yml | 4 +- .../Prototypes/_CP14/Procedural/swamp.yml | 4 +- .../_CP14/Procedural/wastelands.yml | 2 +- .../_CP14/Reagents/magic_essence.yml | 2 +- .../Prototypes/_CP14/Reagents/precurser.yml | 4 +- .../Construction/Graphs/Furniture/tables.yml | 10 +- .../Construction/Graphs/Misc/target.yml | 2 +- .../Construction/Graphs/Storage/chests.yml | 2 +- .../Construction/Graphs/Storage/crates.yml | 2 +- .../Construction/Graphs/Storage/pits.yml | 2 +- .../Graphs/Structures/Doors/iron_doors.yml | 12 +- .../Graphs/Structures/Doors/wooden_doors.yml | 12 +- .../Graphs/Structures/Roofs/roofs.yml | 4 +- .../Structures/Walls/wall_stonebrick.yml | 2 +- .../Walls/wall_stonebrick_marble.yml | 2 +- .../Graphs/Structures/Walls/wall_wooden.yml | 2 +- .../Structures/Walls/wall_wooden_birch.yml | 4 +- .../Structures/Walls/window_stonebrick.yml | 2 +- .../Walls/window_stonebrick_marble.yml | 2 +- .../Graphs/Structures/Walls/window_wooden.yml | 2 +- .../target_effect_creation_on_water.yml | 2 +- .../_CP14/Recipes/Workbench/furnace.yml | 2 +- Resources/Prototypes/_CP14/Skill/atlethic.yml | 6 +- .../Prototypes/_CP14/Skill/dimension.yml | 6 +- Resources/Prototypes/_CP14/Skill/healing.yml | 20 +- .../Prototypes/_CP14/Skill/hydrosophistry.yml | 18 +- Resources/Prototypes/_CP14/Skill/illusion.yml | 12 +- .../Prototypes/_CP14/Skill/martial_arts.yml | 6 +- .../Prototypes/_CP14/Skill/metamagic.yml | 30 +- .../Prototypes/_CP14/Skill/pyrokinetic.yml | 16 +- .../Prototypes/_CP14/Skill/thaumaturgy.yml | 2 +- .../_CP14/SoundCollections/items.yml | 2 +- Resources/Prototypes/_CP14/Stacks/coins.yml | 8 +- Resources/Prototypes/_CP14/audio_music.yml | 2 +- Resources/Prototypes/_CP14/weather.yml | 2 +- 174 files changed, 530 insertions(+), 535 deletions(-) diff --git a/Content.Shared/_CP14/Farming/CP14SharedFarmingSystem.Interactions.cs b/Content.Shared/_CP14/Farming/CP14SharedFarmingSystem.Interactions.cs index c7faaeeb34..bbb5ee533c 100644 --- a/Content.Shared/_CP14/Farming/CP14SharedFarmingSystem.Interactions.cs +++ b/Content.Shared/_CP14/Farming/CP14SharedFarmingSystem.Interactions.cs @@ -117,7 +117,7 @@ public abstract partial class CP14SharedFarmingSystem if (used != null && !_tag.HasTag(used.Value, tag)) continue; } - + var spawnLoot = _entityTable.GetSpawns(table); foreach (var loot in spawnLoot) { @@ -218,3 +218,4 @@ public abstract partial class CP14SharedFarmingSystem return true; } } + diff --git a/Resources/Prototypes/_CP14/Alerts/alerts.yml b/Resources/Prototypes/_CP14/Alerts/alerts.yml index dcecd7b2d0..5ab09362dc 100644 --- a/Resources/Prototypes/_CP14/Alerts/alerts.yml +++ b/Resources/Prototypes/_CP14/Alerts/alerts.yml @@ -22,9 +22,9 @@ - sprite: /Textures/_CP14/Interface/Alerts/mana.rsi state: mana8 - sprite: /Textures/_CP14/Interface/Alerts/mana.rsi - state: mana9 + state: mana9 - sprite: /Textures/_CP14/Interface/Alerts/mana.rsi #TODO: Without this dublication, alerts never be fully null - state: mana9 + state: mana9 name: cp14-alerts-magic-energy-name description: cp14-alerts-magic-energy-desc minSeverity: 0 diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml index 853a00cb4c..b33852e3d1 100644 --- a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml +++ b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml @@ -1,6 +1,6 @@ - type: entity id: CP14SmallWoodenCrateFilled - parent: + parent: - CP14SmallWoodenCrate suffix: Filled, Tools and Fluff components: @@ -14,7 +14,7 @@ - type: entity id: CP14LargeWoodenCrateFilled suffix: Filled, Tools and Fluff - parent: + parent: - CP14LargeWoodenCrate components: - type: EntityTableContainerFill diff --git a/Resources/Prototypes/_CP14/Datasets/Names/species-names.yml b/Resources/Prototypes/_CP14/Datasets/Names/species-names.yml index 91989f3dcb..3c59b3c075 100644 --- a/Resources/Prototypes/_CP14/Datasets/Names/species-names.yml +++ b/Resources/Prototypes/_CP14/Datasets/Names/species-names.yml @@ -29,7 +29,7 @@ - type: localizedDataset id: CP14_Names_Human_Female_First - values: + values: prefix: cp14-species-name-human-female-first- count: 44 diff --git a/Resources/Prototypes/_CP14/Decal/nature.yml b/Resources/Prototypes/_CP14/Decal/nature.yml index 83fd03475e..887f2a55e6 100644 --- a/Resources/Prototypes/_CP14/Decal/nature.yml +++ b/Resources/Prototypes/_CP14/Decal/nature.yml @@ -181,7 +181,7 @@ sprite: sprite: /Textures/_CP14/Decals/Flora/Grass.rsi state: grass_short11 - + - type: decal id: CP14FloraGrass12 snapCardinals: true @@ -190,7 +190,7 @@ sprite: sprite: /Textures/_CP14/Decals/Flora/Grass.rsi state: grass_short12 - + - type: decal id: CP14FloraGrass13 snapCardinals: true @@ -199,7 +199,7 @@ sprite: sprite: /Textures/_CP14/Decals/Flora/Grass.rsi state: grass_short13 - + - type: decal id: CP14FloraGrass14 snapCardinals: true diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/cure_dead.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/cure_dead.yml index f85da28a8a..672a1828f7 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/cure_dead.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/cure_dead.yml @@ -12,7 +12,7 @@ manaCost: 4 - type: CP14MagicEffect telegraphyEffects: - - !type:CP14SpellSpawnEntityOnTarget + - !type:CP14SpellSpawnEntityOnTarget spawns: - CP14ImpactEffectResurrection effects: diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/cure_dead_ballade.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/cure_dead_ballade.yml index 6fbfeb3d1c..76dcf17770 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/cure_dead_ballade.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/cure_dead_ballade.yml @@ -75,7 +75,7 @@ - state: notes_5 color: "#36937b" shader: unshaded - + - type: entity id: CP14RuneDeadHealBallade parent: CP14BaseMagicRune diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/flame_creation.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/flame_creation.yml index a2ac6d4879..3342c332d0 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/flame_creation.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/flame_creation.yml @@ -62,7 +62,7 @@ - type: entity id: CP14FlameCreationArtificialFlame - parent: + parent: - BaseItem - ItemHeftyBase name: artificial flame diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/hell_ballade.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/hell_ballade.yml index ddaff00d81..5b1e1a2b2c 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/hell_ballade.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/hell_ballade.yml @@ -70,7 +70,7 @@ - state: notes_5 color: "#eea911" shader: unshaded - + - type: entity id: CP14RuneHellBallade parent: CP14BaseMagicRune diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/tiefling_inner_fire.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/tiefling_inner_fire.yml index c4f36538f6..6d918eaf6a 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/tiefling_inner_fire.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/tiefling_inner_fire.yml @@ -50,7 +50,7 @@ - state: wave_up color: "#eea911" shader: unshaded - + - type: entity id: CP14RuneTieflingRevenge parent: CP14BaseMagicRune diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_heat.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_heat.yml index f3c04336fb..b9924f34a3 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_heat.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_heat.yml @@ -50,7 +50,7 @@ cooldown: 5 castDelay: 1.5 breakOnMove: false - + - type: entity id: CP14RuneCureBurn parent: CP14BaseMagicRune diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_wounds.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_wounds.yml index bf6550a901..68d437dfc4 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_wounds.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_wounds.yml @@ -52,7 +52,7 @@ cooldown: 5 castDelay: 1.5 breakOnMove: false - + - type: entity id: CP14RuneCureWounds parent: CP14BaseMagicRune diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/heal_ballade.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/heal_ballade.yml index c3b753ab2c..d5c8ec26e2 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/heal_ballade.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/heal_ballade.yml @@ -76,7 +76,7 @@ - state: notes_5 color: "#79b330" shader: unshaded - + - type: entity id: CP14RuneHealBallade parent: CP14BaseMagicRune diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/peace_ballade.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/peace_ballade.yml index 6daec90aac..c8a3096a06 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/peace_ballade.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/peace_ballade.yml @@ -69,7 +69,7 @@ - state: notes_5 color: "#bd4fda" shader: unshaded - + - type: entity id: CP14RunePeaceBallade parent: CP14BaseMagicRune diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/sheep_polymorph.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/sheep_polymorph.yml index a3bf6d31ef..9f05c6aa51 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/sheep_polymorph.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/sheep_polymorph.yml @@ -46,7 +46,7 @@ cooldown: 30 castDelay: 1.5 breakOnMove: false - + - type: entity id: CP14RuneSheepPolymorph parent: CP14BaseMagicRune diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/speed_ballade.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/speed_ballade.yml index 9bd96ad1a5..0d08e7fb09 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/speed_ballade.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/speed_ballade.yml @@ -68,7 +68,7 @@ - state: notes_5 color: "#e8cb56" shader: unshaded - + - type: entity id: CP14RuneSpeedBallade parent: CP14BaseMagicRune diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/flash_light.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/flash_light.yml index 116c520085..2570f8c0e8 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/flash_light.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/flash_light.yml @@ -71,7 +71,7 @@ sprite: /Textures/Objects/Fun/goldbikehorn.rsi visible: false state: icon - - type: TriggerOnSpawn + - type: TriggerOnSpawn - type: TimedDespawn lifetime: 5 - type: FlashOnTrigger diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/signal_light.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/signal_light.yml index 61332ba244..64a285000b 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/signal_light.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/signal_light.yml @@ -24,7 +24,7 @@ id: CP14ActionSpellSignalLightRed parent: CP14ActionSpellSignalLightBase name: Red signal Light - description: You launch a hovering ball of light, briefly emitting a bright glow of red. This glow is able to penetrate the real world even from the demiplane. + description: You launch a hovering ball of light, briefly emitting a bright glow of red. This glow is able to penetrate the real world even from the demiplane. components: - type: Sprite state: signal_light_red @@ -69,7 +69,7 @@ id: CP14ActionSpellSignalLightYellow parent: CP14ActionSpellSignalLightBase name: Yellow signal Light - description: You launch a hovering ball of light, briefly emitting a bright glow of yellow. This glow is able to penetrate the real world even from the demiplane. + description: You launch a hovering ball of light, briefly emitting a bright glow of yellow. This glow is able to penetrate the real world even from the demiplane. components: - type: Sprite state: signal_light_yellow @@ -114,7 +114,7 @@ id: CP14ActionSpellSignalLightBlue parent: CP14ActionSpellSignalLightBase name: Blue signal Light - description: You launch a hovering ball of light, briefly emitting a bright glow of blue. This glow is able to penetrate the real world even from the demiplane. + description: You launch a hovering ball of light, briefly emitting a bright glow of blue. This glow is able to penetrate the real world even from the demiplane. components: - type: Sprite state: signal_light_blue @@ -160,7 +160,7 @@ abstract: true categories: [ ForkFiltered ] name: signal light - description: A signal of light left by an adventurer possibly in trouble. + description: A signal of light left by an adventurer possibly in trouble. components: - type: TimedDespawn lifetime: 12 @@ -176,12 +176,12 @@ netsync: false mask: /Textures/_CP14/Effects/LightMasks/lighthouse_cone.png - type: EmitSoundOnSpawn - sound: + sound: path: /Audio/Items/Flare/flare_on.ogg - type: AmbientSound enabled: true volume: -5 - range: 5 + range: 5 sound: path: /Audio/Items/Flare/flare_burn.ogg #TODO sound redesign - type: CP14SpawnOutOfDemiplane diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Lurker/Fear.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Lurker/Fear.yml index 9bb4334142..380dccee73 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Lurker/Fear.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Lurker/Fear.yml @@ -1,7 +1,7 @@ - type: entity id: CP14ActionSpellLurkerFear name: Primal terror - description: You plunge the target into primal terror, robbing them of the ability to fight and speak. + description: You plunge the target into primal terror, robbing them of the ability to fight and speak. components: - type: Sprite sprite: _CP14/Actions/Spells/lurker.rsi @@ -62,7 +62,7 @@ - state: particles_down color: "#6c5f82" shader: unshaded - + - type: entity id: CP14RuneLurkerFear parent: CP14BaseMagicRune @@ -75,7 +75,7 @@ - state: double_outer color: "#6c5f82" shader: unshaded - + - type: entity id: CP14RuneLurkerFearImpact parent: CP14BaseMagicImpact diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_ballade.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_ballade.yml index b4f2d3ceb0..58552a17d1 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_ballade.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_ballade.yml @@ -68,7 +68,7 @@ - state: notes_5 color: "#5096d4" shader: unshaded - + - type: entity id: CP14RuneMagicBallade parent: CP14BaseMagicRune diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_consume.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_consume.yml index 3ff4f33750..c270c43074 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_consume.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_consume.yml @@ -1,7 +1,7 @@ - type: entity id: CP14ActionSpellManaConsume name: Mana consume - description: You absorb a small amount of mana from the target. + description: You absorb a small amount of mana from the target. components: - type: Sprite sprite: _CP14/Actions/Spells/meta.rsi diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_splitting.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_splitting.yml index a498876aa1..cf6cf91bee 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_splitting.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_splitting.yml @@ -43,7 +43,7 @@ event: !type:CP14DelayedEntityTargetActionEvent cooldown: 15 castDelay: 0.25 - breakOnMove: false + breakOnMove: false - type: entity id: CP14RuneMagicSplitting diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_trance.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_trance.yml index b682bdce46..a5d994f721 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_trance.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_trance.yml @@ -1,7 +1,7 @@ - type: entity id: CP14ActionSpellManaTrance name: Mana trance - description: You go into a trance for a while, restoring mana. + description: You go into a trance for a while, restoring mana. components: - type: Sprite sprite: _CP14/Actions/Spells/meta.rsi diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/T0_Bite.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/T0_Bite.yml index 9b43602060..bbd8e12a7a 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/T0_Bite.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/T0_Bite.yml @@ -23,7 +23,7 @@ - CP14ImpactEffectVampireBite - !type:CP14SpellApplyEntityEffect effects: - - !type:Jitter + - !type:Jitter - !type:ModifyBloodLevel amount: -15 - type: EntityTargetAction @@ -43,7 +43,7 @@ event: !type:CP14DelayedEntityTargetActionEvent cooldown: 1 castDelay: 1 - + - type: entity id: CP14ImpactEffectVampireBite parent: CP14SnowEffect diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/T1_Hypnosis.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/T1_Hypnosis.yml index c8840e04d6..277469a1f2 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/T1_Hypnosis.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/T1_Hypnosis.yml @@ -44,7 +44,7 @@ cooldown: 30 castDelay: 1.5 breakOnMove: false - + - type: entity id: CP14RuneVampireHypnosis parent: CP14BaseMagicRune diff --git a/Resources/Prototypes/_CP14/Entities/Actions/ghost.yml b/Resources/Prototypes/_CP14/Entities/Actions/ghost.yml index dbba64110c..6f0466583a 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/ghost.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/ghost.yml @@ -5,7 +5,7 @@ components: - type: InstantAction checkCanInteract: false - icon: + icon: sprite: _CP14/Actions/zLevel.rsi state: up event: !type:CP14ZLevelActionUp @@ -17,7 +17,7 @@ components: - type: InstantAction checkCanInteract: false - icon: + icon: sprite: _CP14/Actions/zLevel.rsi state: down event: !type:CP14ZLevelActionDown @@ -30,7 +30,7 @@ - type: InstantAction clientExclusive: true checkCanInteract: false - icon: + icon: sprite: _CP14/Actions/zLevel.rsi state: roof event: !type:CP14ToggleRoofVisibilityAction \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks.yml index 541f094911..5b81a40152 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: + parent: - Clothing - ContentsExplosionResistanceBase id: CP14ClothingBackpackBase diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/alchemist.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/alchemist.yml index 8f8ee09946..1f3fc58a2c 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/alchemist.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/alchemist.yml @@ -1,5 +1,5 @@ - type: entity - parent: + parent: - CP14ClothingCloakBase - CP14ClothingBaseContainer id: CP14ClothingCloakAlchemist @@ -25,7 +25,7 @@ - CP14Vial - type: entity - parent: + parent: - CP14ClothingCloakBase - CP14ClothingBaseContainer id: CP14ClothingCloakAlchemistMantle diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/blacksmith.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/blacksmith.yml index 3b18a1176c..b21b96caa3 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/blacksmith.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/blacksmith.yml @@ -1,10 +1,10 @@ - type: entity - parent: + parent: - CP14ClothingCloakBase - CP14ClothingBaseContainer id: CP14ClothingCloakBlacksmithArpon name: blacksmith's apron - description: Loose leather strips, still actually being clothing. + description: Loose leather strips, still actually being clothing. components: - type: Sprite sprite: _CP14/Clothing/Cloak/Roles/General/blacksmith_apron.rsi diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/captain.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/captain.yml index 1a9771957e..3817819521 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/captain.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/captain.yml @@ -1,5 +1,5 @@ - type: entity - parent: + parent: - CP14ClothingCloakBase - ClothingSlotBase id: CP14ClothingCloakCaptainJacket diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/commandant.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/commandant.yml index 8b6e4001d9..75bb2b4ae6 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/commandant.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/commandant.yml @@ -1,5 +1,5 @@ - type: entity - parent: + parent: - CP14ClothingCloakBase id: CP14ClothingCloakCommandantJacket #TODO: Rename from Jacket to Cape name: commandant's cape diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/guard_commander.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/guard_commander.yml index 69bbf90b28..f755235fd8 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/guard_commander.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/guard_commander.yml @@ -2,7 +2,7 @@ parent: CP14ClothingCloakBase id: CP14ClothingCloakGuardCommander name: armored cloak of a guard commander - description: It is an extremely durable and lightweight cape, custom designed for Imperial Guard commanders + description: It is an extremely durable and lightweight cape, custom designed for Imperial Guard commanders components: - type: Sprite sprite: _CP14/Clothing/Cloak/Roles/Guard/guard_commander_cloak.rsi diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/guildmaster.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/guildmaster.yml index 4bead421c5..bf0eb5dadc 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/guildmaster.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/guildmaster.yml @@ -1,5 +1,5 @@ - type: entity - parent: + parent: - CP14ClothingCloakBase id: CP14ClothingCloakGuildmasterCape name: guildmaster cape diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/sort_later.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/sort_later.yml index df2a3647c2..5b55f29c60 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/sort_later.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/sort_later.yml @@ -1,5 +1,5 @@ - type: entity - parent: + parent: - CP14ClothingCloakBase - ClothingSlotBase id: CP14ClothingCloakMaidArpon diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Eyes/eyes.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Eyes/eyes.yml index f69ec4bad1..93e0d1dd15 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Eyes/eyes.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Eyes/eyes.yml @@ -109,7 +109,7 @@ parent: CP14ClothingEyesBase id: CP14ClothingEyesEyePatch name: eye patch - description: Hides the mutilation of the eyes. + description: Hides the mutilation of the eyes. components: - type: Foldable canFoldInsideContainer: true diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Gloves/gloves.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Gloves/gloves.yml index 219bee4524..014f826a6b 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Gloves/gloves.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Gloves/gloves.yml @@ -7,7 +7,7 @@ - type: Clothing equipDelay: 0.2 unequipDelay: 0.2 - slots: + slots: - gloves - type: Sprite state: icon diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/general.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/general.yml index c285ceadc0..596f76d979 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/general.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/general.yml @@ -101,7 +101,7 @@ parent: CP14ClothingHeadBase id: CP14ClothingHeadJagermeisterHat name: jagermeister's hat - description: The mark of a professional in his field. + description: The mark of a professional in his field. components: - type: Sprite sprite: _CP14/Clothing/Head/Roles/General/jagermeister_hat.rsi diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/guildmaster.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/guildmaster.yml index 03d52e0e88..dd1fde1e28 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/guildmaster.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/guildmaster.yml @@ -2,7 +2,7 @@ parent: CP14ClothingHeadBase id: CP14ClothingHeadGildmaster name: guildmaster hat - description: A sign of unlimited experience and honor. + description: A sign of unlimited experience and honor. components: - type: Sprite sprite: _CP14/Clothing/Head/Roles/Guildmaster/guildmaster_hat.rsi diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml index 7c8ad79c8f..3ec2736082 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml @@ -286,7 +286,7 @@ parent: CP14ClothingShirtBase id: CP14ClothinShirtMaidDress name: maid's dress - components: + components: - type: Sprite sprite: _CP14/Clothing/Shirt/Roles/General/Dress/maid_dress.rsi - type: Clothing @@ -294,9 +294,9 @@ - type: entity parent: CP14ClothingShirtBase - id: CP14ClothinShirtBlueYellowDress - name: blue-yellow dress - components: + id: CP14ClothinShirtBlueYellowDress + name: blue-yellow dress + components: - type: Sprite sprite: _CP14/Clothing/Shirt/Roles/General/Dress/blue_yellow_dress.rsi - type: Clothing @@ -304,9 +304,9 @@ - type: entity parent: CP14ClothingShirtBase - id: CP14ClothinShirtWhiteBlueDress + id: CP14ClothinShirtWhiteBlueDress name: white-blue dress - components: + components: - type: Sprite sprite: _CP14/Clothing/Shirt/Roles/General/Dress/white_blue_dress.rsi - type: Clothing @@ -314,9 +314,9 @@ - type: entity parent: CP14ClothingShirtBase - id: CP14ClothinShirtWhiteBlue2Dress + id: CP14ClothinShirtWhiteBlue2Dress name: white-blue dress - components: + components: - type: Sprite sprite: _CP14/Clothing/Shirt/Roles/General/Dress/white_blue_dress2.rsi - type: Clothing @@ -326,7 +326,7 @@ parent: CP14ClothingShirtBase id: CP14ClothinShirtBrown2Dress name: brown dress - components: + components: - type: Sprite sprite: _CP14/Clothing/Shirt/Roles/General/Dress/white_brown2_dress.rsi - type: Clothing @@ -336,7 +336,7 @@ parent: CP14ClothingShirtBase id: CP14ClothinShirtBrown3Dress name: brown dress - components: + components: - type: Sprite sprite: _CP14/Clothing/Shirt/Roles/General/Dress/white_brown3_dress.rsi - type: Clothing @@ -345,8 +345,8 @@ - type: entity parent: CP14ClothingShirtBase id: CP14ClothinShirtWhiteGreenDress - name: green dress - components: + name: green dress + components: - type: Sprite sprite: _CP14/Clothing/Shirt/Roles/General/Dress/white_green_dress.rsi - type: Clothing @@ -356,7 +356,7 @@ parent: CP14ClothingShirtBase id: CP14ClothinShirtwhiteGreenYellowDress name: green-yellow dress - components: + components: - type: Sprite sprite: _CP14/Clothing/Shirt/Roles/General/Dress/white_green_yellow_dress.rsi - type: Clothing @@ -366,7 +366,7 @@ parent: CP14ClothingShirtBase id: CP14ClothinShirtRedBlueDress name: red-blue dress - components: + components: - type: Sprite sprite: _CP14/Clothing/Shirt/Roles/General/Dress/white_red_blue_dress.rsi - type: Clothing @@ -376,7 +376,7 @@ parent: CP14ClothingShirtBase id: CP14ClothinShirtYellowBlueDress name: yellow-blue dress - components: + components: - type: Sprite sprite: _CP14/Clothing/Shirt/Roles/General/Dress/yellow_blue_dress.rsi - type: Clothing @@ -386,7 +386,7 @@ parent: CP14ClothingShirtBase id: CP14ClothinShirtBlueGreen name: blue-green shirt - components: + components: - type: Sprite sprite: _CP14/Clothing/Shirt/Roles/General/Shirts/blue_green.rsi - type: Clothing @@ -396,7 +396,7 @@ parent: CP14ClothingShirtBase id: CP14ClothinShirtGray name: gray shirt - components: + components: - type: Sprite sprite: _CP14/Clothing/Shirt/Roles/General/Shirts/gray.rsi - type: Clothing @@ -406,7 +406,7 @@ parent: CP14ClothingShirtBase id: CP14ClothinShirtGreenYellow name: green-yellow shirt - components: + components: - type: Sprite sprite: _CP14/Clothing/Shirt/Roles/General/Shirts/green_yellow.rsi - type: Clothing @@ -416,7 +416,7 @@ parent: CP14ClothingShirtBase id: CP14ClothinShirtWhiteBrown name: white-brown shirt - components: + components: - type: Sprite sprite: _CP14/Clothing/Shirt/Roles/General/Shirts/white_brown.rsi - type: Clothing diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/guard.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/guard.yml index a99938a86d..b01148b69a 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/guard.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/guard.yml @@ -12,7 +12,7 @@ Slash: 0.90 Piercing: 0.85 Heat: 0.90 - + - type: entity parent: CP14ClothingShirtGuardBase id: CP14ClothingShirtGuardsChainmailShirtB diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml index a09931d374..073ca7b88d 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml @@ -25,7 +25,7 @@ sprite: _CP14/Clothing/Shoes/black.rsi - type: Clothing sprite: _CP14/Clothing/Shoes/black.rsi - + - type: entity parent: CP14ClothingShoesBase id: CP14ClothingShoesAristocraticBlack @@ -36,7 +36,7 @@ sprite: _CP14/Clothing/Shoes/aristocratic_black.rsi - type: Clothing sprite: _CP14/Clothing/Shoes/aristocratic_black.rsi - + - type: entity parent: CP14ClothingShoesBase id: CP14ClothingShoesSandals diff --git a/Resources/Prototypes/_CP14/Entities/Effects/alchemy_effects.yml b/Resources/Prototypes/_CP14/Entities/Effects/alchemy_effects.yml index 4823378d9c..08c998780c 100644 --- a/Resources/Prototypes/_CP14/Entities/Effects/alchemy_effects.yml +++ b/Resources/Prototypes/_CP14/Entities/Effects/alchemy_effects.yml @@ -7,7 +7,7 @@ components: - type: Sprite sprite: _CP14/Effects/mist.rsi - state: chemmist + state: chemmist - type: TimedDespawn lifetime: 20 - type: Tag diff --git a/Resources/Prototypes/_CP14/Entities/Effects/visual_effect.yml b/Resources/Prototypes/_CP14/Entities/Effects/visual_effect.yml index 766728d78f..5fc5eed4b8 100644 --- a/Resources/Prototypes/_CP14/Entities/Effects/visual_effect.yml +++ b/Resources/Prototypes/_CP14/Entities/Effects/visual_effect.yml @@ -24,7 +24,7 @@ - type: EmitSoundOnSpawn sound: collection: CP14Digging - + - type: entity id: CP14SnowEffect parent: CP14DirtEffect diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/demiplane_rifts.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/demiplane_rifts.yml index 7a7c20e090..503847f332 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/demiplane_rifts.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/demiplane_rifts.yml @@ -47,7 +47,7 @@ falloffPower: 1.5 intensity: 50 - type: EmitSoundOnSpawn - sound: + sound: path: /Audio/Effects/demon_dies.ogg params: variation: 0.3 diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml index 361489054d..8da8830b79 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml @@ -7,7 +7,7 @@ - type: Sprite sprite: _CP14/Markers/jobs.rsi snapCardinals: true - + # Security - type: entity diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_facial_hair.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_facial_hair.yml index 068a900c1c..993cf62c32 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_facial_hair.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_facial_hair.yml @@ -157,7 +157,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi state: martialartist2 - + - type: marking id: CP14HumanFacialHairMoonshiner bodyPart: FacialHair diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_hair.yml index 4fa8010669..8463a7e711 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_hair.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_hair.yml @@ -5,7 +5,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: 80s - + - type: marking id: CP14HumanHair_A bodyPart: Hair @@ -13,7 +13,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: a - + - type: marking id: CP14HumanHair_Afro bodyPart: Hair @@ -21,7 +21,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: afro - + - type: marking id: CP14HumanHair_Afro2 bodyPart: Hair @@ -29,7 +29,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: afro2 - + - type: marking id: CP14HumanHair_Antenna bodyPart: Hair @@ -37,7 +37,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: antenna - + - type: marking id: CP14HumanHair_B bodyPart: Hair @@ -45,7 +45,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: b - + - type: marking id: CP14HumanHair_Bedhead bodyPart: Hair @@ -53,7 +53,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: bedhead - + - type: marking id: CP14HumanHair_BedheadV2 bodyPart: Hair @@ -61,7 +61,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: bedheadv2 - + - type: marking id: CP14HumanHair_BedheadV3 bodyPart: Hair @@ -69,7 +69,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: bedheadv3 - + - type: marking id: CP14HumanHair_BeeHive bodyPart: Hair @@ -77,7 +77,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: beehive - + - type: marking id: CP14HumanHair_BeeHive2 bodyPart: Hair @@ -85,7 +85,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: beehive2 - + - type: marking id: CP14HumanHair_Bigafro bodyPart: Hair @@ -93,7 +93,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: bigafro - + - type: marking id: CP14HumanHair_BigPompadour bodyPart: Hair @@ -101,7 +101,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: bigpompadour - + - type: marking id: CP14HumanHair_blowcut bodyPart: Hair @@ -109,7 +109,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: blowcut - + - type: marking id: CP14HumanHair_bob bodyPart: Hair @@ -117,7 +117,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: bob - + - type: marking id: CP14HumanHair_bob2 bodyPart: Hair @@ -125,7 +125,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: bob2 - + - type: marking id: CP14HumanHair_bob4 bodyPart: Hair @@ -133,7 +133,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: bob4 - + - type: marking id: CP14HumanHair_bob5 bodyPart: Hair @@ -141,7 +141,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: bob5 - + - type: marking id: CP14HumanHair_bobcurl bodyPart: Hair @@ -149,7 +149,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: bobcurl - + - type: marking id: CP14HumanHair_bobcut bodyPart: Hair @@ -157,7 +157,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: bobcut - + - type: marking id: CP14HumanHair_boddicker bodyPart: Hair @@ -165,7 +165,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: boddicker - + - type: marking id: CP14HumanHair_bowlcut2 bodyPart: Hair @@ -173,7 +173,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: bowlcut2 - + - type: marking id: CP14HumanHair_braid bodyPart: Hair @@ -181,7 +181,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: braid - + - type: marking id: CP14HumanHair_braid2 bodyPart: Hair @@ -189,7 +189,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: braid2 - + - type: marking id: CP14HumanHair_braided bodyPart: Hair @@ -197,7 +197,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: braided - + - type: marking id: CP14HumanHair_braidfront bodyPart: Hair @@ -205,7 +205,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: braidfront - + - type: marking id: CP14HumanHair_braidtail bodyPart: Hair @@ -213,7 +213,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: braidtail - + - type: marking id: CP14HumanHair_bun3 bodyPart: Hair @@ -221,7 +221,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: bun3 - + - type: marking id: CP14HumanHair_bunhead2 bodyPart: Hair @@ -229,7 +229,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: bunhead2 - + - type: marking id: CP14HumanHair_business bodyPart: Hair @@ -237,7 +237,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: business - + - type: marking id: CP14HumanHair_business2 bodyPart: Hair @@ -245,7 +245,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: business2 - + - type: marking id: CP14HumanHair_business3 bodyPart: Hair @@ -253,7 +253,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: business3 - + - type: marking id: CP14HumanHair_business4 bodyPart: Hair @@ -261,7 +261,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: business4 - + - type: marking id: CP14HumanHair_c bodyPart: Hair @@ -269,7 +269,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: c - + - type: marking id: CP14HumanHair_cia bodyPart: Hair @@ -277,7 +277,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: cia - + - type: marking id: CP14HumanHair_classicbusiness bodyPart: Hair @@ -285,7 +285,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: classicbusiness - + - type: marking id: CP14HumanHair_classiclong2 bodyPart: Hair @@ -293,7 +293,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: classiclong2 - + - type: marking id: CP14HumanHair_classiclong3 bodyPart: Hair @@ -301,7 +301,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: classiclong3 - + - type: marking id: CP14HumanHair_classicmodern bodyPart: Hair @@ -309,7 +309,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: classicmodern - + - type: marking id: CP14HumanHair_classicwisp bodyPart: Hair @@ -317,7 +317,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: classicwisp - + - type: marking id: CP14HumanHair_combover bodyPart: Hair @@ -325,7 +325,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: combover - + - type: marking id: CP14HumanHair_cornrowbraid bodyPart: Hair @@ -333,7 +333,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: cornrowbraid - + - type: marking id: CP14HumanHair_cornrowbun bodyPart: Hair @@ -341,7 +341,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: cornrowbun - + - type: marking id: CP14HumanHair_cornrows bodyPart: Hair @@ -349,7 +349,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: cornrows - + - type: marking id: CP14HumanHair_cornrows2 bodyPart: Hair @@ -357,7 +357,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: cornrows2 - + - type: marking id: CP14HumanHair_cornrowtail bodyPart: Hair @@ -365,7 +365,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: cornrowtail - + - type: marking id: CP14HumanHair_country bodyPart: Hair @@ -373,7 +373,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: country - + - type: marking id: CP14HumanHair_crazybald bodyPart: Hair @@ -381,7 +381,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: crazybald - + - type: marking id: CP14HumanHair_curls bodyPart: Hair @@ -389,7 +389,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: curls - + - type: marking id: CP14HumanHair_dandypompadour bodyPart: Hair @@ -397,7 +397,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: dandypompadour - + - type: marking id: CP14HumanHair_doublebun bodyPart: Hair @@ -405,7 +405,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: doublebun - + - type: marking id: CP14HumanHair_doublebun_long bodyPart: Hair @@ -413,7 +413,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: doublebun_long - + - type: marking id: CP14HumanHair_dreads bodyPart: Hair @@ -421,7 +421,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: dreads - + - type: marking id: CP14HumanHair_drillhair bodyPart: Hair @@ -429,7 +429,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: drillhair - + - type: marking id: CP14HumanHair_drillhairextended bodyPart: Hair @@ -437,7 +437,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: drillhairextended - + - type: marking id: CP14HumanHair_drillruru bodyPart: Hair @@ -445,7 +445,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: drillruru - + - type: marking id: CP14HumanHair_e bodyPart: Hair @@ -453,7 +453,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: e - + - type: marking id: CP14HumanHair_emo bodyPart: Hair @@ -461,7 +461,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: emo - + - type: marking id: CP14HumanHair_emo2 bodyPart: Hair @@ -469,7 +469,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: emo2 - + - type: marking id: CP14HumanHair_emofringe bodyPart: Hair @@ -477,7 +477,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: emofringe - + - type: marking id: CP14HumanHair_f bodyPart: Hair @@ -485,7 +485,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: f - + - type: marking id: CP14HumanHair_father bodyPart: Hair @@ -493,7 +493,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: father - + - type: marking id: CP14HumanHair_feather bodyPart: Hair @@ -501,7 +501,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: feather - + - type: marking id: CP14HumanHair_flair bodyPart: Hair @@ -509,7 +509,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: flair - + - type: marking id: CP14HumanHair_floorlength_bedhead bodyPart: Hair @@ -517,7 +517,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: floorlength_bedhead - + - type: marking id: CP14HumanHair_fringetail bodyPart: Hair @@ -525,7 +525,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: fringetail - + - type: marking id: CP14HumanHair_gelled bodyPart: Hair @@ -533,7 +533,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: gelled - + - type: marking id: CP14HumanHair_gentle bodyPart: Hair @@ -541,7 +541,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: gentle - + - type: marking id: CP14HumanHair_halfbang bodyPart: Hair @@ -549,7 +549,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: halfbang - + - type: marking id: CP14HumanHair_halfbang2 bodyPart: Hair @@ -557,7 +557,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: halfbang2 - + - type: marking id: CP14HumanHair_halfshaved bodyPart: Hair @@ -565,7 +565,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: halfshaved - + - type: marking id: CP14HumanHair_hbraid bodyPart: Hair @@ -573,7 +573,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: hbraid - + - type: marking id: CP14HumanHair_hedgehog bodyPart: Hair @@ -581,7 +581,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: hedgehog - + - type: marking id: CP14HumanHair_highponytail bodyPart: Hair @@ -589,7 +589,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: highponytail - + - type: marking id: CP14HumanHair_himecut bodyPart: Hair @@ -597,7 +597,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: himecut - + - type: marking id: CP14HumanHair_himecut2 bodyPart: Hair @@ -605,7 +605,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: himecut2 - + - type: marking id: CP14HumanHair_himeup bodyPart: Hair @@ -613,7 +613,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: himeup - + - type: marking id: CP14HumanHair_hitop bodyPart: Hair @@ -621,7 +621,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: hitop - + - type: marking id: CP14HumanHair_jade bodyPart: Hair @@ -629,7 +629,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: jade - + - type: marking id: CP14HumanHair_jensen bodyPart: Hair @@ -637,7 +637,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: jensen - + - type: marking id: CP14HumanHair_joestar bodyPart: Hair @@ -645,7 +645,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: joestar - + - type: marking id: CP14HumanHair_kagami bodyPart: Hair @@ -653,7 +653,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: kagami - + - type: marking id: CP14HumanHair_keanu bodyPart: Hair @@ -661,7 +661,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: keanu - + - type: marking id: CP14HumanHair_kusanagi bodyPart: Hair @@ -669,7 +669,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: kusanagi - + - type: marking id: CP14HumanHair_largebun bodyPart: Hair @@ -677,7 +677,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: largebun - + - type: marking id: CP14HumanHair_lbangs bodyPart: Hair @@ -685,7 +685,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: lbangs - + - type: marking id: CP14HumanHair_long bodyPart: Hair @@ -693,7 +693,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: long - + - type: marking id: CP14HumanHair_long_bedhead bodyPart: Hair @@ -701,7 +701,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: long_bedhead - + - type: marking id: CP14HumanHair_long2 bodyPart: Hair @@ -709,7 +709,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: long2 - + - type: marking id: CP14HumanHair_long3 bodyPart: Hair @@ -717,7 +717,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: long3 - + - type: marking id: CP14HumanHair_longbow bodyPart: Hair @@ -725,7 +725,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: longbow - + - type: marking id: CP14HumanHair_longbundled bodyPart: Hair @@ -733,7 +733,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: longbundled - + - type: marking id: CP14HumanHair_longemo bodyPart: Hair @@ -741,7 +741,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: longemo - + - type: marking id: CP14HumanHair_longfringe bodyPart: Hair @@ -749,7 +749,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: longfringe - + - type: marking id: CP14HumanHair_longovereye bodyPart: Hair @@ -757,7 +757,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: longovereye - + - type: marking id: CP14HumanHair_longsidepart bodyPart: Hair @@ -765,7 +765,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: longsidepart - + - type: marking id: CP14HumanHair_longstraightponytail bodyPart: Hair @@ -773,7 +773,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: longstraightponytail - + - type: marking id: CP14HumanHair_manbun bodyPart: Hair @@ -781,7 +781,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: manbun - + - type: marking id: CP14HumanHair_maxy_shagy bodyPart: Hair @@ -789,7 +789,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: maxy_shagy - + - type: marking id: CP14HumanHair_messy bodyPart: Hair @@ -797,7 +797,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: messy - + - type: marking id: CP14HumanHair_modern bodyPart: Hair @@ -805,7 +805,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: modern - + - type: marking id: CP14HumanHair_nitori bodyPart: Hair @@ -813,7 +813,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: nitori - + - type: marking id: CP14HumanHair_odango bodyPart: Hair @@ -821,7 +821,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: odango - + - type: marking id: CP14HumanHair_ombre bodyPart: Hair @@ -829,7 +829,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: ombre - + - type: marking id: CP14HumanHair_oneshoulder bodyPart: Hair @@ -837,7 +837,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: oneshoulder - + - type: marking id: CP14HumanHair_oxton bodyPart: Hair @@ -845,7 +845,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: oxton - + - type: marking id: CP14HumanHair_part bodyPart: Hair @@ -853,7 +853,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: part - + - type: marking id: CP14HumanHair_parted bodyPart: Hair @@ -861,7 +861,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: parted - + - type: marking id: CP14HumanHair_pigtails bodyPart: Hair @@ -869,7 +869,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: pigtails - + - type: marking id: CP14HumanHair_pigtails2 bodyPart: Hair @@ -877,7 +877,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: pigtails2 - + - type: marking id: CP14HumanHair_pixie bodyPart: Hair @@ -885,7 +885,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: pixie - + - type: marking id: CP14HumanHair_ponytail bodyPart: Hair @@ -893,7 +893,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: ponytail - + - type: marking id: CP14HumanHair_ponytail2 bodyPart: Hair @@ -901,7 +901,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: ponytail2 - + - type: marking id: CP14HumanHair_ponytail3 bodyPart: Hair @@ -909,7 +909,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: ponytail3 - + - type: marking id: CP14HumanHair_ponytail4 bodyPart: Hair @@ -917,7 +917,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: ponytail4 - + - type: marking id: CP14HumanHair_ponytail5 bodyPart: Hair @@ -925,7 +925,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: ponytail5 - + - type: marking id: CP14HumanHair_ponytail6 bodyPart: Hair @@ -933,7 +933,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: ponytail6 - + - type: marking id: CP14HumanHair_ponytail7 bodyPart: Hair @@ -941,7 +941,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: ponytail7 - + - type: marking id: CP14HumanHair_protagonist bodyPart: Hair @@ -949,7 +949,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: protagonist - + - type: marking id: CP14HumanHair_Pulato bodyPart: Hair @@ -957,7 +957,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: pulato - + - type: marking id: CP14HumanHair_quiff bodyPart: Hair @@ -965,7 +965,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: quiff - + - type: marking id: CP14HumanHair_reversemohawk bodyPart: Hair @@ -973,7 +973,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: reversemohawk - + - type: marking id: CP14HumanHair_ronin bodyPart: Hair @@ -981,7 +981,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: ronin - + - type: marking id: CP14HumanHair_rosa bodyPart: Hair @@ -989,7 +989,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: rosa - + - type: marking id: CP14HumanHair_shaped bodyPart: Hair @@ -997,7 +997,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: shaped - + - type: marking id: CP14HumanHair_shortbangs bodyPart: Hair @@ -1005,7 +1005,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: shortbangs - + - type: marking id: CP14HumanHair_shortbraid bodyPart: Hair @@ -1013,7 +1013,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: shortbraid - + - type: marking id: CP14HumanHair_shorthair2 bodyPart: Hair @@ -1021,7 +1021,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: shorthair2 - + - type: marking id: CP14HumanHair_shorthair3 bodyPart: Hair @@ -1029,7 +1029,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: shorthair3 - + - type: marking id: CP14HumanHair_shorthairg bodyPart: Hair @@ -1037,7 +1037,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: shorthairg - + - type: marking id: CP14HumanHair_shorthime bodyPart: Hair @@ -1045,7 +1045,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: shorthime - + - type: marking id: CP14HumanHair_shortovereye bodyPart: Hair @@ -1053,7 +1053,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: shortovereye - + - type: marking id: CP14HumanHair_shoulderlengthovereye bodyPart: Hair @@ -1061,7 +1061,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: shoulderlengthovereye - + - type: marking id: CP14HumanHair_sidecut bodyPart: Hair @@ -1069,7 +1069,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: sidecut - + - type: marking id: CP14HumanHair_sidetail bodyPart: Hair @@ -1077,7 +1077,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: sidetail - + - type: marking id: CP14HumanHair_sidetail2 bodyPart: Hair @@ -1085,7 +1085,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: sidetail2 - + - type: marking id: CP14HumanHair_sidetail4 bodyPart: Hair @@ -1093,7 +1093,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: sidetail4 - + - type: marking id: CP14HumanHair_skinhead bodyPart: Hair @@ -1101,7 +1101,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: skinhead - + - type: marking id: CP14HumanHair_spiky bodyPart: Hair @@ -1109,7 +1109,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: spiky - + - type: marking id: CP14HumanHair_spiky2 bodyPart: Hair @@ -1117,7 +1117,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: spiky2 - + - type: marking id: CP14HumanHair_spikyponytail bodyPart: Hair @@ -1125,7 +1125,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: spikyponytail - + - type: marking id: CP14HumanHair_stail bodyPart: Hair @@ -1133,7 +1133,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: stail - + - type: marking id: CP14HumanHair_swept bodyPart: Hair @@ -1141,7 +1141,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: swept - + - type: marking id: CP14HumanHair_swept2 bodyPart: Hair @@ -1149,7 +1149,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: swept2 - + - type: marking id: CP14HumanHair_tressshoulder bodyPart: Hair @@ -1157,7 +1157,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: tressshoulder - + - type: marking id: CP14HumanHair_twintail bodyPart: Hair @@ -1165,7 +1165,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: twintail - + - type: marking id: CP14HumanHair_undercutright bodyPart: Hair @@ -1173,7 +1173,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: undercutright - + - type: marking id: CP14HumanHair_uneven bodyPart: Hair @@ -1181,7 +1181,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: uneven - + - type: marking id: CP14HumanHair_twostrands bodyPart: Hair @@ -1189,7 +1189,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: twostrands - + - type: marking id: CP14HumanHair_unkept bodyPart: Hair @@ -1197,7 +1197,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: unkept - + - type: marking id: CP14HumanHair_Updo bodyPart: Hair @@ -1205,7 +1205,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: updo - + - type: marking id: CP14HumanHair_VLongFringe bodyPart: Hair @@ -1213,7 +1213,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: vlongfringe - + - type: marking id: CP14HumanHair_Volaju bodyPart: Hair @@ -1221,7 +1221,7 @@ sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi state: volaju - + - type: marking id: CP14HumanHair_Wisp bodyPart: Hair diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/silva_body_bark.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/silva_body_bark.yml index 29ad0f5d44..9e7658a50e 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/silva_body_bark.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/silva_body_bark.yml @@ -3,7 +3,7 @@ bodyPart: Tail markingCategory: Tail speciesRestriction: [ CP14Silva ] - coloring: + coloring: default: type: !type:SimpleColoring @@ -17,7 +17,7 @@ bodyPart: Tail markingCategory: Tail speciesRestriction: [ CP14Silva ] - coloring: + coloring: default: type: !type:SimpleColoring @@ -31,7 +31,7 @@ bodyPart: Tail markingCategory: Tail speciesRestriction: [ CP14Silva ] - coloring: + coloring: default: type: !type:SimpleColoring @@ -45,7 +45,7 @@ bodyPart: Tail markingCategory: Tail speciesRestriction: [ CP14Silva ] - coloring: + coloring: default: type: !type:SimpleColoring @@ -59,7 +59,7 @@ bodyPart: Tail markingCategory: Tail speciesRestriction: [ CP14Silva ] - coloring: + coloring: default: type: !type:SimpleColoring @@ -73,7 +73,7 @@ bodyPart: Tail markingCategory: Tail speciesRestriction: [ CP14Silva ] - coloring: + coloring: default: type: !type:SimpleColoring diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/silva_head_bark.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/silva_head_bark.yml index ac4537d7da..d4ae2be24a 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/silva_head_bark.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/silva_head_bark.yml @@ -3,7 +3,7 @@ bodyPart: HeadTop markingCategory: HeadTop speciesRestriction: [ CP14Silva ] - coloring: + coloring: default: type: !type:SimpleColoring @@ -17,7 +17,7 @@ bodyPart: HeadTop markingCategory: HeadTop speciesRestriction: [ CP14Silva ] - coloring: + coloring: default: type: !type:SimpleColoring @@ -31,7 +31,7 @@ bodyPart: HeadTop markingCategory: HeadTop speciesRestriction: [ CP14Silva ] - coloring: + coloring: default: type: !type:SimpleColoring @@ -45,7 +45,7 @@ bodyPart: HeadTop markingCategory: HeadTop speciesRestriction: [ CP14Silva ] - coloring: + coloring: default: type: !type:SimpleColoring @@ -59,7 +59,7 @@ bodyPart: HeadTop markingCategory: HeadTop speciesRestriction: [ CP14Silva ] - coloring: + coloring: default: type: !type:SimpleColoring @@ -73,7 +73,7 @@ bodyPart: HeadTop markingCategory: HeadTop speciesRestriction: [ CP14Silva ] - coloring: + coloring: default: type: !type:SimpleColoring @@ -87,7 +87,7 @@ bodyPart: HeadTop markingCategory: HeadTop speciesRestriction: [ CP14Silva ] - coloring: + coloring: default: type: !type:SimpleColoring @@ -101,7 +101,7 @@ bodyPart: HeadTop markingCategory: HeadTop speciesRestriction: [ CP14Silva ] - coloring: + coloring: default: type: !type:SimpleColoring @@ -115,7 +115,7 @@ bodyPart: HeadTop markingCategory: HeadTop speciesRestriction: [ CP14Silva ] - coloring: + coloring: default: type: !type:SimpleColoring diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/ice.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/ice.yml index e6273e1723..1bcdde2e3f 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/ice.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/ice.yml @@ -77,7 +77,7 @@ - id: CP14Snowball - id: CP14CopperCoin1 - id: CP14ModularInlayQuartzWater - + - type: entity id: CP14AreaEntityEffectSlimeFroze parent: CP14BaseMagicImpact diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/ice_ghost.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/ice_ghost.yml index ef878c33c1..9fc9b45a72 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/ice_ghost.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/ice_ghost.yml @@ -1,6 +1,6 @@ - type: entity id: CP14MobIceSpectre - parent: + parent: - BaseMob - MobCombat categories: [ ForkFiltered ] @@ -27,7 +27,7 @@ mask: - FlyingMobMask layer: - - FlyingMobLayer + - FlyingMobLayer - Opaque - type: NPCUseActionOnTarget actionId: CP14ActionSpellIceShardsGhost diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/zombie.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/zombie.yml index 8817bf4134..2e80608c9f 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/zombie.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/zombie.yml @@ -27,7 +27,7 @@ suffix: Zombie. Easy categories: [ HideSpawnMenu ] components: - - type: Loadout + - type: Loadout prototypes: [ CP14MobUndeadEasy1 ] - type: entity diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/Skeletons/T1.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/Skeletons/T1.yml index 8d4648e09e..1f48e45258 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/Skeletons/T1.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/Skeletons/T1.yml @@ -1,5 +1,5 @@ -- type: entity - id: CP14MobUndeadSkeletonDemiplaneT1 +- type: entity + id: CP14MobUndeadSkeletonDemiplaneT1 parent: CP14BaseMobSkeleton name: skeleton abstract: true diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Player/TownRaids/undead.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Player/TownRaids/undead.yml index d8089c63a9..5294cc850d 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Player/TownRaids/undead.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Player/TownRaids/undead.yml @@ -22,7 +22,7 @@ - sprite: _CP14/Mobs/Species/Skeleton/parts.rsi state: full -# Easy +# Easy - type: entity id: CP14MobUndeadSkeletonWizardTownRaid diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Player/tiefling.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Player/tiefling.yml index 76ff0845ac..eaca1aa1ff 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Player/tiefling.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Player/tiefling.yml @@ -2,4 +2,3 @@ save: false parent: CP14BaseMobTiefling id: CP14MobTiefling - \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/pen.yml b/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/pen.yml index a64ce5892a..88082d2a06 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/pen.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/pen.yml @@ -18,7 +18,7 @@ - Pen - CP14InkwellFittable - type: CP14PersonalSignature - signSound: + signSound: collection: PaperScribbles params: variation: 0.1 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/egg.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/egg.yml index 40706d2da3..4404914210 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/egg.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/egg.yml @@ -8,7 +8,7 @@ categories: [ ForkFiltered ] components: - type: Food - trash: + trash: - CP14Eggshells - type: Sprite sprite: _CP14/Objects/Consumable/Food/egg.rsi diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Economy/coins.yml b/Resources/Prototypes/_CP14/Entities/Objects/Economy/coins.yml index f2f5c83b52..c6c873a42d 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Economy/coins.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Economy/coins.yml @@ -29,7 +29,7 @@ - type: CP14CurrencyExaminable - type: EmitSoundOnLand sound: - path: /Audio/_CP14/Items/coins_fall.ogg + path: /Audio/_CP14/Items/coins_fall.ogg - type: EmitSoundOnDrop sound: collection: CP14Coins diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Economy/trade_contracts.yml b/Resources/Prototypes/_CP14/Entities/Objects/Economy/trade_contracts.yml index 34962fba6c..a3b413f726 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Economy/trade_contracts.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Economy/trade_contracts.yml @@ -25,7 +25,7 @@ components: - type: Sprite state: victoria_garden - - type: CP14TradingContract + - type: CP14TradingContract faction: VictoriaGardens - type: entity @@ -36,5 +36,5 @@ components: - type: Sprite state: brad_potions - - type: CP14TradingContract + - type: CP14TradingContract faction: BradPotions \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml b/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml index dbb25e079a..dc611cb267 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml @@ -156,12 +156,12 @@ currentTemperature: 290 - type: InternalTemperature thickness: 0.02 - area: 0.02 + area: 0.02 - type: CP14TemperatureTransformation entries: - temperatureRange: 400, 500 transformTo: CP14GroundSage - + - type: entity id: CP14LumiMushroom @@ -207,7 +207,7 @@ parent: CP14WildProduceBase name: blue Amanita description: A sky blue flower known for its medicinal and magical properties. - components: + components: - type: Sprite sprite: _CP14/Objects/Flora/Wild/blue_amanita.rsi layers: @@ -234,7 +234,7 @@ tags: - CP14FitInMortar - CP14AlchemicalHerbals - + - type: entity id: CP14Dayflin parent: CP14WildProduceBase diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/alchemist.yml b/Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/alchemist.yml index 5f1510b293..e2d499dd73 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/alchemist.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/alchemist.yml @@ -5,7 +5,7 @@ components: - type: CP14AbstractKey group: Alchemist - + - type: entity parent: CP14KeyIronBlank id: CP14KeyAlchemy1 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/blacksmith.yml b/Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/blacksmith.yml index 3a5e25d0df..73aa4bbddb 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/blacksmith.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/blacksmith.yml @@ -5,7 +5,7 @@ components: - type: CP14AbstractKey group: Blacksmith - + - type: entity parent: CP14KeyIronBlank id: CP14KeyBlacksmith @@ -13,7 +13,7 @@ components: - type: CP14Key autoGenerateShape: Blacksmith1 - + - type: entity parent: CP14KeyIronBlank id: CP14KeyBlacksmith2 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/personalHouse.yml b/Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/personalHouse.yml index 9a11ed7d67..22bd189c9a 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/personalHouse.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/personalHouse.yml @@ -18,7 +18,7 @@ components: - type: CP14Key autoGenerateShape: PersonalHouse1 - + - type: entity parent: CP14KeyCopperBlank id: CP14KeyPersonalHouse2 @@ -26,7 +26,7 @@ components: - type: CP14Key autoGenerateShape: PersonalHouse2 - + - type: entity parent: CP14KeyCopperBlank id: CP14KeyPersonalHouse3 @@ -34,7 +34,7 @@ components: - type: CP14Key autoGenerateShape: PersonalHouse3 - + - type: entity parent: CP14KeyCopperBlank id: CP14KeyPersonalHouse4 @@ -42,7 +42,7 @@ components: - type: CP14Key autoGenerateShape: PersonalHouse4 - + - type: entity parent: CP14KeyCopperBlank id: CP14KeyPersonalHouse5 @@ -50,7 +50,7 @@ components: - type: CP14Key autoGenerateShape: PersonalHouse5 - + - type: entity parent: CP14KeyCopperBlank id: CP14KeyPersonalHouse6 @@ -58,7 +58,7 @@ components: - type: CP14Key autoGenerateShape: PersonalHouse6 - + - type: entity parent: CP14KeyCopperBlank id: CP14KeyPersonalHouse7 @@ -66,7 +66,7 @@ components: - type: CP14Key autoGenerateShape: PersonalHouse7 - + - type: entity parent: CP14KeyCopperBlank id: CP14KeyPersonalHouse8 @@ -74,7 +74,7 @@ components: - type: CP14Key autoGenerateShape: PersonalHouse8 - + - type: entity parent: CP14KeyCopperBlank id: CP14KeyPersonalHouse9 @@ -82,7 +82,7 @@ components: - type: CP14Key autoGenerateShape: PersonalHouse9 - + - type: entity parent: CP14KeyCopperBlank id: CP14KeyPersonalHouse10 @@ -90,7 +90,7 @@ components: - type: CP14Key autoGenerateShape: PersonalHouse10 - + - type: entity parent: CP14KeyCopperBlank id: CP14KeyPersonalHouse11 @@ -98,7 +98,7 @@ components: - type: CP14Key autoGenerateShape: PersonalHouse11 - + - type: entity parent: CP14KeyCopperBlank id: CP14KeyPersonalHouse12 @@ -106,7 +106,7 @@ components: - type: CP14Key autoGenerateShape: PersonalHouse12 - + - type: entity parent: CP14KeyCopperBlank id: CP14KeyPersonalHouse13 @@ -114,7 +114,7 @@ components: - type: CP14Key autoGenerateShape: PersonalHouse13 - + - type: entity parent: CP14KeyCopperBlank id: CP14KeyPersonalHouse14 @@ -122,7 +122,7 @@ components: - type: CP14Key autoGenerateShape: PersonalHouse14 - + - type: entity parent: CP14KeyCopperBlank id: CP14KeyPersonalHouse15 @@ -130,7 +130,7 @@ components: - type: CP14Key autoGenerateShape: PersonalHouse15 - + - type: entity parent: CP14KeyCopperBlank id: CP14KeyPersonalHouse16 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Keys/key.yml b/Resources/Prototypes/_CP14/Entities/Objects/Keys/key.yml index 15364ae3cf..18a21bb280 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Keys/key.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Keys/key.yml @@ -5,7 +5,7 @@ categories: [ ForkFiltered ] name: key description: A small, intricate piece of metal that opens some locks. Don't give it to anyone! - components: + components: - type: Tag tags: - CP14Key diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Keys/locks.yml b/Resources/Prototypes/_CP14/Entities/Objects/Keys/locks.yml index ebfa11359f..695d0a17e4 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Keys/locks.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Keys/locks.yml @@ -5,7 +5,7 @@ categories: [ ForkFiltered ] name: lock description: A small device customized only for a specific key shape. Attach it to doors or chests that have no lock and feel the spirit of security. - components: + components: - type: Item size: Tiny - type: Sprite diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml b/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml index 0b96f4bff0..31dd31ec6f 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml @@ -140,7 +140,7 @@ volume: 15 - type: Damageable - type: Destructible - thresholds: + thresholds: - trigger: !type:DamageTrigger damage: 1 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/rod.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/rod.yml index 1b05fbb1bf..9ce2d255b6 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/rod.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/rod.yml @@ -2,7 +2,7 @@ parent: CP14ModularGripBase id: CP14ModularRod abstract: true - description: A thin shaft of wood, the most important part of the future arrow. + description: A thin shaft of wood, the most important part of the future arrow. components: - type: CP14ModularCraftStartPoint startSlots: diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vial_bomb.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vial_bomb.yml index 7be3887f48..6d28c33821 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vial_bomb.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vial_bomb.yml @@ -3,7 +3,7 @@ parent: CP14VialSmall categories: [ ForkFiltered ] name: alchemical bomb - description: A vial of liquid that explodes with an alchemical reagent cloud when thrown. + description: A vial of liquid that explodes with an alchemical reagent cloud when thrown. components: - type: Spillable solution: none #Disable spillable diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials.yml index 40c1023b4b..dc4feebab2 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials.yml @@ -117,7 +117,7 @@ types: Blunt: 5 -# Vials +# Vials - type: entity id: CP14VialTiny diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/tools.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/tools.yml index ddcf8cefe7..a55284e27a 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/tools.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/tools.yml @@ -9,11 +9,11 @@ sprite: _CP14/Objects/Specific/Thaumaturgy/ritual_chalk.rsi state: icon - type: Item - sprite: _CP14/Objects/Specific/Thaumaturgy/ritual_chalk.rsi + sprite: _CP14/Objects/Specific/Thaumaturgy/ritual_chalk.rsi - type: entity id: CP14ManaOperationGlove - parent: + parent: - BaseItem - CP14BaseWeaponLight - CP14BaseWeaponShort @@ -29,7 +29,7 @@ shape: - 0,0,0,1 storedRotation: -45 - sprite: _CP14/Objects/Specific/Thaumaturgy/powerline_gauntlet.rsi + sprite: _CP14/Objects/Specific/Thaumaturgy/powerline_gauntlet.rsi - type: CP14MagicEnergyContainer magicAlert: CP14MagicEnergy maxEnergy: 50 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Tools/bucket.yml b/Resources/Prototypes/_CP14/Entities/Objects/Tools/bucket.yml index c6bc189411..d61d249a49 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Tools/bucket.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Tools/bucket.yml @@ -4,7 +4,7 @@ name: bucket description: It's a boring old bucket. categories: [ ForkFiltered ] - components: + components: - type: Drink solution: bucket ignoreEmpty: true diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Tools/flashlight.yml b/Resources/Prototypes/_CP14/Entities/Objects/Tools/flashlight.yml index 792f94b753..34f9be477a 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Tools/flashlight.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Tools/flashlight.yml @@ -1,5 +1,5 @@ - type: entity - parent: + parent: - BaseItem - CP14BaseCrystalSlot id: CP14CrystalLamp @@ -63,11 +63,11 @@ - type: ItemSlots slots: crystal_slot: - insertSound: + insertSound: path: /Audio/_CP14/Items/crystal_insert.ogg params: variation: 0.05 - ejectSound: + ejectSound: path: /Audio/_CP14/Items/crystal_eject.ogg params: variation: 0.05 @@ -76,7 +76,7 @@ whitelist: components: - CP14MagicEnergyCrystal - + - type: entity parent: CP14CrystalLamp id: CP14CrystalLampBlueEmpty diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Tools/torch.yml b/Resources/Prototypes/_CP14/Entities/Objects/Tools/torch.yml index d46d2b3f15..2261c4a623 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Tools/torch.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Tools/torch.yml @@ -1,6 +1,6 @@ - type: entity id: CP14Torch - parent: + parent: - BaseItem - CP14BaseTorch name: torch diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/janitor.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/janitor.yml index 7545040be3..05a4f10b12 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/janitor.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/janitor.yml @@ -1,6 +1,6 @@ - type: entity id: CP14BaseMop - parent: + parent: - BaseItem - CP14BaseWeaponDestructible name: wooden mop diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/wrench.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/wrench.yml index 1e76c34af2..185c24155b 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/wrench.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/wrench.yml @@ -31,4 +31,4 @@ - Anchoring useSound: path: /Audio/Items/ratchet.ogg - + diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/shield.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/shield.yml index 47c62dcf82..24f3f466ef 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/shield.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/shield.yml @@ -1,6 +1,6 @@ - type: entity id: CP14BaseShield - parent: + parent: - BaseItem - CP14BaseWeaponLight - CP14BaseWeaponThrowable diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/rapier.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/rapier.yml index d441bb905e..e8c855b04e 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/rapier.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/rapier.yml @@ -17,7 +17,7 @@ id: CP14ModularGuildmasterRapier parent: CP14ModularGripGuildmaster name: guildmaster's personal rapier - description: A personal weapon issued to each guildmaster. Combines reliability and killing power. + description: A personal weapon issued to each guildmaster. Combines reliability and killing power. components: - type: Sprite layers: diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/bow.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/bow.yml index 0d6618dc10..630dd6ddd7 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/bow.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/bow.yml @@ -81,7 +81,7 @@ - type: entity name: ice bow - description: A magic bow that needs no ammunition. + description: A magic bow that needs no ammunition. id: CP14BowIceArtifact parent: CP14BowCombat categories: [ DoNotMap ] diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Decorations/garland.yml b/Resources/Prototypes/_CP14/Entities/Structures/Decorations/garland.yml index 5694ba8efb..8c10ccba5f 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Decorations/garland.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Decorations/garland.yml @@ -100,4 +100,3 @@ color: "#5eabeb" - type: PointLight color: "#5eabeb" - \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/alchemist.yml b/Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/alchemist.yml index 5fc611ced8..18e9f5a36e 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/alchemist.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/alchemist.yml @@ -11,7 +11,7 @@ locked: true - type: entity - parent: + parent: - CP14WoodenDoorAlchemy1 - CP14WoodenDoorMirrored id: CP14WoodenDoorAlchemyMirrored1 @@ -28,7 +28,7 @@ locked: true - type: entity - parent: + parent: - CP14WoodenDoorAlchemy2 - CP14WoodenDoorMirrored id: CP14WoodenDoorAlchemyMirrored2 @@ -45,7 +45,7 @@ locked: true - type: entity - parent: + parent: - CP14WoodenDoorAlchemy3 - CP14WoodenDoorMirrored id: CP14WoodenDoorAlchemyMirrored3 diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/blacksmith.yml b/Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/blacksmith.yml index 01ab67b6a2..4db03a13d3 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/blacksmith.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/blacksmith.yml @@ -9,7 +9,7 @@ locked: true - type: entity - parent: + parent: - CP14IronDoorBlacksmith1 - CP14IronDoorMirrored id: CP14IronDoorMirroredBlacksmith1 @@ -26,7 +26,7 @@ locked: true - type: entity - parent: + parent: - CP14IronDoorBlacksmith2 - CP14IronDoorMirrored id: CP14IronDoorMirroredBlacksmith2 @@ -43,7 +43,7 @@ locked: true - type: entity - parent: + parent: - CP14IronDoorBlacksmith3 - CP14IronDoorMirrored id: CP14IronDoorMirroredBlacksmith3 diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/merchant.yml b/Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/merchant.yml index 12785b36fb..72f51604da 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/merchant.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/merchant.yml @@ -11,7 +11,7 @@ locked: true - type: entity - parent: + parent: - CP14WoodenDoorMerchantShop1 - CP14WoodenDoorMirrored id: CP14WoodenDoorMerchantShopMirrored1 @@ -28,7 +28,7 @@ locked: true - type: entity - parent: + parent: - CP14WoodenDoorMerchantShop2 - CP14WoodenDoorMirrored id: CP14WoodenDoorMerchantShopMirrored2 @@ -45,7 +45,7 @@ locked: true - type: entity - parent: + parent: - CP14WoodenDoorMerchantShop3 - CP14WoodenDoorMirrored id: CP14WoodenDoorMerchantShopMirrored3 diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/tavern.yml b/Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/tavern.yml index af069702c3..126878eb0b 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/tavern.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/tavern.yml @@ -11,7 +11,7 @@ locked: true - type: entity - parent: + parent: - CP14WoodenDoorTavernStaff - CP14WoodenDoorMirrored id: CP14WoodenDoorTavernStaffMirrored @@ -80,7 +80,7 @@ locked: true - type: entity - parent: + parent: - CP14WoodenDoorWindowedTavernHall - CP14WoodenDoorWindowedMirrored id: CP14WoodenDoorTavernHallMirrored diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Doors/wooden_doors.yml b/Resources/Prototypes/_CP14/Entities/Structures/Doors/wooden_doors.yml index 49c07b221b..e031cb1d60 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Doors/wooden_doors.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Doors/wooden_doors.yml @@ -1,6 +1,6 @@ - type: entity id: CP14WoodenDoor - parent: + parent: - CP14BaseDoor - CP14BaseFlammableSpreading name: wooden door diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Doors/wooden_doors_windowed.yml b/Resources/Prototypes/_CP14/Entities/Structures/Doors/wooden_doors_windowed.yml index eddb76713d..6acee9e9ce 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Doors/wooden_doors_windowed.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Doors/wooden_doors_windowed.yml @@ -1,6 +1,6 @@ - type: entity id: CP14WoodenDoorWindowed - parent: + parent: - CP14BaseDoor - CP14BaseFlammableSpreading name: wooden windowed door diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Fence/big_fence.yml b/Resources/Prototypes/_CP14/Entities/Structures/Fence/big_fence.yml index b74752ee4a..767518bbea 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Fence/big_fence.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Fence/big_fence.yml @@ -46,7 +46,7 @@ - CP14wall - type: entity - parent: + parent: - CP14BaseFenceBig - CP14BaseFlammableSpreading id: CP14FenceBigWooden @@ -89,7 +89,7 @@ - type: entity parent: CP14BaseFenceBig id: CP14FenceBigIron - suffix: Iron + suffix: Iron components: - type: Sprite sprite: _CP14/Structures/Fence/iron_big.rsi diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Fence/big_gate.yml b/Resources/Prototypes/_CP14/Entities/Structures/Fence/big_gate.yml index 671cfcc5d4..7f84d6800b 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Fence/big_gate.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Fence/big_gate.yml @@ -48,7 +48,7 @@ - type: CP14Lock #Empty, for installing new locks - type: entity - parent: + parent: - CP14BaseFenceGateBig - CP14BaseFlammableSpreading id: CP14FenceGateBigWooden @@ -89,7 +89,7 @@ sprite: _CP14/Structures/Fence/wooden_birch_big.rsi - type: entity - parent: + parent: - CP14BaseFenceGateBig id: CP14FenceGateBigIron suffix: Iron diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Fence/cliffs.yml b/Resources/Prototypes/_CP14/Entities/Structures/Fence/cliffs.yml index 6752fed0b1..b50b576ab0 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Fence/cliffs.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Fence/cliffs.yml @@ -97,7 +97,7 @@ - type: Icon sprite: _CP14/Structures/Fences/cliff_dirt.rsi state: end_left - + - type: entity parent: CP14Cliff id: CP14CliffEndRight diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Fence/fence.yml b/Resources/Prototypes/_CP14/Entities/Structures/Fence/fence.yml index 4522ee698a..acef14a010 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Fence/fence.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Fence/fence.yml @@ -44,7 +44,7 @@ delay: 2.5 - type: entity - parent: + parent: - CP14BaseFence - CP14BaseFlammableSpreading id: CP14FenceWooden diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Fence/gate.yml b/Resources/Prototypes/_CP14/Entities/Structures/Fence/gate.yml index 4194c790c5..a0ee53c55e 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Fence/gate.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Fence/gate.yml @@ -48,7 +48,7 @@ - type: CP14Lock #Empty, for installing new locks - type: entity - parent: + parent: - CP14BaseFenceGate - CP14BaseFlammableSpreading id: CP14FenceGateWooden diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Fence/window.yml b/Resources/Prototypes/_CP14/Entities/Structures/Fence/window.yml index 22d4a5dcfa..841d1f5ed2 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Fence/window.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Fence/window.yml @@ -46,7 +46,7 @@ - type: entity parent: CP14BaseFenceWindow id: CP14FenceWindowIron - suffix: Iron + suffix: Iron components: - type: Sprite sprite: _CP14/Structures/Fence/iron_window.rsi diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Crystal/elemental.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Crystal/elemental.yml index 79aa6da757..820daf43ec 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Crystal/elemental.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Crystal/elemental.yml @@ -3,7 +3,7 @@ abstract: true parent: BaseRock name: quartz - description: Natural quartz crystals that can absorb the magical energy of the world around them. + description: Natural quartz crystals that can absorb the magical energy of the world around them. categories: [ ForkFiltered ] components: - type: Sprite @@ -22,7 +22,7 @@ collection: CP14CrystalDings params: variation: 0.03 - - type: Damageable + - type: Damageable damageContainer: Inorganic damageModifierSet: Glass - type: MeleeSound diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Wild/water_lilies.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Wild/water_lilies.yml index cb7e1c5508..cd9b95c9b3 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Wild/water_lilies.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Wild/water_lilies.yml @@ -74,7 +74,7 @@ - type: entity id: CP14GatherableWaterAirLily - parent: + parent: - CP14GatherableBase - CP14WaterLilies name: air lily @@ -145,5 +145,4 @@ big8: "" - type: CP14WaveShader speed: 2.5 - dis: 3 - \ No newline at end of file + dis: 3 diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/base.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/base.yml index 20c4262922..d4675accfa 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/base.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/base.yml @@ -56,7 +56,7 @@ !type:PhysShapeAabb bounds: "-0.35,-0.35,0.35,0.35" mask: - - FullTileMask + - FullTileMask layer: - Opaque - type: CP14PlantGatherable @@ -93,7 +93,7 @@ delay: 1.5 - type: CP14WeatherRefillable solution: plant - - type: RefillableSolution + - type: RefillableSolution solution: plant maxRefill: 50 - type: ExaminableSolution diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/beds.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/beds.yml index 598d41451d..ce67609f49 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/beds.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/beds.yml @@ -1,7 +1,7 @@ - type: entity name: wooden bed id: CP14WoodenBed - parent: + parent: - BaseStructure - CP14BaseFlammableSpreading description: Wooden bed. Better than nothing. diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/bench.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/bench.yml index ca100c098b..efb7edb8b6 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/bench.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/bench.yml @@ -1,7 +1,7 @@ - type: entity name: wood bench id: CP14BenchWood - parent: + parent: - SeatBase - CP14BaseFlammable description: A bench carved from wood, a comfortable part of the interior designed for sitting and relaxing. diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/bookshelf.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/bookshelf.yml index 8326d06ec7..32271aadde 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/bookshelf.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/bookshelf.yml @@ -1,7 +1,7 @@ - type: entity id: CP14BookshelfWooden categories: [ ForkFiltered ] - parent: + parent: - BaseStructureDynamic - CP14BaseFlammable name: wooden bookshelf diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/chairs.yml index 36906ed4e5..b860cc25e1 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/chairs.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/chairs.yml @@ -1,9 +1,9 @@ - type: entity name: wooden chair - description: Made of the most common planks. Simple and effective! + description: Made of the most common planks. Simple and effective! id: CP14ChairWooden categories: [ ForkFiltered ] - parent: + parent: - UnanchoredChairBase - CP14BaseFlammable components: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/curtains.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/curtains.yml index 1172f6193a..67da0baa43 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/curtains.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/curtains.yml @@ -21,7 +21,7 @@ bounds: "-0.49,0.3,0.49,0.49" density: 100 mask: - - FullTileMask + - FullTileMask layer: - Opaque - type: Door diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/glass_showcase.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/glass_showcase.yml index f1fcd5b6b9..25ac122d5f 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/glass_showcase.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/glass_showcase.yml @@ -57,7 +57,7 @@ CP14GlassShard: min: 1 max: 2 - - !type:DoActsBehavior + - !type:DoActsBehavior acts: [ "Destruction" ] - type: ContainerContainer containers: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/lamppost.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/lamppost.yml index f3fa5a37cc..7085236664 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/lamppost.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/lamppost.yml @@ -76,7 +76,7 @@ parent: CP14BaseLamppost id: CP14Lamppost name: lamppost - description: A lantern hanging from a pole. + description: A lantern hanging from a pole. suffix: Always powered components: - type: Sprite @@ -91,7 +91,7 @@ parent: CP14BaseLamppost id: CP14LamppostBlue name: lamppost - description: A lantern hanging from a pole. + description: A lantern hanging from a pole. suffix: Always powered, Blue components: - type: Sprite diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/mannequin.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/mannequin.yml index 1edeeac536..2e61a6dc00 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/mannequin.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/mannequin.yml @@ -1,7 +1,7 @@ - type: entity id: CP14Mannequin categories: [ ForkFiltered ] - parent: + parent: - Mannequin - CP14BaseFlammable name: mannequin diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/pallets.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/pallets.yml index 238781943f..62208591dc 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/pallets.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/pallets.yml @@ -18,7 +18,7 @@ - type: entity id: CP14WoodenPallet - parent: + parent: - CP14BasePallets - CP14BaseFlammable name: wooden pallet @@ -74,4 +74,3 @@ layers: - state: wooden - state: buy - \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/target.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/target.yml index d1591824df..38fc20c5bf 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/target.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/target.yml @@ -1,6 +1,6 @@ - type: entity id: CP14Target - parent: + parent: - BaseStructureDynamic - CP14BaseFlammable name: target @@ -71,7 +71,7 @@ - type: entity id: CP14TargetStake - parent: + parent: - BaseStructureDynamic - CP14BaseFlammable name: target stake diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/torch.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/torch.yml index fd413a0488..12370f7716 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/torch.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/torch.yml @@ -46,7 +46,7 @@ - type: entity id: CP14FloorTorch - parent: + parent: - CP14BaseTorch - BaseStructure name: floor torch diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount.yml index c26bbf4e14..5d1bce8efb 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount.yml @@ -38,7 +38,7 @@ maxItemSize: Normal ## whitelist: TODO ## tags: -## - CP14Bottles +## - CP14Bottles - type: UserInterface interfaces: enum.StorageUiKey.Key: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount_lamp.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount_lamp.yml index 12d673a6da..3e1cbe01d9 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount_lamp.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount_lamp.yml @@ -2,10 +2,10 @@ id: CP14WallmountLampEmpty name: crystal wall lamp suffix: Empty - parent: + parent: - CP14BaseWallmount - CP14BaseCrystalSlot - description: A simple wallmount magical device that converts crystal energy into bright light. + description: A simple wallmount magical device that converts crystal energy into bright light. components: - type: Sprite sprite: _CP14/Structures/Wallmount/wallmount_lamp.rsi @@ -76,11 +76,11 @@ slots: crystal_slot: startingItem: CP14EnergyCrystalMedium - insertSound: + insertSound: path: /Audio/_CP14/Items/crystal_insert.ogg params: variation: 0.05 - ejectSound: + ejectSound: path: /Audio/_CP14/Items/crystal_eject.ogg params: variation: 0.05 diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount_order_border.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount_order_border.yml index fc50edebc7..3e8c0971ae 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount_order_border.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount_order_border.yml @@ -1,6 +1,6 @@ - type: entity id: CP14WallmountOrdersBorder - parent: + parent: - CP14BaseWallmount - CP14BaseFlammableSpreading name: orders board diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Roof/base.yml b/Resources/Prototypes/_CP14/Entities/Structures/Roof/base.yml index c535943cb5..f372a1f348 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Roof/base.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Roof/base.yml @@ -29,7 +29,7 @@ - type: SunShadowCast - type: entity - parent: + parent: - CP14BaseRoof - CP14BaseFlammableSpreading id: CP14RoofWooden @@ -63,7 +63,7 @@ node: CP14RoofWooden - type: entity - parent: + parent: - CP14BaseRoof id: CP14RoofStone name: stone roof @@ -93,7 +93,7 @@ node: CP14RoofStone - type: entity - parent: + parent: - CP14BaseRoof id: CP14RoofRemover name: roof remover debug @@ -104,4 +104,3 @@ sprite: _CP14/Structures/Roof/stone.rsi - type: TimedDespawn lifetime: 2 - \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/cleaner.yml b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/cleaner.yml index 88ca236dc2..13c8f4a74a 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/cleaner.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/cleaner.yml @@ -1,6 +1,6 @@ - type: entity id: CP14AlchemySolutionCleaner - parent: + parent: - BaseStructureDynamic - CP14BaseCrystalSlot name: solution cleaner diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/vat.yml b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/vat.yml index b1cc02f94a..007ba853c8 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/vat.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/vat.yml @@ -1,6 +1,6 @@ - type: entity id: CP14BaseVat - parent: + parent: - BaseStructureDynamic name: big vat description: A very large vat for storing huge amounts of liquid. Heavy, uncomfortable to carry. diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Blacksmith/furnace.yml b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Blacksmith/furnace.yml index 4780518eb4..1940ad2de5 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Blacksmith/furnace.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Blacksmith/furnace.yml @@ -38,4 +38,4 @@ craftSound: collection: CP14Sawing #TODO recipeTags: - - CP14RecipeMeltingFurnace \ No newline at end of file + - CP14RecipeMeltingFurnace \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Device/pressure_plate.yml b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Device/pressure_plate.yml index 0c32247658..177031ac7d 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Device/pressure_plate.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Device/pressure_plate.yml @@ -1,13 +1,13 @@ - type: entity id: CP14PressurePlateBase - abstract: true + abstract: true parent: BaseStructure placement: mode: SnapgridCenter categories: [ ForkFiltered ] name: pressure plate - description: This button can activate something! - components: + description: This button can activate something! + components: - type: Fixtures fixtures: slipFixture: @@ -21,7 +21,7 @@ hard: false - type: Physics bodyType: Static - - type: Sprite + - type: Sprite snapCardinals: true drawdepth: FloorObjects sprite: _CP14/Structures/Specific/Device/pressure_plate.rsi diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Device/wallmount_buttons.yml b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Device/wallmount_buttons.yml index d7074f7b7e..da71f264ee 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Device/wallmount_buttons.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Device/wallmount_buttons.yml @@ -5,7 +5,7 @@ - CP14BaseWallmount categories: [ ForkFiltered ] name: wall button - description: This button can activate something! + description: This button can activate something! components: - type: Sprite sprite: _CP14/Structures/Specific/Device/wallmount_buttons.rsi diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Thaumaturgy/essence_nodes.yml b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Thaumaturgy/essence_nodes.yml index 39cbe8f3cf..e084e6436b 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Thaumaturgy/essence_nodes.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Thaumaturgy/essence_nodes.yml @@ -125,7 +125,7 @@ - type: TimedSpawner prototypes: - CP14EssenceChaos - + # Complex tier 1 #TODO \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Thaumaturgy/essence_splitter.yml b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Thaumaturgy/essence_splitter.yml index ddee07ade6..7fa95599d0 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Thaumaturgy/essence_splitter.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Thaumaturgy/essence_splitter.yml @@ -56,5 +56,5 @@ - HideContextMenu - type: AnimationPlayer - type: EmitSoundOnSpawn - sound: + sound: path: /Audio/Magic/ethereal_enter.ogg \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Thaumaturgy/misc.yml b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Thaumaturgy/misc.yml index 279042c972..4da6ad57d4 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Thaumaturgy/misc.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Thaumaturgy/misc.yml @@ -11,11 +11,11 @@ - type: ItemSlots slots: crystal_slot: - insertSound: + insertSound: path: /Audio/_CP14/Items/crystal_insert.ogg params: variation: 0.05 - ejectSound: + ejectSound: path: /Audio/_CP14/Items/crystal_eject.ogg params: variation: 0.05 diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/chests.yml b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/chests.yml index c3eac68da9..44be1d1ee5 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/chests.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/chests.yml @@ -1,5 +1,5 @@ - type: entity - parent: + parent: - CP14ChestGeneric - CP14BaseFlammable id: CP14WoodenChest diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/crates.yml index 88e871d185..e931050287 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/crates.yml @@ -70,7 +70,7 @@ id: CP14LargeWoodenCrate name: large wooden crate description: Solid wooden crate. - parent: + parent: - CP14BaseCrate - CP14BaseFlammable components: @@ -103,7 +103,7 @@ id: CP14SmallWoodenCrate name: small wooden crate description: Solid wooden crate. - parent: + parent: - CP14BaseSmallCrate - CP14BaseFlammable components: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml index fc5e28e283..e27562bfb0 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml @@ -131,7 +131,7 @@ - type: entity id: CP14WallLeaf - parent: + parent: - CP14BaseFlammableSpreading - CP14BaseWall name: leaf wall @@ -171,7 +171,7 @@ !type:PhysShapeAabb bounds: "-0.35,-0.35,0.35,0.35" mask: - - FullTileMask + - FullTileMask layer: - Opaque - type: Destructible diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/wooden.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/wooden.yml index b9a9898123..c4b4cad027 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/wooden.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/wooden.yml @@ -3,7 +3,7 @@ - type: entity id: CP14WallFrameWooden name: wooden wall frame - parent: + parent: - CP14BaseWallFrame - CP14BaseFlammableSpreading components: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Windows/misc.yml b/Resources/Prototypes/_CP14/Entities/Structures/Windows/misc.yml index 0973380cc3..cb880e3126 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Windows/misc.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Windows/misc.yml @@ -13,7 +13,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 15 + damage: 15 behaviors: - !type:PlaySoundBehavior sound: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Windows/wooden.yml b/Resources/Prototypes/_CP14/Entities/Structures/Windows/wooden.yml index 1516c41fc1..b59961a808 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Windows/wooden.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Windows/wooden.yml @@ -69,7 +69,7 @@ - type: entity id: CP14WindowWoodenBroken name: shattered wooden window - parent: + parent: - CP14BaseWindowFrameBroken - CP14WindowFrameWooden components: diff --git a/Resources/Prototypes/_CP14/Entities/fire.yml b/Resources/Prototypes/_CP14/Entities/fire.yml index b55fa76377..59cb071a0f 100644 --- a/Resources/Prototypes/_CP14/Entities/fire.yml +++ b/Resources/Prototypes/_CP14/Entities/fire.yml @@ -39,7 +39,7 @@ !type:PhysShapeAabb bounds: "-0.5,-0.5,0.5,0.5" mask: - - FullTileMask + - FullTileMask layer: - Opaque - type: StepTrigger diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/alchemist.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/alchemist.yml index 448cf7ec0e..137089b23b 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/alchemist.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/alchemist.yml @@ -45,7 +45,7 @@ loadouts: - CP14ClothingEyesAlchemyGlasses - CP14ClothingEyesAlchemyMonocle - + - type: loadout id: CP14ClothingEyesAlchemyGlasses equipment: diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/blacksmith.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/blacksmith.yml index aaf495f264..a69e147b71 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/blacksmith.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/blacksmith.yml @@ -11,7 +11,7 @@ equipment: cloak: CP14ClothingCloakBlacksmithArpon -# Gloves +# Gloves - type: loadoutGroup id: CP14BlacksmithGloves diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml index f4c0701744..401e80e211 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml @@ -101,7 +101,7 @@ id: CP14ClothingCloakYellowSyurko equipment: cloak: CP14ClothingCloakYellowSyurko - + # OuterClothing - type: loadoutGroup @@ -164,8 +164,8 @@ - type: loadout id: CP14ClothingEyesGlasses equipment: - eyes: CP14ClothingEyesGlasses - + eyes: CP14ClothingEyesGlasses + - type: loadout id: CP14ClothingEyesEyePatch equipment: @@ -364,13 +364,13 @@ - CP14ClothingBlueOpenDress - CP14ClothinShirtWhiteBlueDress - CP14ClothinShirtWhiteBlue2Dress - - CP14ClothinShirtRedBlueDress + - CP14ClothinShirtRedBlueDress - CP14ClothingShirtJestersAttire - CP14ClothingShirtRedOpen - CP14ClothingRedOpenDress - CP14ClothingShirtYellowOpen - CP14ClothingYellowOpenDress - - CP14ClothinShirtBlueYellowDress + - CP14ClothinShirtBlueYellowDress - CP14ClothingShirtCottonPurple - CP14ClothingShirtCottonRed - CP14ClothingCottonRedDress @@ -530,19 +530,19 @@ shirt: CP14ClothingWarriorsGarbDress - type: loadout - id: CP14ClothinShirtBlueYellowDress + id: CP14ClothinShirtBlueYellowDress equipment: - shirt: CP14ClothinShirtBlueYellowDress + shirt: CP14ClothinShirtBlueYellowDress - type: loadout - id: CP14ClothinShirtWhiteBlueDress + id: CP14ClothinShirtWhiteBlueDress equipment: - shirt: CP14ClothinShirtWhiteBlueDress + shirt: CP14ClothinShirtWhiteBlueDress - type: loadout - id: CP14ClothinShirtWhiteBlue2Dress + id: CP14ClothinShirtWhiteBlue2Dress equipment: - shirt: CP14ClothinShirtWhiteBlue2Dress + shirt: CP14ClothinShirtWhiteBlue2Dress - type: loadout id: CP14ClothinShirtBrown2Dress diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/guildmaster.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/guildmaster.yml index 6bf2af2009..d134dfbdf9 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/guildmaster.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/guildmaster.yml @@ -10,7 +10,7 @@ id: CP14ClothingHeadGildmaster equipment: head: CP14ClothingHeadGildmaster - + # Cloak - type: loadoutGroup diff --git a/Resources/Prototypes/_CP14/LockCategories/lockTypes.yml b/Resources/Prototypes/_CP14/LockCategories/lockTypes.yml index ca06ed1502..cf1dea444b 100644 --- a/Resources/Prototypes/_CP14/LockCategories/lockTypes.yml +++ b/Resources/Prototypes/_CP14/LockCategories/lockTypes.yml @@ -1,4 +1,4 @@ -# Tavern +# Tavern - type: CP14LockType id: TavernHall @@ -40,20 +40,20 @@ complexity: 3 name: cp14-lock-shape-tavern-dorm5 -# Artisans +# Artisans - type: CP14LockType id: Alchemy1 group: Alchemist complexity: 5 name: cp14-lock-shape-alchemist1 - + - type: CP14LockType id: Alchemy2 group: Alchemist complexity: 5 name: cp14-lock-shape-alchemist2 - + - type: CP14LockType id: Alchemy3 group: Alchemist diff --git a/Resources/Prototypes/_CP14/NPCs/base.yml b/Resources/Prototypes/_CP14/NPCs/base.yml index c7331317ed..5f9dcbbeb7 100644 --- a/Resources/Prototypes/_CP14/NPCs/base.yml +++ b/Resources/Prototypes/_CP14/NPCs/base.yml @@ -33,7 +33,7 @@ tasks: - !type:HTNCompoundTask task: EscapeCompound - + # Melee combat (unarmed or otherwise) - tasks: - !type:HTNCompoundTask diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Fun/lol.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Fun/lol.yml index c4f80a28fa..b94205e390 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Fun/lol.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Fun/lol.yml @@ -12,7 +12,7 @@ - CP14DemiplaneOpenSky layers: - !type:CP14OreDunGen - tileMask: + tileMask: - CP14FloorGrass - CP14FloorGrassLight - CP14FloorGrassTall @@ -35,7 +35,7 @@ - CP14DemiplaneOpenSky layers: - !type:CP14OreDunGen - tileMask: + tileMask: - CP14FloorGrass - CP14FloorGrassLight - CP14FloorGrassTall diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Ore/ores.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Ore/ores.yml index 27cc1a0fd6..bb76798898 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Ore/ores.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Ore/ores.yml @@ -14,7 +14,7 @@ - CP14DemiplaneOpenSky layers: - !type:CP14OreDunGen - entityMask: + entityMask: - CP14WallStone entity: CP14WallStoneIronOre count: 20 @@ -35,7 +35,7 @@ - CP14DemiplaneUnderground layers: - !type:CP14OreDunGen - entityMask: + entityMask: - CP14WallStone entity: CP14WallStoneIronOre count: 15 @@ -56,7 +56,7 @@ - CP14DemiplaneOpenSky layers: - !type:CP14OreDunGen - entityMask: + entityMask: - CP14WallStone entity: CP14WallStoneCopperOre count: 20 @@ -77,7 +77,7 @@ - CP14DemiplaneUnderground layers: - !type:CP14OreDunGen - entityMask: + entityMask: - CP14WallStone entity: CP14WallStoneCopperOre count: 15 @@ -100,7 +100,7 @@ - CP14DemiplaneOpenSky layers: - !type:CP14OreDunGen - entityMask: + entityMask: - CP14WallStone entity: CP14WallStoneGoldOre count: 10 @@ -121,7 +121,7 @@ - CP14DemiplaneUnderground layers: - !type:CP14OreDunGen - entityMask: + entityMask: - CP14WallStone entity: CP14WallStoneGoldOre count: 15 @@ -142,9 +142,9 @@ - CP14DemiplaneOpenSky layers: - !type:CP14OreDunGen - entityMask: + entityMask: - CP14WallStone - entity: CP14WallStoneMithrilOre + entity: CP14WallStoneMithrilOre count: 10 minGroupSize: 2 maxGroupSize: 4 @@ -163,9 +163,9 @@ - CP14DemiplaneUnderground layers: - !type:CP14OreDunGen - entityMask: + entityMask: - CP14WallStone - entity: CP14WallStoneMithrilOre + entity: CP14WallStoneMithrilOre count: 15 minGroupSize: 2 maxGroupSize: 4 diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/crystals.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/crystals.yml index b4ef5f0c30..8344e0455a 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/crystals.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/crystals.yml @@ -7,7 +7,7 @@ Reward: 0.15 layers: - !type:CP14OreDunGen - tileMask: + tileMask: - CP14FloorBase - CP14FloorIce entity: CP14CrystalQuartz diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/herbals.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/herbals.yml index be9d40c31f..7c5943bf2d 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/herbals.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/herbals.yml @@ -13,7 +13,7 @@ - CP14DemiplaneOpenSky layers: - !type:CP14OreDunGen - tileMask: + tileMask: - CP14FloorGrass - CP14FloorGrassLight - CP14FloorGrassTall @@ -34,7 +34,7 @@ - CP14DemiplaneHerbals layers: - !type:CP14OreDunGen - tileMask: + tileMask: - CP14FloorBase - CP14FloorGrass - CP14FloorGrassLight @@ -56,7 +56,7 @@ - CP14DemiplaneHerbals layers: - !type:CP14OreDunGen - tileMask: + tileMask: - CP14FloorGrass - CP14FloorGrassLight - CP14FloorGrassTall @@ -77,7 +77,7 @@ - CP14DemiplaneHerbals layers: - !type:CP14OreDunGen - tileMask: + tileMask: - CP14FloorGrass - CP14FloorGrassLight - CP14FloorGrassTall @@ -99,7 +99,7 @@ - CP14DemiplaneOpenSky layers: - !type:CP14OreDunGen - tileMask: + tileMask: - CP14FloorGrass - CP14FloorGrassLight - CP14FloorGrassTall @@ -121,7 +121,7 @@ - CP14DemiplaneWater layers: - !type:CP14OreDunGen - entityMask: + entityMask: - CP14FloorWater - CP14FloorWaterLilies entity: CP14FloorWaterAirLily @@ -143,7 +143,7 @@ - CP14DemiplaneUnderground layers: - !type:CP14OreDunGen - tileMask: + tileMask: - CP14FloorGrass - CP14FloorGrassLight - CP14FloorGrassTall diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/misc.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/misc.yml index d0d971ffb4..99bd0dc5f4 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/misc.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/misc.yml @@ -63,7 +63,7 @@ - CP14DemiplaneAnimalsSwamp layers: - !type:CP14OreDunGen - tileMask: + tileMask: - CP14FloorGrass - CP14FloorGrassLight - CP14FloorGrassTall diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Weather/weather.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Weather/weather.yml index 9fbca7557f..c2405d0864 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Weather/weather.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Weather/weather.yml @@ -86,11 +86,11 @@ components: - type: CP14WeatherController entries: - - visuals: CP14SnowHeavyWithStorm + - visuals: CP14SnowHeavyWithStorm duration: min: 30 max: 180 - - visuals: SnowfallHeavy + - visuals: SnowfallHeavy duration: min: 30 max: 60 diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/special.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/special.yml index e93fb2ed7f..bd4ddada10 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/special.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/special.yml @@ -31,7 +31,7 @@ entity: CP14DemiplaneHint count: 20 minGroupSize: 1 - maxGroupSize: 1 + maxGroupSize: 1 - type: cp14DemiplaneModifier id: DemiplaneDecor @@ -41,9 +41,9 @@ entity: CP14AstralCorrosion count: 15 minGroupSize: 3 - maxGroupSize: 10 + maxGroupSize: 10 - !type:CP14OreDunGen - entityMask: + entityMask: - CP14WallStone - CP14WallDirt - CP14WallSnow diff --git a/Resources/Prototypes/_CP14/Procedural/caves.yml b/Resources/Prototypes/_CP14/Procedural/caves.yml index 633223c141..ba3539d1df 100644 --- a/Resources/Prototypes/_CP14/Procedural/caves.yml +++ b/Resources/Prototypes/_CP14/Procedural/caves.yml @@ -22,7 +22,7 @@ - CP14FloorBase entities: - CP14RockSmall - + - type: biomeTemplate id: CP14CavesGeneric layers: diff --git a/Resources/Prototypes/_CP14/Procedural/grasslands.yml b/Resources/Prototypes/_CP14/Procedural/grasslands.yml index 65a6fea1f2..b72944171a 100644 --- a/Resources/Prototypes/_CP14/Procedural/grasslands.yml +++ b/Resources/Prototypes/_CP14/Procedural/grasslands.yml @@ -7,7 +7,7 @@ - !type:BiomeTileLayer threshold: -1.0 tile: CP14FloorGrass - - !type:BiomeTileLayer + - !type:BiomeTileLayer tile: CP14FloorGrassLight threshold: 0 noise: @@ -125,7 +125,7 @@ - CP14FloorGrass - CP14FloorGrassLight - CP14FloorGrassTall - entities: + entities: - CP14FloraTreeBirchLarge - CP14FloraTreeBirchSmall - CP14FloraTreeBirchMedium @@ -195,7 +195,7 @@ layers: - !type:BiomeMetaLayer template: CP14GrasslandForest - - !type:BiomeTileLayer + - !type:BiomeTileLayer tile: CP14FloorBase invert: true threshold: 0.5 @@ -365,4 +365,3 @@ entities: - CP14FloorWater # Lakes end - \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Procedural/snow.yml b/Resources/Prototypes/_CP14/Procedural/snow.yml index 5a35a55ec2..5b56222cd8 100644 --- a/Resources/Prototypes/_CP14/Procedural/snow.yml +++ b/Resources/Prototypes/_CP14/Procedural/snow.yml @@ -4,7 +4,7 @@ - !type:BiomeTileLayer threshold: -1.0 tile: CP14FloorSnowDeepDeep - - !type:BiomeTileLayer + - !type:BiomeTileLayer tile: CP14FloorSnowDeep threshold: 0 noise: @@ -102,7 +102,7 @@ layers: - !type:BiomeMetaLayer template: CP14SnowlandForest - - !type:BiomeTileLayer + - !type:BiomeTileLayer tile: CP14FloorBase invert: true threshold: 0.5 diff --git a/Resources/Prototypes/_CP14/Procedural/swamp.yml b/Resources/Prototypes/_CP14/Procedural/swamp.yml index 00ddc56e0f..f022fc2fab 100644 --- a/Resources/Prototypes/_CP14/Procedural/swamp.yml +++ b/Resources/Prototypes/_CP14/Procedural/swamp.yml @@ -4,7 +4,7 @@ - !type:BiomeTileLayer threshold: -1.0 tile: CP14FloorDirt - - !type:BiomeTileLayer + - !type:BiomeTileLayer tile: CP14FloorGrass threshold: 0 noise: @@ -61,7 +61,7 @@ - CP14FloorWater #Lakes end - - !type:BiomeTileLayer + - !type:BiomeTileLayer tile: CP14FloorGrassLight threshold: 0.3 noise: diff --git a/Resources/Prototypes/_CP14/Procedural/wastelands.yml b/Resources/Prototypes/_CP14/Procedural/wastelands.yml index f5990ecb4f..a3facf00c9 100644 --- a/Resources/Prototypes/_CP14/Procedural/wastelands.yml +++ b/Resources/Prototypes/_CP14/Procedural/wastelands.yml @@ -4,7 +4,7 @@ - !type:BiomeTileLayer threshold: -1.0 tile: CP14FloorBase - - !type:BiomeTileLayer + - !type:BiomeTileLayer tile: CP14FloorDirt threshold: 0 noise: diff --git a/Resources/Prototypes/_CP14/Reagents/magic_essence.yml b/Resources/Prototypes/_CP14/Reagents/magic_essence.yml index bca8c91bb6..ea3605fcb6 100644 --- a/Resources/Prototypes/_CP14/Reagents/magic_essence.yml +++ b/Resources/Prototypes/_CP14/Reagents/magic_essence.yml @@ -11,7 +11,7 @@ probability: 0.25 pricePerUnit: 0.05 -# Basic 6 +# Basic 6 - type: reagent parent: CP14EssenceBase diff --git a/Resources/Prototypes/_CP14/Reagents/precurser.yml b/Resources/Prototypes/_CP14/Reagents/precurser.yml index 72869c0ffc..b7b0031233 100644 --- a/Resources/Prototypes/_CP14/Reagents/precurser.yml +++ b/Resources/Prototypes/_CP14/Reagents/precurser.yml @@ -1,4 +1,4 @@ -# Contains Flora and fauna, like flower, roots, mushrooms, etc, +# Contains Flora and fauna, like flower, roots, mushrooms, etc, # Flower based @@ -181,7 +181,7 @@ - type: reagent id: CP14GroundQuartz - group: CP14Precurser + group: CP14Precurser name: cp14-reagent-name-grounded-quartz desc: cp14-reagent-desc-grounded-quartz flavor: CP14Quartz diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/tables.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/tables.yml index ce2fb44100..3e802b545a 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/tables.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/tables.yml @@ -11,7 +11,7 @@ - material: CP14WoodenPlanks amount: 1 doAfter: 1 - + - node: CP14TableWoodenFrame entity: CP14TableWoodenFrame edges: @@ -28,7 +28,7 @@ - material: CP14WoodenPlanks amount: 1 doAfter: 1 - + - node: CP14TableWooden entity: CP14TableWooden edges: @@ -76,7 +76,7 @@ doAfter: 2 - node: CP14TableWoodenRound entity: CP14TableWoodenRound - + - type: constructionGraph id: CP14Workbench start: start @@ -92,7 +92,7 @@ doAfter: 2 - node: CP14Workbench entity: CP14Workbench - + - type: constructionGraph id: CP14WorkbenchCooking start: start @@ -108,7 +108,7 @@ doAfter: 2 - node: CP14WorkbenchCooking entity: CP14WorkbenchCooking - + - type: constructionGraph id: CP14WorkbenchSewing start: start diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Misc/target.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Misc/target.yml index fc1619fe57..5bccabb750 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Misc/target.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Misc/target.yml @@ -29,7 +29,7 @@ doAfter: 1 - tool: CP14Hammering doAfter: 1 - + - node: CP14target entity: CP14Target edges: diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/chests.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/chests.yml index 5feaac7487..f51c359e4e 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/chests.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/chests.yml @@ -11,7 +11,7 @@ - material: CP14WoodenPlanks amount: 2 doAfter: 2 - + - node: CP14WoodenChest entity: CP14WoodenChest edges: diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/crates.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/crates.yml index bbf002b05f..bc39b09ac2 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/crates.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/crates.yml @@ -13,7 +13,7 @@ - stackGroup: WoodenPlanks amount: 1 - node: CP14SmallWoodenCrate - entity: CP14SmallWoodenCrate + entity: CP14SmallWoodenCrate edges: - to: start steps: diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/pits.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/pits.yml index db82927e31..ad188741e0 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/pits.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/pits.yml @@ -11,6 +11,6 @@ - material: CP14Dirt amount: 3 doAfter: 5 - + - node: CP14CrateDirtPitGrave entity: CP14CrateDirtPitGrave \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Doors/iron_doors.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Doors/iron_doors.yml index ae0db8bbc5..c3e498ce27 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Doors/iron_doors.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Doors/iron_doors.yml @@ -11,7 +11,7 @@ - material: CP14IronBar amount: 2 doAfter: 2 - + - node: CP14IronDoorFrame entity: CP14IronDoorFrame edges: @@ -38,7 +38,7 @@ - material: CP14IronBar amount: 2 doAfter: 2 - + - node: CP14IronDoorFrameMirrored entity: CP14IronDoorFrameMirrored edges: @@ -68,7 +68,7 @@ - material: CP14IronBar amount: 2 doAfter: 2 - + - node: CP14IronDoor entity: CP14IronDoor edges: @@ -83,7 +83,7 @@ steps: - tool: Prying doAfter: 5 - + - node: CP14IronDoorMirrored entity: CP14IronDoorMirrored edges: @@ -98,7 +98,7 @@ steps: - tool: Prying doAfter: 5 - + - node: CP14IronDoorWindowed entity: CP14IronDoorWindowed edges: @@ -113,7 +113,7 @@ steps: - tool: Prying doAfter: 5 - + - node: CP14IronDoorWindowedMirrored entity: CP14IronDoorWindowedMirrored edges: diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Doors/wooden_doors.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Doors/wooden_doors.yml index d86b17a152..a1b1dca1ed 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Doors/wooden_doors.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Doors/wooden_doors.yml @@ -11,7 +11,7 @@ - material: CP14WoodenPlanks amount: 2 doAfter: 2 - + - node: CP14WoodenDoorFrame entity: CP14WoodenDoorFrame edges: @@ -38,7 +38,7 @@ - material: CP14WoodenPlanks amount: 2 doAfter: 2 - + - node: CP14WoodenDoorFrameMirrored entity: CP14WoodenDoorFrameMirrored edges: @@ -65,7 +65,7 @@ - material: CP14WoodenPlanks amount: 2 doAfter: 2 - + - node: CP14WoodenDoor entity: CP14WoodenDoor edges: @@ -80,7 +80,7 @@ steps: - tool: Prying doAfter: 4 - + - node: CP14WoodenDoorMirrored entity: CP14WoodenDoorMirrored edges: @@ -95,7 +95,7 @@ steps: - tool: Prying doAfter: 4 - + - node: CP14WoodenDoorWindowed entity: CP14WoodenDoorWindowed edges: @@ -110,7 +110,7 @@ steps: - tool: Prying doAfter: 4 - + - node: CP14WoodenDoorWindowedMirrored entity: CP14WoodenDoorWindowedMirrored edges: diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Roofs/roofs.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Roofs/roofs.yml index 67f386243a..4a1db24176 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Roofs/roofs.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Roofs/roofs.yml @@ -11,7 +11,7 @@ - stackGroup: WoodenPlanks amount: 1 doAfter: 2 - + - node: CP14RoofWooden entity: CP14RoofWooden edges: @@ -38,7 +38,7 @@ - material: CP14Stone amount: 1 doAfter: 2 - + - node: CP14RoofStone entity: CP14RoofStone edges: diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_stonebrick.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_stonebrick.yml index a34be6a09c..0314817b39 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_stonebrick.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_stonebrick.yml @@ -30,7 +30,7 @@ - material: CP14Stone amount: 2 doAfter: 2 - + - node: CP14WallStoneBrick entity: CP14WallStonebrick edges: diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_stonebrick_marble.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_stonebrick_marble.yml index 15819ac750..0b80d8096c 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_stonebrick_marble.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_stonebrick_marble.yml @@ -30,7 +30,7 @@ - material: CP14MarbleStone amount: 2 doAfter: 2 - + - node: CP14WallMarbleBrick entity: CP14WallMarbleBrick edges: diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_wooden.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_wooden.yml index 26cc901679..844333f729 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_wooden.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_wooden.yml @@ -30,7 +30,7 @@ - material: CP14WoodenPlanks amount: 2 doAfter: 2 - + - node: CP14WallWooden entity: CP14WallWooden edges: diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_wooden_birch.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_wooden_birch.yml index 1c71853839..d883b4fd27 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_wooden_birch.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_wooden_birch.yml @@ -35,7 +35,7 @@ # - material: CP14GlassSheet # amount: 2 # doAfter: 2 - + - node: CP14WallWoodenBirch entity: CP14WallWoodenBirch edges: @@ -47,6 +47,6 @@ - !type:SpawnPrototype prototype: CP14BirchWoodenPlanks1 amount: 2 - + #- node: WindowWooden # entity: CP14WindowWooden \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/window_stonebrick.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/window_stonebrick.yml index aeb49f48e4..0c6e8f4ba9 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/window_stonebrick.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/window_stonebrick.yml @@ -30,7 +30,7 @@ - material: CP14GlassSheet amount: 2 doAfter: 2 - + - node: CP14WindowStoneBrick entity: CP14WindowStoneBrick edges: diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/window_stonebrick_marble.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/window_stonebrick_marble.yml index d1f816dc93..9d8fa1bf89 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/window_stonebrick_marble.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/window_stonebrick_marble.yml @@ -30,7 +30,7 @@ - material: CP14GlassSheet amount: 2 doAfter: 2 - + - node: CP14WindowMarbleBrick entity: CP14WindowMarbleBrick edges: diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/window_wooden.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/window_wooden.yml index c4c6a7ec01..90f9366177 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/window_wooden.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/window_wooden.yml @@ -30,7 +30,7 @@ - material: CP14GlassSheet amount: 2 doAfter: 2 - + - node: CP14WindowWooden entity: CP14WindowWooden edges: diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/target_effect_creation_on_water.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/target_effect_creation_on_water.yml index 0d8f211b2a..8e880b1d8e 100644 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/target_effect_creation_on_water.yml +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/target_effect_creation_on_water.yml @@ -249,7 +249,7 @@ effects: - !type:CP14AffectSolutionTemperature addTemperature: -150 - + # CP14BasicEffectSatiateHunger # CP14BasicEffectSatiateThirst diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/furnace.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/furnace.yml index 2cf259b00f..9a76474aee 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/furnace.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/furnace.yml @@ -179,4 +179,4 @@ count: 1 result: CP14BaseAlchemyBomb resultCount: 3 - + diff --git a/Resources/Prototypes/_CP14/Skill/atlethic.yml b/Resources/Prototypes/_CP14/Skill/atlethic.yml index 3c78264db7..39b397298d 100644 --- a/Resources/Prototypes/_CP14/Skill/atlethic.yml +++ b/Resources/Prototypes/_CP14/Skill/atlethic.yml @@ -5,7 +5,7 @@ icon: sprite: _CP14/Actions/Spells/physical.rsi state: kick - effects: + effects: - !type:AddAction action: CP14ActionSpellKick @@ -16,7 +16,7 @@ icon: sprite: _CP14/Actions/Spells/physical.rsi state: sprint - effects: + effects: - !type:AddAction action: CP14ActionSpellSprint @@ -28,7 +28,7 @@ icon: sprite: _CP14/Actions/Spells/physical.rsi state: sprint - effects: + effects: - !type:ReplaceAction oldAction: CP14ActionSpellSprint newAction: CP14ActionSpellSprintGoblin diff --git a/Resources/Prototypes/_CP14/Skill/dimension.yml b/Resources/Prototypes/_CP14/Skill/dimension.yml index 1f78e7c87d..3b6ef660be 100644 --- a/Resources/Prototypes/_CP14/Skill/dimension.yml +++ b/Resources/Prototypes/_CP14/Skill/dimension.yml @@ -5,7 +5,7 @@ # icon: # sprite: _CP14/Actions/Spells/dimension.rsi # state: shadow_grab -# effects: +# effects: #- !type:AddAction # action: CP14ActionSpellShadowGrab # @@ -16,7 +16,7 @@ # icon: # sprite: _CP14/Actions/Spells/dimension.rsi # state: shadow_swap -# effects: +# effects: #- !type:AddAction # action: CP14ActionSpellShadowSwap # @@ -28,7 +28,7 @@ # icon: # sprite: _CP14/Actions/Spells/dimension.rsi # state: shadow_step -# effects: +# effects: #- !type:AddAction # action: CP14ActionSpellShadowStep diff --git a/Resources/Prototypes/_CP14/Skill/healing.yml b/Resources/Prototypes/_CP14/Skill/healing.yml index 87cbaec7db..f40797edff 100644 --- a/Resources/Prototypes/_CP14/Skill/healing.yml +++ b/Resources/Prototypes/_CP14/Skill/healing.yml @@ -17,7 +17,7 @@ icon: sprite: _CP14/Actions/Spells/healing.rsi state: cure_poison - effects: + effects: - !type:AddAction action: CP14ActionSpellBloodPurification restrictions: @@ -31,7 +31,7 @@ icon: sprite: _CP14/Actions/Spells/healing.rsi state: plant_growth - effects: + effects: - !type:AddAction action: CP14ActionSpellPlantGrowth restrictions: @@ -45,7 +45,7 @@ icon: sprite: _CP14/Actions/Spells/misc.rsi state: polymorph - effects: + effects: - !type:AddAction action: CP14ActionSpellSheepPolymorph restrictions: @@ -59,7 +59,7 @@ icon: sprite: _CP14/Actions/Spells/healing.rsi state: speed_music - effects: + effects: - !type:AddAction action: CP14ActionSpellSpeedBallade restrictions: @@ -76,7 +76,7 @@ icon: sprite: _CP14/Actions/skill_tree.rsi state: heal2 - effects: + effects: - !type:ModifyManacost modifiers: Life: -0.25 @@ -91,7 +91,7 @@ icon: sprite: _CP14/Actions/Spells/healing.rsi state: cure_burn - effects: + effects: - !type:AddAction action: CP14ActionSpellCureBurn restrictions: @@ -105,7 +105,7 @@ icon: sprite: _CP14/Actions/Spells/healing.rsi state: cure_wounds - effects: + effects: - !type:AddAction action: CP14ActionSpellCureWounds restrictions: @@ -119,7 +119,7 @@ icon: sprite: _CP14/Actions/Spells/healing.rsi state: heal_music - effects: + effects: - !type:AddAction action: CP14ActionSpellHealBallade restrictions: @@ -136,7 +136,7 @@ icon: sprite: _CP14/Actions/skill_tree.rsi state: heal3 - effects: + effects: - !type:ModifyManacost modifiers: Life: -0.25 @@ -151,7 +151,7 @@ icon: sprite: _CP14/Actions/Spells/necromancy.rsi state: resurrection - effects: + effects: - !type:AddAction action: CP14ActionSpellResurrection restrictions: diff --git a/Resources/Prototypes/_CP14/Skill/hydrosophistry.yml b/Resources/Prototypes/_CP14/Skill/hydrosophistry.yml index 47d27f9009..0699c23169 100644 --- a/Resources/Prototypes/_CP14/Skill/hydrosophistry.yml +++ b/Resources/Prototypes/_CP14/Skill/hydrosophistry.yml @@ -1,4 +1,4 @@ -# T1 +# T1 - type: cp14Skill id: HydrosophistryT1 @@ -17,7 +17,7 @@ icon: sprite: _CP14/Actions/Spells/water.rsi state: water_creation - effects: + effects: - !type:AddAction action: CP14ActionSpellWaterCreation restrictions: @@ -32,7 +32,7 @@ icon: sprite: _CP14/Actions/Spells/water.rsi state: beer_creation - effects: + effects: - !type:AddAction action: CP14ActionSpellBeerCreation restrictions: @@ -48,7 +48,7 @@ icon: sprite: _CP14/Actions/Spells/water.rsi state: ice_dagger - effects: + effects: - !type:AddAction action: CP14ActionSpellIceDagger restrictions: @@ -62,7 +62,7 @@ icon: sprite: _CP14/Actions/Spells/water.rsi state: ice_arrow - effects: + effects: - !type:AddAction action: CP14ActionSpellIceArrow restrictions: @@ -79,7 +79,7 @@ icon: sprite: _CP14/Actions/skill_tree.rsi state: water2 - effects: + effects: - !type:ModifyManacost modifiers: Water: -0.25 @@ -94,7 +94,7 @@ icon: sprite: _CP14/Actions/Spells/water.rsi state: freeze - effects: + effects: - !type:AddAction action: CP14ActionSpellFreeze restrictions: @@ -108,7 +108,7 @@ icon: sprite: _CP14/Actions/Spells/water.rsi state: ice_shards - effects: + effects: - !type:AddAction action: CP14ActionSpellIceShards restrictions: @@ -125,7 +125,7 @@ icon: sprite: _CP14/Actions/skill_tree.rsi state: water3 - effects: + effects: - !type:ModifyManacost modifiers: Water: -0.25 diff --git a/Resources/Prototypes/_CP14/Skill/illusion.yml b/Resources/Prototypes/_CP14/Skill/illusion.yml index c8448993d7..dc3ce73ad0 100644 --- a/Resources/Prototypes/_CP14/Skill/illusion.yml +++ b/Resources/Prototypes/_CP14/Skill/illusion.yml @@ -17,7 +17,7 @@ icon: sprite: _CP14/Actions/Spells/light.rsi state: sphere_of_light - effects: + effects: - !type:AddAction action: CP14ActionSpellSphereOfLight restrictions: @@ -32,7 +32,7 @@ icon: sprite: _CP14/Actions/Spells/light.rsi state: search_of_life - effects: + effects: - !type:AddAction action: CP14ActionSpellSearchOfLife restrictions: @@ -49,7 +49,7 @@ icon: sprite: _CP14/Actions/skill_tree.rsi state: light2 - effects: + effects: - !type:ModifyManacost modifiers: Light: -0.25 @@ -64,7 +64,7 @@ icon: sprite: _CP14/Actions/Spells/light.rsi state: flash_light - effects: + effects: - !type:AddAction action: CP14ActionSpellFlashLight restrictions: @@ -78,7 +78,7 @@ icon: sprite: _CP14/Actions/Spells/healing.rsi state: peace_music - effects: + effects: - !type:AddAction action: CP14ActionSpellPeaceBallade restrictions: @@ -95,7 +95,7 @@ icon: sprite: _CP14/Actions/skill_tree.rsi state: light3 - effects: + effects: - !type:ModifyManacost modifiers: Light: -0.25 diff --git a/Resources/Prototypes/_CP14/Skill/martial_arts.yml b/Resources/Prototypes/_CP14/Skill/martial_arts.yml index 2a560ffc73..ddeddf0649 100644 --- a/Resources/Prototypes/_CP14/Skill/martial_arts.yml +++ b/Resources/Prototypes/_CP14/Skill/martial_arts.yml @@ -5,7 +5,7 @@ desc: cp14-skill-mastery-desc learnCost: 0.5 tree: MartialArts - icon: + icon: sprite: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi state: preview @@ -16,7 +16,7 @@ desc: cp14-skill-mastery-desc learnCost: 0.5 tree: MartialArts - icon: + icon: sprite: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi state: preview @@ -27,6 +27,6 @@ desc: cp14-skill-mastery-desc learnCost: 0.5 tree: MartialArts - icon: + icon: sprite: _CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi state: preview \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Skill/metamagic.yml b/Resources/Prototypes/_CP14/Skill/metamagic.yml index 2ac1c3d928..09162fa08e 100644 --- a/Resources/Prototypes/_CP14/Skill/metamagic.yml +++ b/Resources/Prototypes/_CP14/Skill/metamagic.yml @@ -1,4 +1,4 @@ -# T1 +# T1 - type: cp14Skill id: MetamagicT1 @@ -9,7 +9,7 @@ icon: sprite: _CP14/Actions/skill_tree.rsi state: meta - effects: + effects: - !type:AddManaMax additionalMana: 25 @@ -21,7 +21,7 @@ icon: sprite: _CP14/Actions/Spells/meta.rsi state: mana_gift - effects: + effects: - !type:AddAction action: CP14ActionSpellManaGift restrictions: @@ -36,7 +36,7 @@ icon: sprite: _CP14/Actions/Spells/meta.rsi state: mana_gift - effects: + effects: - !type:ReplaceAction oldAction: CP14ActionSpellManaGift newAction: CP14ActionSpellManaGiftElf @@ -45,7 +45,7 @@ prerequisite: CP14ActionSpellManaGift - !type:SpeciesWhitelist species: CP14Elf - + - type: cp14Skill id: CP14ActionSpellManaConsume skillUiPosition: 2, 2 @@ -54,13 +54,13 @@ icon: sprite: _CP14/Actions/Spells/meta.rsi state: mana_consume - effects: + effects: - !type:AddAction action: CP14ActionSpellManaConsume restrictions: - !type:NeedPrerequisite prerequisite: MetamagicT1 - + - type: cp14Skill id: CP14ActionSpellManaConsumeElf skillUiPosition: 2, 4 @@ -69,7 +69,7 @@ icon: sprite: _CP14/Actions/Spells/meta.rsi state: mana_consume - effects: + effects: - !type:ReplaceAction oldAction: CP14ActionSpellManaConsume newAction: CP14ActionSpellManaConsumeElf @@ -78,7 +78,7 @@ prerequisite: CP14ActionSpellManaConsume - !type:SpeciesWhitelist species: CP14Elf - + - type: cp14Skill id: CP14ActionSpellMagicBallade skillUiPosition: 1, 6 @@ -86,8 +86,8 @@ icon: sprite: _CP14/Actions/Spells/meta.rsi state: magic_music - effects: - - !type:AddAction + effects: + - !type:AddAction action: CP14ActionSpellMagicBallade restrictions: - !type:NeedPrerequisite @@ -103,7 +103,7 @@ icon: sprite: _CP14/Actions/skill_tree.rsi state: meta2 - effects: + effects: - !type:AddManaMax additionalMana: 25 restrictions: @@ -117,7 +117,7 @@ icon: sprite: _CP14/Actions/Spells/meta.rsi state: counter_spell - effects: + effects: - !type:AddAction action: CP14ActionSpellMagicSplitting restrictions: @@ -125,7 +125,7 @@ prerequisite: MetamagicT2 - type: cp14Skill - id: CP14ActionSpellManaTrance + id: CP14ActionSpellManaTrance skillUiPosition: 8, 2 tree: Metamagic icon: @@ -148,7 +148,7 @@ icon: sprite: _CP14/Actions/skill_tree.rsi state: meta3 - effects: + effects: - !type:AddManaMax additionalMana: 25 restrictions: diff --git a/Resources/Prototypes/_CP14/Skill/pyrokinetic.yml b/Resources/Prototypes/_CP14/Skill/pyrokinetic.yml index 54c3b1359a..c3270e699d 100644 --- a/Resources/Prototypes/_CP14/Skill/pyrokinetic.yml +++ b/Resources/Prototypes/_CP14/Skill/pyrokinetic.yml @@ -1,4 +1,4 @@ -# T1 +# T1 - type: cp14Skill id: PyrokineticT1 @@ -17,7 +17,7 @@ icon: sprite: _CP14/Actions/Spells/fire.rsi state: flame_creation - effects: + effects: - !type:AddAction action: CP14ActionSpellFlameCreation restrictions: @@ -31,7 +31,7 @@ icon: sprite: _CP14/Actions/Spells/fire.rsi state: heat - effects: + effects: - !type:AddAction action: CP14ActionSpellHeat restrictions: @@ -45,7 +45,7 @@ icon: sprite: _CP14/Actions/Spells/fire.rsi state: fire_music - effects: + effects: - !type:AddAction action: CP14ActionSpellHellBallade restrictions: @@ -61,7 +61,7 @@ icon: sprite: _CP14/Actions/Spells/fire.rsi state: tiefling_revenge - effects: + effects: - !type:AddAction action: CP14ActionSpellTieflingInnerFire restrictions: @@ -80,7 +80,7 @@ icon: sprite: _CP14/Actions/skill_tree.rsi state: pyro2 - effects: + effects: - !type:ModifyManacost modifiers: Fire: -0.25 @@ -95,7 +95,7 @@ icon: sprite: _CP14/Actions/Spells/fire.rsi state: fireball - effects: + effects: - !type:AddAction action: CP14ActionSpellFireball restrictions: @@ -112,7 +112,7 @@ icon: sprite: _CP14/Actions/skill_tree.rsi state: pyro3 - effects: + effects: - !type:ModifyManacost modifiers: Fire: -0.25 diff --git a/Resources/Prototypes/_CP14/Skill/thaumaturgy.yml b/Resources/Prototypes/_CP14/Skill/thaumaturgy.yml index a5bdef0596..4324666984 100644 --- a/Resources/Prototypes/_CP14/Skill/thaumaturgy.yml +++ b/Resources/Prototypes/_CP14/Skill/thaumaturgy.yml @@ -8,7 +8,7 @@ icon: sprite: _CP14/Clothing/Eyes/alchemy_glasses.rsi state: icon - effects: + effects: - !type:AddComponents components: - type: SolutionScanner \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/SoundCollections/items.yml b/Resources/Prototypes/_CP14/SoundCollections/items.yml index 6bf907fcd6..76bc37c681 100644 --- a/Resources/Prototypes/_CP14/SoundCollections/items.yml +++ b/Resources/Prototypes/_CP14/SoundCollections/items.yml @@ -20,7 +20,7 @@ - /Audio/_CP14/Items/nailing2.ogg - /Audio/_CP14/Items/nailing3.ogg - /Audio/_CP14/Items/nailing4.ogg - + - type: soundCollection id: CP14Sawing files: diff --git a/Resources/Prototypes/_CP14/Stacks/coins.yml b/Resources/Prototypes/_CP14/Stacks/coins.yml index a373e3237e..4b366e2dbc 100644 --- a/Resources/Prototypes/_CP14/Stacks/coins.yml +++ b/Resources/Prototypes/_CP14/Stacks/coins.yml @@ -2,7 +2,7 @@ id: CP14CopperCoin name: cp14-stack-copper-coin spawn: CP14CopperCoin1 - icon: + icon: sprite: /Textures/_CP14/Objects/Economy/cp_coin.rsi state: coin1 maxCount: 10 @@ -11,7 +11,7 @@ id: CP14SilverCoin name: cp14-stack-silver-coin spawn: CP14SilverCoin1 - icon: + icon: sprite: /Textures/_CP14/Objects/Economy/sp_coin.rsi state: coin1 maxCount: 10 @@ -20,7 +20,7 @@ id: CP14GoldCoin name: cp14-stack-gold-coin spawn: CP14GoldCoin1 - icon: + icon: sprite: /Textures/_CP14/Objects/Economy/gp_coin.rsi state: coin1 maxCount: 10 @@ -29,7 +29,7 @@ id: CP14PlatinumCoin name: cp14-stack-platinum-coin spawn: CP14PlatinumCoin1 - icon: + icon: sprite: /Textures/_CP14/Objects/Economy/pp_coin.rsi state: coin1 maxCount: 10 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/audio_music.yml b/Resources/Prototypes/_CP14/audio_music.yml index 3f93b552ec..93b25b30a4 100644 --- a/Resources/Prototypes/_CP14/audio_music.yml +++ b/Resources/Prototypes/_CP14/audio_music.yml @@ -92,7 +92,7 @@ rules: - !type:CP14TimePeriod #periods: - #- Night + #- Night #- Evening - !type:NearbyTilesPercentRule ignoreAnchored: true diff --git a/Resources/Prototypes/_CP14/weather.yml b/Resources/Prototypes/_CP14/weather.yml index dc81f80a3b..8f0d3ec5cf 100644 --- a/Resources/Prototypes/_CP14/weather.yml +++ b/Resources/Prototypes/_CP14/weather.yml @@ -181,7 +181,7 @@ volume: -6 config: - effects: - #- !type:ApplyEntityEffect + #- !type:ApplyEntityEffect # prob: 1 # effects: # - !type:AdjustTemperature