From a6553f2942bb5d7acc1eb65ce574a37967a19cdc Mon Sep 17 00:00:00 2001 From: Lemirda <142801986+Lemirda@users.noreply.github.com> Date: Wed, 29 May 2024 15:29:51 +0300 Subject: [PATCH 1/2] fix all eror in kira prototypes --- .../SwatClothing/SwatBackP/swatbackpack.yml | 56 +++++++-------- .../SwatClothing/SwatBackP/swatduffelbag.yml | 62 ++++++++-------- .../SwatBackP/swatmedicsatchelbag.yml | 56 +++++++-------- .../SwatClothing/SwatBackP/swatsatchelbag.yml | 56 +++++++-------- .../SwatCoatP/swatleaderwintercoat.yml | 70 +++++++++---------- .../SwatCoatP/swatmedicwintercoat.yml | 70 +++++++++---------- .../SwatCoatP/swatwintercoat.yml | 70 +++++++++---------- .../SwatBackP/swatbackpackfilled.yml | 44 ++++++------ .../SwatBackP/swatduffelbagfilled.yml | 44 ++++++------ .../SwatBackP/swatleaderbackpackfilled.yml | 46 ++++++------ .../SwatBackP/swatleaderduffelbagfilled.yml | 54 +++++++------- .../SwatBackP/swatleadersatchelbagfilled.yml | 46 ++++++------ .../SwatBackP/swatmedicbackpackfilled.yml | 38 +++++----- .../SwatBackP/swatmedicduffelbagfilled.yml | 50 ++++++------- .../SwatBackP/swatmedicsatchelbagfilled.yml | 38 +++++----- .../SwatBackP/swatsatchelbagfilled.yml | 44 ++++++------ .../SwatBeltP/swatleaderweddingfilled.yml | 2 +- .../SwatBeltP/swatmedicweddingfilled.yml | 2 +- .../SwatBeltP/swatweddingfilled.yml | 2 +- .../SwatStartingGearP/SwatLeaderGear.yml | 2 +- .../SwatStartingGearP/SwatLeaderGearEVA.yml | 2 +- .../SwatStartingGearP/SwatMedicGear.yml | 4 +- .../SwatStartingGearP/SwatMedicGearEVA.yml | 4 +- .../SwatStartingGearP/SwatStandartGear.yml | 4 +- .../SwatStartingGearP/SwatStandartGearEVA.yml | 4 +- 25 files changed, 435 insertions(+), 435 deletions(-) diff --git a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatClothing/SwatBackP/swatbackpack.yml b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatClothing/SwatBackP/swatbackpack.yml index 7cb3869b86e..22bb6b2cf2e 100644 --- a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatClothing/SwatBackP/swatbackpack.yml +++ b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatClothing/SwatBackP/swatbackpack.yml @@ -1,28 +1,28 @@ -#- type: entity -# parent: ClothingBackpack -# id: ClothingSwatBackpack -# name: рюкзак спецназа -# description: Обычный рюкзак спецназа используемый для хранения в нём всех необходимых вещей. -# suffix: Андромеда -# components: -# - type: Sprite -# sprite: Andromeda/Clothing/Back/Backpacks/swatbackpack.rsi -# state: icon -# - type: Storage -# maxItemSize: Huge -# grid: -# - 0,0,6,8 -# - type: Clothing -# quickEquip: false -# slots: -# - back -# - type: ContainerContainer -# containers: -# storagebase: !type:Container -# ents: [] -# - type: UserInterface -# interfaces: -# - key: enum.StorageUiKey.Key -# type: StorageBoundUserInterface -# - type: UseDelay -# delay: 0.5 +- type: entity + parent: ClothingBackpack + id: ClothingSwatBackpack + name: рюкзак спецназа + description: Обычный рюкзак спецназа используемый для хранения в нём всех необходимых вещей. + suffix: Андромеда + components: + - type: Sprite + sprite: Andromeda/Clothing/Back/Backpacks/swatbackpack.rsi + state: icon + - type: Storage + maxItemSize: Huge + grid: + - 0,0,6,8 + - type: Clothing + quickEquip: false + slots: + - back + - type: ContainerContainer + containers: + storagebase: !type:Container + ents: [] + - type: UserInterface + interfaces: + enum.StorageUiKey.Key: + type: StorageBoundUserInterface + - type: UseDelay + delay: 0.5 \ No newline at end of file diff --git a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatClothing/SwatBackP/swatduffelbag.yml b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatClothing/SwatBackP/swatduffelbag.yml index 555fd128aad..c268c9d5925 100644 --- a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatClothing/SwatBackP/swatduffelbag.yml +++ b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatClothing/SwatBackP/swatduffelbag.yml @@ -1,31 +1,31 @@ -#- type: entity -# parent: ClothingBackpackDuffel -# id: ClothingBackpackSwatDuffel -# name: вещмешок спецназа -# description: Большой вещмешок используемый спецназом для переноса боекомплекта или вооружения со снаряжением, очень большой. -# suffix: Андромеда -# components: -# - type: Sprite -# sprite: Andromeda/Clothing/Back/Duffels/swatduffelbag.rsi -# state: icon -# - type: Storage -# maxItemSize: Huge -# grid: -# - 0,0,8,8 -# - type: Clothing -# quickEquip: false -# slots: -# - back -# - type: ContainerContainer -# containers: -# storagebase: !type:Container -# ents: [] -# - type: ClothingSpeedModifier -# walkModifier: 0.8 -# sprintModifier: 0.6 -# - type: UserInterface -# interfaces: -# - key: enum.StorageUiKey.Key -# type: StorageBoundUserInterface -# - type: UseDelay -# delay: 0.5 +- type: entity + parent: ClothingBackpackDuffel + id: ClothingBackpackSwatDuffel + name: вещмешок спецназа + description: Большой вещмешок используемый спецназом для переноса боекомплекта или вооружения со снаряжением, очень большой. + suffix: Андромеда + components: + - type: Sprite + sprite: Andromeda/Clothing/Back/Duffels/swatduffelbag.rsi + state: icon + - type: Storage + maxItemSize: Huge + grid: + - 0,0,8,8 + - type: Clothing + quickEquip: false + slots: + - back + - type: ContainerContainer + containers: + storagebase: !type:Container + ents: [] + - type: ClothingSpeedModifier + walkModifier: 0.8 + sprintModifier: 0.6 + - type: UserInterface + interfaces: + enum.StorageUiKey.Key: + type: StorageBoundUserInterface + - type: UseDelay + delay: 0.5 \ No newline at end of file diff --git a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatClothing/SwatBackP/swatmedicsatchelbag.yml b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatClothing/SwatBackP/swatmedicsatchelbag.yml index eda2f0bd544..36805fdf87f 100644 --- a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatClothing/SwatBackP/swatmedicsatchelbag.yml +++ b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatClothing/SwatBackP/swatmedicsatchelbag.yml @@ -1,28 +1,28 @@ -#- type: entity -# parent: Clothing -# id: ClothingBackpackSwatMedicSatchel -# name: сумка медика спецназа -# description: Удобная и максимально компактная сумка медика спецназа, которая способна вместить море медикаментов. -# suffix: Андромеда -# components: -# - type: Sprite -# sprite: Andromeda/Clothing/Back/Satchels/swatmedicsatchelbag.rsi -# state: icon -# - type: Storage -# maxItemSize: Huge -# grid: -# - 0,0,6,8 -# - type: Clothing -# quickEquip: false -# slots: -# - back -# - type: ContainerContainer -# containers: -# storagebase: !type:Container -# ents: [] -# - type: UserInterface -# interfaces: -# - key: enum.StorageUiKey.Key -# type: StorageBoundUserInterface -# - type: UseDelay -# delay: 0.5 +- type: entity + parent: Clothing + id: ClothingBackpackSwatMedicSatchel + name: сумка медика спецназа + description: Удобная и максимально компактная сумка медика спецназа, которая способна вместить море медикаментов. + suffix: Андромеда + components: + - type: Sprite + sprite: Andromeda/Clothing/Back/Satchels/swatmedicsatchelbag.rsi + state: icon + - type: Storage + maxItemSize: Huge + grid: + - 0,0,6,8 + - type: Clothing + quickEquip: false + slots: + - back + - type: ContainerContainer + containers: + storagebase: !type:Container + ents: [] + - type: UserInterface + interfaces: + enum.StorageUiKey.Key: + type: StorageBoundUserInterface + - type: UseDelay + delay: 0.5 \ No newline at end of file diff --git a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatClothing/SwatBackP/swatsatchelbag.yml b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatClothing/SwatBackP/swatsatchelbag.yml index 5c99b56d9e1..92eb5550331 100644 --- a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatClothing/SwatBackP/swatsatchelbag.yml +++ b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatClothing/SwatBackP/swatsatchelbag.yml @@ -1,28 +1,28 @@ -#- type: entity -# parent: ClothingBackpackSatchel -# id: ClothingBackpackSwatSatchel -# name: сумка спецназа -# description: Элитная сумка спецназа, используется чтобы переносить боекомплект и личные вещи спецназовца. -# suffix: Андромеда -# components: -# - type: Sprite -# sprite: Andromeda/Clothing/Back/Satchels/swatsatchelbag.rsi -# state: icon -# - type: Storage -# maxItemSize: Huge -# grid: -# - 0,0,6,8 -# - type: Clothing -# quickEquip: false -# slots: -# - back -# - type: ContainerContainer -# containers: -# storagebase: !type:Container -# ents: [] -# - type: UserInterface -# interfaces: -# - key: enum.StorageUiKey.Key -# type: StorageBoundUserInterface -# - type: UseDelay -# delay: 0.5 +- type: entity + parent: ClothingBackpackSatchel + id: ClothingBackpackSwatSatchel + name: сумка спецназа + description: Элитная сумка спецназа, используется чтобы переносить боекомплект и личные вещи спецназовца. + suffix: Андромеда + components: + - type: Sprite + sprite: Andromeda/Clothing/Back/Satchels/swatsatchelbag.rsi + state: icon + - type: Storage + maxItemSize: Huge + grid: + - 0,0,6,8 + - type: Clothing + quickEquip: false + slots: + - back + - type: ContainerContainer + containers: + storagebase: !type:Container + ents: [] + - type: UserInterface + interfaces: + enum.StorageUiKey.Key: + type: StorageBoundUserInterface + - type: UseDelay + delay: 0.5 \ No newline at end of file diff --git a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatClothing/SwatOuterClothingP/SwatCoatP/swatleaderwintercoat.yml b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatClothing/SwatOuterClothingP/SwatCoatP/swatleaderwintercoat.yml index b6cc5302f7a..002d677f6b0 100644 --- a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatClothing/SwatOuterClothingP/SwatCoatP/swatleaderwintercoat.yml +++ b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatClothing/SwatOuterClothingP/SwatCoatP/swatleaderwintercoat.yml @@ -1,35 +1,35 @@ -#- type: entity -# parent: ClothingOuterStorageBase -# id: ClothingOuterSwatLeaderWinterCoat -# name: зимнее бронепальто лидера спецназа -# description: Синие опознавательные знаки, золотые вкрапления, тяжелый бронежилет, кажется это Лидер СПБсТ! -# suffix: Андромеда -# components: -# - type: Sprite -# sprite: Andromeda/Clothing/OuterClothing/WinterCoats/swatleaderwintercoat.rsi -# - type: Clothing -# sprite: Andromeda/Clothing/OuterClothing/WinterCoats/swatleaderwintercoat.rsi -# - type: TemperatureProtection -# coefficient: 0.1 -# - type: Armor -# modifiers: -# coefficients: -# Blunt: 0.6 -# Slash: 0.6 -# Piercing: 0.50 -# Heat: 0.55 -# - type: ExplosionResistance -# damageCoefficient: 0.6 -# - type: ContainerContainer -# containers: -# storagebase: !type:Container -# ents: [] -# - type: ClothingSpeedModifier -# walkModifier: 0.9 -# sprintModifier: 0.8 -# - type: UserInterface -# interfaces: -# - key: enum.StorageUiKey.Key -# type: StorageBoundUserInterface -# - type: UseDelay -# delay: 0.5 +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterSwatLeaderWinterCoat + name: зимнее бронепальто лидера спецназа + description: Синие опознавательные знаки, золотые вкрапления, тяжелый бронежилет, кажется это Лидер СПБсТ! + suffix: Андромеда + components: + - type: Sprite + sprite: Andromeda/Clothing/OuterClothing/WinterCoats/swatleaderwintercoat.rsi + - type: Clothing + sprite: Andromeda/Clothing/OuterClothing/WinterCoats/swatleaderwintercoat.rsi + - type: TemperatureProtection + coefficient: 0.1 + - type: Armor + modifiers: + coefficients: + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.50 + Heat: 0.55 + - type: ExplosionResistance + damageCoefficient: 0.6 + - type: ContainerContainer + containers: + storagebase: !type:Container + ents: [] + - type: ClothingSpeedModifier + walkModifier: 0.9 + sprintModifier: 0.8 + - type: UserInterface + interfaces: + enum.StorageUiKey.Key: + type: StorageBoundUserInterface + - type: UseDelay + delay: 0.5 \ No newline at end of file diff --git a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatClothing/SwatOuterClothingP/SwatCoatP/swatmedicwintercoat.yml b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatClothing/SwatOuterClothingP/SwatCoatP/swatmedicwintercoat.yml index 07debf879ba..bfe950df6f7 100644 --- a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatClothing/SwatOuterClothingP/SwatCoatP/swatmedicwintercoat.yml +++ b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatClothing/SwatOuterClothingP/SwatCoatP/swatmedicwintercoat.yml @@ -1,35 +1,35 @@ -#- type: entity -# parent: ClothingOuterStorageBase -# id: ClothingOuterSwatMedicWinterCoat -# name: зимнее бронепальто медика спецназа -# description: Синие опознавательные знаки, медицинский крестик, разгрузка совмещенная с бронежилетом, кажется это Медик СПБсТ! -# suffix: Андромеда -# components: -# - type: Sprite -# sprite: Andromeda/Clothing/OuterClothing/WinterCoats/swatmedicwintercoat.rsi -# - type: Clothing -# sprite: Andromeda/Clothing/OuterClothing/WinterCoats/swatmedicwintercoat.rsi -# - type: TemperatureProtection -# coefficient: 0.1 -# - type: Armor -# modifiers: -# coefficients: -# Blunt: 0.75 -# Slash: 0.75 -# Piercing: 0.55 -# Heat: 0.75 -# - type: ExplosionResistance -# damageCoefficient: 0.7 -# - type: ContainerContainer -# containers: -# storagebase: !type:Container -# ents: [] -# - type: ClothingSpeedModifier -# walkModifier: 0.9 -# sprintModifier: 0.9 -# - type: UserInterface -# interfaces: -# - key: enum.StorageUiKey.Key -# type: StorageBoundUserInterface -# - type: UseDelay -# delay: 0.5 +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterSwatMedicWinterCoat + name: зимнее бронепальто медика спецназа + description: Синие опознавательные знаки, медицинский крестик, разгрузка совмещенная с бронежилетом, кажется это Медик СПБсТ! + suffix: Андромеда + components: + - type: Sprite + sprite: Andromeda/Clothing/OuterClothing/WinterCoats/swatmedicwintercoat.rsi + - type: Clothing + sprite: Andromeda/Clothing/OuterClothing/WinterCoats/swatmedicwintercoat.rsi + - type: TemperatureProtection + coefficient: 0.1 + - type: Armor + modifiers: + coefficients: + Blunt: 0.75 + Slash: 0.75 + Piercing: 0.55 + Heat: 0.75 + - type: ExplosionResistance + damageCoefficient: 0.7 + - type: ContainerContainer + containers: + storagebase: !type:Container + ents: [] + - type: ClothingSpeedModifier + walkModifier: 0.9 + sprintModifier: 0.9 + - type: UserInterface + interfaces: + enum.StorageUiKey.Key: + type: StorageBoundUserInterface + - type: UseDelay + delay: 0.5 \ No newline at end of file diff --git a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatClothing/SwatOuterClothingP/SwatCoatP/swatwintercoat.yml b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatClothing/SwatOuterClothingP/SwatCoatP/swatwintercoat.yml index 23b712bbbb8..5c4d423468c 100644 --- a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatClothing/SwatOuterClothingP/SwatCoatP/swatwintercoat.yml +++ b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatClothing/SwatOuterClothingP/SwatCoatP/swatwintercoat.yml @@ -1,35 +1,35 @@ -#- type: entity -# parent: ClothingOuterStorageBase -# id: ClothingOuterSwatWinterCoat -# name: зимнее бронепальто спецназа -# description: Синие опознавательные знаки, крепкий и универсальный бронежилет, кажется это СПБсТ! -# suffix: Андромеда -# components: -# - type: Sprite -# sprite: Andromeda/Clothing/OuterClothing/WinterCoats/swatwintercoat.rsi -# - type: Clothing -# sprite: Andromeda/Clothing/OuterClothing/WinterCoats/swatwintercoat.rsi -# - type: TemperatureProtection -# coefficient: 0.1 -# - type: Armor -# modifiers: -# coefficients: -# Blunt: 0.75 -# Slash: 0.85 -# Piercing: 0.6 -# Heat: 0.75 -# - type: ExplosionResistance -# damageCoefficient: 0.8 -# - type: ContainerContainer -# containers: -# storagebase: !type:Container -# ents: [] -# - type: ClothingSpeedModifier -# walkModifier: 0.8 -# sprintModifier: 0.8 -# - type: UserInterface -# interfaces: -# - key: enum.StorageUiKey.Key -# type: StorageBoundUserInterface -# - type: UseDelay -# delay: 0.5 +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterSwatWinterCoat + name: зимнее бронепальто спецназа + description: Синие опознавательные знаки, крепкий и универсальный бронежилет, кажется это СПБсТ! + suffix: Андромеда + components: + - type: Sprite + sprite: Andromeda/Clothing/OuterClothing/WinterCoats/swatwintercoat.rsi + - type: Clothing + sprite: Andromeda/Clothing/OuterClothing/WinterCoats/swatwintercoat.rsi + - type: TemperatureProtection + coefficient: 0.1 + - type: Armor + modifiers: + coefficients: + Blunt: 0.75 + Slash: 0.85 + Piercing: 0.6 + Heat: 0.75 + - type: ExplosionResistance + damageCoefficient: 0.8 + - type: ContainerContainer + containers: + storagebase: !type:Container + ents: [] + - type: ClothingSpeedModifier + walkModifier: 0.8 + sprintModifier: 0.8 + - type: UserInterface + interfaces: + enum.StorageUiKey.Key: + type: StorageBoundUserInterface + - type: UseDelay + delay: 0.5 \ No newline at end of file diff --git a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBackP/swatbackpackfilled.yml b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBackP/swatbackpackfilled.yml index 429ba11f75d..41049e91a68 100644 --- a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBackP/swatbackpackfilled.yml +++ b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBackP/swatbackpackfilled.yml @@ -1,22 +1,22 @@ -#- type: entity -# noSpawn: false -# parent: ClothingSwatBackpack -# id: ClothingSwatBackpackStandartFilled -# suffix: Заполненный, Стандарт -# components: -# - type: StorageFill -# contents: -# - id: WeaponRifleM4 -# - id: MagazineLightRifle -# - id: MagazineLightRifle -# - id: MagazineLightRifle -# - id: MagazineBoxLightRifle -# - id: WeaponDisabler -# - id: Crowbar -# - id: BoxHandcuff -# - id: MedkitFilled -# - id: Flare -# - id: Flare -# - id: Flare -# - id: Flash -# - id: Flash +- type: entity + noSpawn: false + parent: ClothingSwatBackpack + id: ClothingSwatBackpackStandartFilled + suffix: Андромеда, Заполненный, Стандарт + components: + - type: StorageFill + contents: + - id: WeaponRifleM4 + - id: MagazineLightRifle + - id: MagazineLightRifle + - id: MagazineLightRifle + - id: MagazineBoxLightRifle + - id: WeaponDisabler + - id: Crowbar + - id: BoxHandcuff + - id: MedkitFilled + - id: Flare + - id: Flare + - id: Flare + - id: Flash + - id: Flash diff --git a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBackP/swatduffelbagfilled.yml b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBackP/swatduffelbagfilled.yml index 514e91de933..44af69093ab 100644 --- a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBackP/swatduffelbagfilled.yml +++ b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBackP/swatduffelbagfilled.yml @@ -1,22 +1,22 @@ -#- type: entity -# noSpawn: false -# parent: ClothingBackpackSwatDuffel -# id: ClothingBackpackSwatDuffelStandartFilled -# suffix: Заполненный, Стандарт -# components: -# - type: StorageFill -# contents: -# - id: WeaponRifleM4 -# - id: WeaponDisabler -# - id: Crowbar -# - id: BoxHandcuff -# - id: MedkitFilled -# - id: MagazineLightRifle -# - id: MagazineLightRifle -# - id: MagazineLightRifle -# - id: MagazineBoxLightRifle -# - id: Flare -# - id: Flare -# - id: Flare -# - id: Flash -# - id: Flash +- type: entity + noSpawn: false + parent: ClothingBackpackSwatDuffel + id: ClothingBackpackSwatDuffelStandartFilled + suffix: Андромеда, Заполненный, Стандарт + components: + - type: StorageFill + contents: + - id: WeaponRifleM4 + - id: WeaponDisabler + - id: Crowbar + - id: BoxHandcuff + - id: MedkitFilled + - id: MagazineLightRifle + - id: MagazineLightRifle + - id: MagazineLightRifle + - id: MagazineBoxLightRifle + - id: Flare + - id: Flare + - id: Flare + - id: Flash + - id: Flash diff --git a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBackP/swatleaderbackpackfilled.yml b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBackP/swatleaderbackpackfilled.yml index 351623e75d1..35eb63813d9 100644 --- a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBackP/swatleaderbackpackfilled.yml +++ b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBackP/swatleaderbackpackfilled.yml @@ -1,23 +1,23 @@ -#- type: entity -# noSpawn: false -# parent: ClothingSwatBackpack -# id: ClothingSwatLeaderBackpackFilled -# suffix: Заполненный, Лидер -# components: -# - type: StorageFill -# contents: -# - id: WeaponSubmachineGunMP5 -# - id: MagazineBoxCaselessRifle -# - id: MagazineCaselessRifle -# - id: MagazineCaselessRifle -# - id: MagazineCaselessRifle -# - id: MagazineCaselessRifle -# - id: WeaponDisabler -# - id: Crowbar -# - id: BoxHandcuff -# - id: MedkitFilled -# - id: Flare -# - id: Flare -# - id: Flare -# - id: Flash -# - id: Flash +- type: entity + noSpawn: false + parent: ClothingSwatBackpack + id: ClothingSwatLeaderBackpackFilled + suffix: Андромеда, Заполненный, Лидер + components: + - type: StorageFill + contents: + - id: WeaponSubmachineGunMP5 + - id: MagazineBoxCaselessRifle + - id: MagazineCaselessRifle + - id: MagazineCaselessRifle + - id: MagazineCaselessRifle + - id: MagazineCaselessRifle + - id: WeaponDisabler + - id: Crowbar + - id: BoxHandcuff + - id: MedkitFilled + - id: Flare + - id: Flare + - id: Flare + - id: Flash + - id: Flash diff --git a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBackP/swatleaderduffelbagfilled.yml b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBackP/swatleaderduffelbagfilled.yml index e2c0a5fff40..05abc2d52d5 100644 --- a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBackP/swatleaderduffelbagfilled.yml +++ b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBackP/swatleaderduffelbagfilled.yml @@ -1,27 +1,27 @@ -#- type: entity -# noSpawn: false -# parent: ClothingBackpackSwatDuffel -# id: ClothingBackpackSwatLeaderDuffelFilled -# suffix: Заполненный, Лидер -# components: -# - type: StorageFill -# contents: -# - id: WeaponLightMachineGunL6 -# - id: WeaponSubmachineGunMP5 -# - id: WeaponDisabler -# - id: Crowbar -# - id: BoxHandcuff -# - id: MedkitFilled -# - id: MagazineLightRifleBox -# - id: MagazineLightRifleBox -# - id: MagazineBoxLightRifle -# - id: MagazineBoxLightRifle -# - id: MagazineBoxCaselessRifle -# - id: MagazineBoxCaselessRifle -# - id: MagazineCaselessRifle -# - id: MagazineCaselessRifle -# - id: Flare -# - id: Flare -# - id: Flare -# - id: Flash -# - id: Flash +- type: entity + noSpawn: false + parent: ClothingBackpackSwatDuffel + id: ClothingBackpackSwatLeaderDuffelFilled + suffix: Андромеда, Заполненный, Лидер + components: + - type: StorageFill + contents: + - id: WeaponLightMachineGunL6 + - id: WeaponSubmachineGunMP5 + - id: WeaponDisabler + - id: Crowbar + - id: BoxHandcuff + - id: MedkitFilled + - id: MagazineLightRifleBox + - id: MagazineLightRifleBox + - id: MagazineBoxLightRifle + - id: MagazineBoxLightRifle + - id: MagazineBoxCaselessRifle + - id: MagazineBoxCaselessRifle + - id: MagazineCaselessRifle + - id: MagazineCaselessRifle + - id: Flare + - id: Flare + - id: Flare + - id: Flash + - id: Flash diff --git a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBackP/swatleadersatchelbagfilled.yml b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBackP/swatleadersatchelbagfilled.yml index c6c09d2efcb..ca4fa503bae 100644 --- a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBackP/swatleadersatchelbagfilled.yml +++ b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBackP/swatleadersatchelbagfilled.yml @@ -1,23 +1,23 @@ -#- type: entity -# noSpawn: false -# parent: ClothingBackpackSwatSatchel -# id: ClothingBackpackSwatLeaderSatchelFilled -# suffix: Заполненный, Лидер -# components: -# - type: StorageFill -# contents: -# - id: WeaponSubmachineGunMP5 -# - id: MagazineCaselessRifle -# - id: MagazineCaselessRifle -# - id: MagazineCaselessRifle -# - id: MagazineCaselessRifle -# - id: MagazineBoxCaselessRifleBig -# - id: WeaponDisabler -# - id: Crowbar -# - id: BoxHandcuff -# - id: MedkitFilled -# - id: Flare -# - id: Flare -# - id: Flare -# - id: Flash -# - id: Flash +- type: entity + noSpawn: false + parent: ClothingBackpackSwatSatchel + id: ClothingBackpackSwatLeaderSatchelFilled + suffix: Андромеда, Заполненный, Лидер + components: + - type: StorageFill + contents: + - id: WeaponSubmachineGunMP5 + - id: MagazineCaselessRifle + - id: MagazineCaselessRifle + - id: MagazineCaselessRifle + - id: MagazineCaselessRifle + - id: MagazineBoxCaselessRifleBig + - id: WeaponDisabler + - id: Crowbar + - id: BoxHandcuff + - id: MedkitFilled + - id: Flare + - id: Flare + - id: Flare + - id: Flash + - id: Flash diff --git a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBackP/swatmedicbackpackfilled.yml b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBackP/swatmedicbackpackfilled.yml index b9ee7b99299..f04a4e5c394 100644 --- a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBackP/swatmedicbackpackfilled.yml +++ b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBackP/swatmedicbackpackfilled.yml @@ -1,19 +1,19 @@ -#- type: entity -# noSpawn: false -# parent: ClothingSwatBackpack -# id: ClothingSwatMedicBackpackFilled -# suffix: Заполненный, Медик -# components: -# - type: StorageFill -# contents: -# - id: WeaponRifleM4 -# - id: MagazineLightRifle -# - id: MagazineLightRifle -# - id: MagazineLightRifle -# - id: MagazineBoxLightRifle -# - id: Defibrillator -# - id: WeaponDisabler -# - id: Crowbar -# - id: MedkitCombatSwatFilled -# - id: Flare -# - id: Flash +- type: entity + noSpawn: false + parent: ClothingSwatBackpack + id: ClothingSwatMedicBackpackFilled + suffix: Андромеда, Заполненный, Медик + components: + - type: StorageFill + contents: + - id: WeaponRifleM4 + - id: MagazineLightRifle + - id: MagazineLightRifle + - id: MagazineLightRifle + - id: MagazineBoxLightRifle + - id: Defibrillator + - id: WeaponDisabler + - id: Crowbar + - id: MedkitCombatSwatFilled + - id: Flare + - id: Flash diff --git a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBackP/swatmedicduffelbagfilled.yml b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBackP/swatmedicduffelbagfilled.yml index 17785a19733..83494de16fe 100644 --- a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBackP/swatmedicduffelbagfilled.yml +++ b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBackP/swatmedicduffelbagfilled.yml @@ -1,25 +1,25 @@ -#- type: entity -# noSpawn: false -# parent: ClothingBackpackSwatDuffel -# id: ClothingBackpackSwatMedicDuffelFilled -# suffix: Заполненный, Медик -# components: -# - type: StorageFill -# contents: -# - id: WeaponRifleM4 -# - id: MagazineLightRifle -# - id: MagazineLightRifle -# - id: MagazineLightRifle -# - id: MagazineBoxLightRifle -# - id: Defibrillator -# - id: CombatMedipen -# - id: CombatMedipen -# - id: CombatMedipen -# - id: CombatMedipen -# - id: EmergencyMedipen -# - id: EmergencyMedipen -# - id: WeaponDisabler -# - id: Crowbar -# - id: MedkitCombatSwatFilled -# - id: Flare -# - id: Flash +- type: entity + noSpawn: false + parent: ClothingBackpackSwatDuffel + id: ClothingBackpackSwatMedicDuffelFilled + suffix: Андромеда, Заполненный, Медик + components: + - type: StorageFill + contents: + - id: WeaponRifleM4 + - id: MagazineLightRifle + - id: MagazineLightRifle + - id: MagazineLightRifle + - id: MagazineBoxLightRifle + - id: Defibrillator + - id: CombatMedipen + - id: CombatMedipen + - id: CombatMedipen + - id: CombatMedipen + - id: EmergencyMedipen + - id: EmergencyMedipen + - id: WeaponDisabler + - id: Crowbar + - id: MedkitCombatSwatFilled + - id: Flare + - id: Flash diff --git a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBackP/swatmedicsatchelbagfilled.yml b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBackP/swatmedicsatchelbagfilled.yml index 85a08c1b2b2..483873edc80 100644 --- a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBackP/swatmedicsatchelbagfilled.yml +++ b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBackP/swatmedicsatchelbagfilled.yml @@ -1,19 +1,19 @@ -#- type: entity -# noSpawn: false -# parent: ClothingBackpackSwatMedicSatchel -# id: ClothingBackpackSwatMedicSatchelFilled -# suffix: Заполненный, Медик -# components: -# - type: StorageFill -# contents: -# - id: WeaponRifleM4 -# - id: MagazineLightRifle -# - id: MagazineLightRifle -# - id: MagazineLightRifle -# - id: MagazineBoxLightRifle -# - id: Defibrillator -# - id: WeaponDisabler -# - id: Crowbar -# - id: MedkitCombatSwatFilled -# - id: Flare -# - id: Flash +- type: entity + noSpawn: false + parent: ClothingBackpackSwatMedicSatchel + id: ClothingBackpackSwatMedicSatchelFilled + suffix: Андромеда, Заполненный, Медик + components: + - type: StorageFill + contents: + - id: WeaponRifleM4 + - id: MagazineLightRifle + - id: MagazineLightRifle + - id: MagazineLightRifle + - id: MagazineBoxLightRifle + - id: Defibrillator + - id: WeaponDisabler + - id: Crowbar + - id: MedkitCombatSwatFilled + - id: Flare + - id: Flash diff --git a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBackP/swatsatchelbagfilled.yml b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBackP/swatsatchelbagfilled.yml index d0afd823971..7c5c1f22281 100644 --- a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBackP/swatsatchelbagfilled.yml +++ b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBackP/swatsatchelbagfilled.yml @@ -1,22 +1,22 @@ -#- type: entity -# noSpawn: false -# parent: ClothingBackpackSwatSatchel -# id: ClothingBackpackSwatSatchelStandartFilled -# suffix: Заполненный, Стандарт -# components: -# - type: StorageFill -# contents: -# - id: WeaponRifleM4 -# - id: MagazineLightRifle -# - id: MagazineLightRifle -# - id: MagazineLightRifle -# - id: MagazineBoxLightRifle -# - id: WeaponDisabler -# - id: Crowbar -# - id: BoxHandcuff -# - id: MedkitFilled -# - id: Flare -# - id: Flare -# - id: Flare -# - id: Flash -# - id: Flash +- type: entity + noSpawn: false + parent: ClothingBackpackSwatSatchel + id: ClothingBackpackSwatSatchelStandartFilled + suffix: Андромеда, Заполненный, Стандарт + components: + - type: StorageFill + contents: + - id: WeaponRifleM4 + - id: MagazineLightRifle + - id: MagazineLightRifle + - id: MagazineLightRifle + - id: MagazineBoxLightRifle + - id: WeaponDisabler + - id: Crowbar + - id: BoxHandcuff + - id: MedkitFilled + - id: Flare + - id: Flare + - id: Flare + - id: Flash + - id: Flash diff --git a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBeltP/swatleaderweddingfilled.yml b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBeltP/swatleaderweddingfilled.yml index 170279b9d04..19c2abd18aa 100644 --- a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBeltP/swatleaderweddingfilled.yml +++ b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBeltP/swatleaderweddingfilled.yml @@ -2,7 +2,7 @@ noSpawn: false parent: ClothingBeltSwatWedding id: ClothingBeltSwatLeaderWeddingFilled - suffix: Заполненный, Лидер + suffix: Андромеда, Заполненный, Лидер components: - type: StorageFill contents: diff --git a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBeltP/swatmedicweddingfilled.yml b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBeltP/swatmedicweddingfilled.yml index e86274acd0e..0a14d117917 100644 --- a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBeltP/swatmedicweddingfilled.yml +++ b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBeltP/swatmedicweddingfilled.yml @@ -2,7 +2,7 @@ noSpawn: false parent: ClothingBeltSwatMedicWedding id: ClothingBeltSwatMedicWeddingFilled - suffix: Заполненная, Медик + suffix: Андромеда, Заполненная, Медик components: - type: StorageFill contents: diff --git a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBeltP/swatweddingfilled.yml b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBeltP/swatweddingfilled.yml index 66a91fe58ac..aa7ff8cea45 100644 --- a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBeltP/swatweddingfilled.yml +++ b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatFilled/SwatBeltP/swatweddingfilled.yml @@ -2,7 +2,7 @@ noSpawn: false parent: ClothingBeltSwatWedding id: ClothingBeltSwatWeddingStandartFilled - suffix: Заполненный, Стандарт + suffix: Андромеда, Заполненный, Стандарт components: - type: StorageFill contents: diff --git a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatJobs/SwatStartingGearP/SwatLeaderGear.yml b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatJobs/SwatStartingGearP/SwatLeaderGear.yml index bbb8451d17a..ee44e614a51 100644 --- a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatJobs/SwatStartingGearP/SwatLeaderGear.yml +++ b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatJobs/SwatStartingGearP/SwatLeaderGear.yml @@ -16,6 +16,6 @@ pocket2: WeaponFlareGun innerclothingskirt: ClothingUniformJumpskirtSwat satchel: ClothingBackpackSwatLeaderSatchelFilled -# duffelbag: ClothingBackpackSwatLeaderDuffelFilled + duffelbag: ClothingBackpackSwatLeaderDuffelFilled underweart: ClothingUnderwearTopBraWhite underwearb: ClothingUnderwearBottomPantiesWhite diff --git a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatJobs/SwatStartingGearP/SwatLeaderGearEVA.yml b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatJobs/SwatStartingGearP/SwatLeaderGearEVA.yml index e30ae10ddfc..6483ce36685 100644 --- a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatJobs/SwatStartingGearP/SwatLeaderGearEVA.yml +++ b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatJobs/SwatStartingGearP/SwatLeaderGearEVA.yml @@ -16,6 +16,6 @@ pocket2: WeaponFlareGun innerclothingskirt: ClothingUniformJumpskirtSwat satchel: ClothingBackpackSwatLeaderSatchelFilled -# duffelbag: ClothingBackpackSwatLeaderDuffelFilled + duffelbag: ClothingBackpackSwatLeaderDuffelFilled underweart: ClothingUnderwearTopBraWhite underwearb: ClothingUnderwearBottomPantiesWhite diff --git a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatJobs/SwatStartingGearP/SwatMedicGear.yml b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatJobs/SwatStartingGearP/SwatMedicGear.yml index bf92712fc95..5a3943aca42 100644 --- a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatJobs/SwatStartingGearP/SwatMedicGear.yml +++ b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatJobs/SwatStartingGearP/SwatMedicGear.yml @@ -17,7 +17,7 @@ inhand: - MedkitCombatSwatFilled innerclothingskirt: ClothingUniformJumpskirtMedicSwat -# satchel: ClothingBackpackSwatMedicSatchelFilled -# duffelbag: ClothingBackpackSwatMedicDuffelFilled + satchel: ClothingBackpackSwatMedicSatchelFilled + duffelbag: ClothingBackpackSwatMedicDuffelFilled underweart: ClothingUnderwearTopBraWhite underwearb: ClothingUnderwearBottomPantiesWhite diff --git a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatJobs/SwatStartingGearP/SwatMedicGearEVA.yml b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatJobs/SwatStartingGearP/SwatMedicGearEVA.yml index bbd392a46a8..9d202a56ca5 100644 --- a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatJobs/SwatStartingGearP/SwatMedicGearEVA.yml +++ b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatJobs/SwatStartingGearP/SwatMedicGearEVA.yml @@ -17,7 +17,7 @@ inhand: - MedkitCombatSwatFilled innerclothingskirt: ClothingUniformJumpskirtMedicSwat -# satchel: ClothingBackpackSwatMedicSatchelFilled -# duffelbag: ClothingBackpackSwatMedicDuffelFilled + satchel: ClothingBackpackSwatMedicSatchelFilled + duffelbag: ClothingBackpackSwatMedicDuffelFilled underweart: ClothingUnderwearTopBraWhite underwearb: ClothingUnderwearBottomPantiesWhite diff --git a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatJobs/SwatStartingGearP/SwatStandartGear.yml b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatJobs/SwatStartingGearP/SwatStandartGear.yml index 2784cb4bd2e..a1f72a712a9 100644 --- a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatJobs/SwatStartingGearP/SwatStandartGear.yml +++ b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatJobs/SwatStartingGearP/SwatStandartGear.yml @@ -15,7 +15,7 @@ pocket1: ClothingHeadHelmetHeavySwat pocket2: WeaponFlareGun innerclothingskirt: ClothingUniformJumpskirtSwat -# satchel: ClothingBackpackSwatSatchelStandartFilled -# duffelbag: ClothingBackpackSwatDuffelStandartFilled + satchel: ClothingBackpackSwatSatchelStandartFilled + duffelbag: ClothingBackpackSwatDuffelStandartFilled underweart: ClothingUnderwearTopBraWhite underwearb: ClothingUnderwearBottomPantiesWhite diff --git a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatJobs/SwatStartingGearP/SwatStandartGearEVA.yml b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatJobs/SwatStartingGearP/SwatStandartGearEVA.yml index e11f7ec9e0a..e5a428de01d 100644 --- a/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatJobs/SwatStartingGearP/SwatStandartGearEVA.yml +++ b/Resources/Prototypes/Andromeda/Kira's Prototypes/SwatPrototype/SwatJobs/SwatStartingGearP/SwatStandartGearEVA.yml @@ -2,7 +2,7 @@ id: SwatStandartGearEVA equipment: jumpsuit: ClothingUniformJumpsuitSwat -# back: ClothingSwatBackpackStandartFilled + back: ClothingSwatBackpackStandartFilled shoes: ClothingShoesSwatBoots head: ClothingHeadHatBeretSwat eyes: ClothingEyesGlassesTacticalSwat @@ -15,7 +15,7 @@ pocket1: ClothingHeadHelmetHeavySwat pocket2: WeaponFlareGun innerclothingskirt: ClothingUniformJumpskirtSwat -# satchel: ClothingBackpackSwatSatchelFilled + satchel: ClothingBackpackSwatSatchelFilled duffelbag: ClothingBackpackSwatDuffelFilled underweart: ClothingUnderwearTopBraWhite underwearb: ClothingUnderwearBottomPantiesWhite From cc90948199e86e7bf3ac1a7c56bb4b8d08fa7bf4 Mon Sep 17 00:00:00 2001 From: Lemirda <142801986+Lemirda@users.noreply.github.com> Date: Wed, 29 May 2024 16:40:42 +0300 Subject: [PATCH 2/2] fix evrozor prototypes --- .../Other/Alconomicon.yml | 84 ++++++++--------- .../Other/horny_bible.yml | 92 +++++++++---------- 2 files changed, 88 insertions(+), 88 deletions(-) diff --git a/Resources/Prototypes/Andromeda/Evrozor's Prototypes/Other/Alconomicon.yml b/Resources/Prototypes/Andromeda/Evrozor's Prototypes/Other/Alconomicon.yml index b92de923c6a..34fdceff65b 100644 --- a/Resources/Prototypes/Andromeda/Evrozor's Prototypes/Other/Alconomicon.yml +++ b/Resources/Prototypes/Andromeda/Evrozor's Prototypes/Other/Alconomicon.yml @@ -1,42 +1,42 @@ -#- type: entity -# name: алкономикон -# description: По мановению руки может наслать жесткий бодун. -# parent: BaseItem -# id: Alconomicon -# suffix: Андромеда -# components: -# - type: Sprite -# sprite: Andromeda/Evrozor/Other/alconomicon.rsi -# state: icon -# - type: Item -# size: Small -# sprite: Andromeda/Evrozor/Other/alconomicon.rsi -# - type: Clothing -# slots: -# - Belt -# - type: Tag -# tags: -# - Book -# - type: SolutionContainerManager -# solutions: -# essence: -# maxVol: 50 -# reagents: -# - ReagentId: Ethanol -# Quantity: 50 -# - type: SolutionRegeneration -# solution: essence -# generated: -# reagents: -# - ReagentId: Ethanol -# Quantity: 7 -# - type: InjectableSolution -# solution: essence -# - type: RefillableSolution -# solution: essence -# - type: Hypospray -# solutionName: essence -# transferAmount: 7 -# - type: UseDelay -# delay: 40 -# +- type: entity + name: алкономикон + description: По мановению руки может наслать жесткий бодун. + parent: BaseItem + id: Alconomicon + suffix: Андромеда + components: + - type: Sprite + sprite: Andromeda/Evrozor/Other/alconomicon.rsi + state: icon + - type: Item + size: Small + sprite: Andromeda/Evrozor/Other/alconomicon.rsi + - type: Clothing + slots: + - Belt + - type: Tag + tags: + - Book + - type: SolutionContainerManager + solutions: + essence: + maxVol: 50 + reagents: + - ReagentId: Ethanol + Quantity: 50 + - type: SolutionRegeneration + solution: essence + generated: + reagents: + - ReagentId: Ethanol + Quantity: 7 + - type: InjectableSolution + solution: essence + - type: RefillableSolution + solution: essence + - type: Hypospray + onlyAffectsMobs: false + solutionName: essence + transferAmount: 7 + - type: UseDelay + delay: 40 \ No newline at end of file diff --git a/Resources/Prototypes/Andromeda/Evrozor's Prototypes/Other/horny_bible.yml b/Resources/Prototypes/Andromeda/Evrozor's Prototypes/Other/horny_bible.yml index 1a71fe3dd61..965a70e588e 100644 --- a/Resources/Prototypes/Andromeda/Evrozor's Prototypes/Other/horny_bible.yml +++ b/Resources/Prototypes/Andromeda/Evrozor's Prototypes/Other/horny_bible.yml @@ -1,46 +1,46 @@ -#- type: entity -# name: священная книга похоти -# description: Эта книга наполняет окружающих чувством любви. -# parent: BaseItem -# id: HornyBible -# suffix: Андромеда, НЕ МАППИТЬ! -# components: -## - type: Prayable -## bibleUserOnly: true -# - type: Sprite -# sprite: Andromeda/Evrozor/Other/horny_bible.rsi -# state: icon -# - type: Item -# size: Small -# sprite: Andromeda/Evrozor/Other/horny_bible.rsi -# - type: Clothing -# slots: -# - Belt -# - type: Tag -# tags: -# - Book -# - type: SolutionContainerManager -# solutions: -# essence: -# maxVol: 300 -# reagents: -# - ReagentId: Aphrodisiac -# Quantity: 300 -# - type: SolutionRegeneration -# solution: essence -# generated: -# reagents: -# - ReagentId: Aphrodisiac -# Quantity: 30 -# - type: InjectableSolution -# solution: essence -# - type: RefillableSolution -# solution: essence -## - type: ExaminableSolution -## solution: essence -# - type: Hypospray -# solutionName: essence -# transferAmount: 10 -# - type: UseDelay -# delay: 60 -# +- type: entity + name: священная книга похоти + description: Эта книга наполняет окружающих чувством любви. + parent: BaseItem + id: HornyBible + suffix: Андромеда, НЕ МАППИТЬ! + components: + - type: Prayable + bibleUserOnly: true + - type: Sprite + sprite: Andromeda/Evrozor/Other/horny_bible.rsi + state: icon + - type: Item + size: Small + sprite: Andromeda/Evrozor/Other/horny_bible.rsi + - type: Clothing + slots: + - Belt + - type: Tag + tags: + - Book + - type: SolutionContainerManager + solutions: + essence: + maxVol: 300 + reagents: + - ReagentId: Aphrodisiac + Quantity: 300 + - type: SolutionRegeneration + solution: essence + generated: + reagents: + - ReagentId: Aphrodisiac + Quantity: 30 + - type: InjectableSolution + solution: essence + - type: RefillableSolution + solution: essence + - type: ExaminableSolution + solution: essence + - type: Hypospray + onlyAffectsMobs: false + solutionName: essence + transferAmount: 10 + - type: UseDelay + delay: 60 \ No newline at end of file