From e9f5ff565a8b013650228329f9317a8ac431a039 Mon Sep 17 00:00:00 2001 From: TAZIKLIK <73418250+Evgencheg@users.noreply.github.com> Date: Wed, 4 Sep 2024 23:40:06 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BA=D0=BE=D1=80=D0=BE=D1=87=D0=B5=20=D0=BF?= =?UTF-8?q?=D0=BE=D1=81=D0=BB=D0=B5=D0=B4=D0=BD=D0=B8=D0=B5=20=D1=84=D0=B8?= =?UTF-8?q?=D0=BA=D1=81=D1=8B,=20=D1=8F=20=D1=83=D1=81=D1=82=D0=B0=D0=BB.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prototypes/Catalog/uplink_catalog.yml | 2 +- .../Entities/Structures/Machines/lathe.yml | 8 +- .../Catalog/cburn_defence_catalog.yml | 18 +- .../Furniture/Table/black_plastitanium.yml | 392 ------------------ .../Structures/Furniture/Table/titanium.yml | 392 ------------------ .../Entities/Structures/Furniture/chairs.yml | 2 +- .../Windows/plastitanium_window.yml | 180 -------- .../Prototypes/_LostParadise/Reagents/fun.yml | 2 - .../_LostParadise/Reagents/narcotics.yml | 1 - .../_LostParadise/Reagents/toxins.yml | 1 - .../Furniture/tables/black_plastitanium.yml | 36 -- .../Graphs/furniture/tables/Titanium.yml | 162 -------- .../furniture/tables/black_plastitanium.yml | 138 ------ .../Jobs/CentCom/centcom_representative.yml | 2 - .../Roles/Jobs/CentCom/chronolegioner.yml | 2 +- .../Stacks/Materials/Sheets/glass.yml | 16 - .../Stacks/Materials/Sheets/metal.yml | 17 - 17 files changed, 16 insertions(+), 1355 deletions(-) delete mode 100644 Resources/Prototypes/_LostParadise/Entities/Structures/Furniture/Table/black_plastitanium.yml delete mode 100644 Resources/Prototypes/_LostParadise/Entities/Structures/Furniture/Table/titanium.yml delete mode 100644 Resources/Prototypes/_LostParadise/Entities/Structures/Windows/plastitanium_window.yml delete mode 100644 Resources/Prototypes/_LostParadise/Recipes/Construction/Furniture/tables/black_plastitanium.yml delete mode 100644 Resources/Prototypes/_LostParadise/Recipes/Construction/Graphs/furniture/tables/Titanium.yml delete mode 100644 Resources/Prototypes/_LostParadise/Recipes/Construction/Graphs/furniture/tables/black_plastitanium.yml delete mode 100644 Resources/Prototypes/_LostParadise/Stacks/Materials/Sheets/glass.yml delete mode 100644 Resources/Prototypes/_LostParadise/Stacks/Materials/Sheets/metal.yml diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 64a878862c..14f6a5512d 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1758,7 +1758,7 @@ id: LPPUplinkhelmetswat name: шлем спецназа синдиката description: Крепкий шлем, что защитит вашу голову от ненужных свинцовых, а так же лазерных выстрелов. - icon: { sprite: Textures/Clothing/Head/Helmets/swat_syndicate.rsi, state: icon } + icon: { sprite: Clothing/Head/Helmets/swat_syndicate.rsi, state: icon } productEntity: ClothingHeadHelmetSwatSyndicate cost: Telecrystal: 2 diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 40c59dd4b6..d0432815cb 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -633,10 +633,10 @@ - JetpackMini # End Nyano additions # Lost Paradise: start - - LPPERPModuleBorg - - LPPDroneModuleSecurityTaser - - LPPBorgModuleAresst - - LPPBattleBorgModule +# - LPPERPModuleBorg +# - LPPDroneModuleSecurityTaser +# - LPPBorgModuleAresst +# - LPPBattleBorgModule # Lost Paradise: end - type: MaterialStorage whitelist: diff --git a/Resources/Prototypes/_LostParadise/Catalog/cburn_defence_catalog.yml b/Resources/Prototypes/_LostParadise/Catalog/cburn_defence_catalog.yml index a9d388f1aa..8192d6f892 100644 --- a/Resources/Prototypes/_LostParadise/Catalog/cburn_defence_catalog.yml +++ b/Resources/Prototypes/_LostParadise/Catalog/cburn_defence_catalog.yml @@ -100,15 +100,15 @@ categories: - LPPCBURNArmor -- type: listing - id: LPPCBURNCatalogArmorExosuitCommander - name: cburn-catalog-armor-exosuit-com-name - description: cburn-catalog-armor-exosuit-com-desc - productEntity: ClothingOuterHardsuitCBURNLeader - cost: - Telecrystal: 10 - categories: - - LPPCBURNArmor +#- type: listing +# id: LPPCBURNCatalogArmorExosuitCommander +# name: cburn-catalog-armor-exosuit-com-name +# description: cburn-catalog-armor-exosuit-com-desc +# productEntity: ClothingOuterHardsuitCBURNLeader +# cost: +# Telecrystal: 10 +# categories: +# - LPPCBURNArmor - type: listing id: LPPCBURNCatalogArmorGasMask diff --git a/Resources/Prototypes/_LostParadise/Entities/Structures/Furniture/Table/black_plastitanium.yml b/Resources/Prototypes/_LostParadise/Entities/Structures/Furniture/Table/black_plastitanium.yml deleted file mode 100644 index 52d7af0fdf..0000000000 --- a/Resources/Prototypes/_LostParadise/Entities/Structures/Furniture/Table/black_plastitanium.yml +++ /dev/null @@ -1,392 +0,0 @@ -#Каркас -- type: entity - id: LPPBlackPlasTitaniumRplasma - parent: TableBase - name: black plastitanium rplasma - description: A square piece of glass plasma, standing on four metal legs. Extra robust. - components: - - type: Sprite - sprite: _LostParadise/Structures/Furniture/Tables/BlackPlastitanium/black_plastitanium_rplasma.rsi - noRot: true - - type: Icon - sprite: _LostParadise/Structures/Furniture/Tables/BlackPlastitanium/black_plastitanium_rplasma.rsi - - type: GlassTable - climberDamage: - types: - Slash: 25 - tableDamage: - types: - Blunt: 40 - tableMassLimit: 100 - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 125 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - trigger: - !type:DamageTrigger - damage: 20 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - !type:ChangeConstructionNodeBehavior - node: TableFrame - - !type:SpawnEntitiesBehavior - spawn: - ShardGlass: - min: 1 - max: 1 - PartRodMetal1: - min: 1 - max: 1 - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: Construction - graph: PlasTitanium - node: LPPBlackPlasTitaniumRplasma - footstepSoundCollection: - collection: FootstepTile - -#Покрытие -#-Деревянное -- type: entity - id: LPPBlackPlasTitaniumWood - parent: TableBase - name: black plastitanium wood - description: A square piece of glass plasma, standing on four metal legs. Extra robust. - components: - - type: Sprite - sprite: _LostParadise/Structures/Furniture/Tables/BlackPlastitanium/black_frame_wood.rsi - - type: Icon - sprite: _LostParadise/Structures/Furniture/Tables/BlackPlastitanium/black_frame_wood.rsi - - type: GlassTable - climberDamage: - types: - Slash: 25 - tableDamage: - types: - Blunt: 40 - tableMassLimit: 125 - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 150 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - trigger: - !type:DamageTrigger - damage: 20 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - !type:ChangeConstructionNodeBehavior - node: TableFrame - - !type:SpawnEntitiesBehavior - spawn: - ShardGlass: - min: 1 - max: 1 - PartRodMetal1: - min: 1 - max: 1 - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: Construction - graph: PlasTitanium - node: LPPBlackPlasTitaniumWood - - type: FootstepModifier - footstepSoundCollection: - collection: FootstepTile - -#-Стекляный -- type: entity - id: LPPBlackPlasTitaniumGlass - parent: TableBase - name: black plastitanium glass - description: A square piece of glass plasma, standing on four metal legs. Extra robust. - components: - - type: Sprite - sprite: _LostParadise/Structures/Furniture/Tables/BlackPlastitanium/black_plastitaniumglass_glass.rsi - - type: Icon - sprite: _LostParadise/Structures/Furniture/Tables/BlackPlastitanium/black_plastitaniumglass_glass.rsi - - type: GlassTable - climberDamage: - types: - Slash: 25 - tableDamage: - types: - Blunt: 40 - tableMassLimit: 100 - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 125 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - trigger: - !type:DamageTrigger - damage: 20 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - !type:ChangeConstructionNodeBehavior - node: TableFrame - - !type:SpawnEntitiesBehavior - spawn: - ShardGlass: - min: 1 - max: 1 - PartRodMetal1: - min: 1 - max: 1 - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: Construction - graph: PlasTitanium - node: LPPBlackPlasTitaniumGlass - - type: FootstepModifier - footstepSoundCollection: - collection: FootstepTile - -#-Стекляный плазменый -- type: entity - id: LPPBlackPlasTitaniumPlasma - parent: TableBase - name: black plastitanium plasma - description: A square piece of glass plasma, standing on four metal legs. Extra robust. - components: - - type: Sprite - sprite: _LostParadise/Structures/Furniture/Tables/BlackPlastitanium/black_rplasmaglass_plasma.rsi - - type: Icon - sprite: _LostParadise/Structures/Furniture/Tables/BlackPlastitanium/black_rplasmaglass_plasma.rsi - - type: GlassTable - climberDamage: - types: - Slash: 25 - tableDamage: - types: - Blunt: 40 - tableMassLimit: 125 - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 150 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - trigger: - !type:DamageTrigger - damage: 20 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - !type:ChangeConstructionNodeBehavior - node: TableFrame - - !type:SpawnEntitiesBehavior - spawn: - ShardGlass: - min: 1 - max: 1 - PartRodMetal1: - min: 1 - max: 1 - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: Construction - graph: PlasTitanium - node: LPPBlackPlasTitaniumPlasma - - type: FootstepModifier - footstepSoundCollection: - collection: FootstepTile - -#-Стекляный ураневый -- type: entity - id: LPPBlackPlasTitaniumUranium - parent: TableBase - name: black plastitanium uranium - description: A square piece of glass plasma, standing on four metal legs. Extra robust. - components: - - type: Sprite - sprite: _LostParadise/Structures/Furniture/Tables/BlackPlastitanium/black_plastitaniumglass_uranium.rsi - - type: Icon - sprite: _LostParadise/Structures/Furniture/Tables/BlackPlastitanium/black_plastitaniumglass_uranium.rsi - - type: GlassTable - climberDamage: - types: - Slash: 25 - tableDamage: - types: - Blunt: 40 - tableMassLimit: 150 - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 175 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - trigger: - !type:DamageTrigger - damage: 20 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - !type:ChangeConstructionNodeBehavior - node: TableFrame - - !type:SpawnEntitiesBehavior - spawn: - ShardGlass: - min: 1 - max: 1 - PartRodMetal1: - min: 1 - max: 1 - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: Construction - graph: PlasTitanium - node: LPPBlackPlasTitaniumUranium - - type: FootstepModifier - footstepSoundCollection: - collection: FootstepTile - -#-Титановый -- type: entity - id: LPPBlackPlasTitaniumTitanium - parent: TableBase - name: black plastitanium titanium - description: A square piece of glass plasma, standing on four metal legs. Extra robust. - components: - - type: Sprite - sprite: _LostParadise/Structures/Furniture/Tables/BlackPlastitanium/black_plastitaniumglass_titanium.rsi - - type: Icon - sprite: _LostParadise/Structures/Furniture/Tables/BlackPlastitanium/black_plastitaniumglass_titanium.rsi - - type: GlassTable - climberDamage: - types: - Slash: 25 - tableDamage: - types: - Blunt: 40 - tableMassLimit: 125 - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 150 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - trigger: - !type:DamageTrigger - damage: 20 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - !type:ChangeConstructionNodeBehavior - node: TableFrame - - !type:SpawnEntitiesBehavior - spawn: - ShardGlass: - min: 1 - max: 1 - PartRodMetal1: - min: 1 - max: 1 - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: Construction - graph: PlasTitanium - node: LPPBlackPlasTitaniumTitanium - - type: FootstepModifier - footstepSoundCollection: - collection: FootstepTile - -#-ПлазТитановый -- type: entity - id: LPPBlackPlasTitanium - parent: TableBase - name: black plastitanium - description: A square piece of glass plasma, standing on four metal legs. Extra robust. - components: - - type: Sprite - sprite: _LostParadise/Structures/Furniture/Tables/BlackPlastitanium/black_plastitaniumglass_plastitanium.rsi - - type: Icon - sprite: _LostParadise/Structures/Furniture/Tables/BlackPlastitanium/black_plastitaniumglass_plastitanium.rsi - - type: GlassTable - climberDamage: - types: - Slash: 25 - tableDamage: - types: - Blunt: 40 - tableMassLimit: 125 - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 150 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - trigger: - !type:DamageTrigger - damage: 20 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - !type:ChangeConstructionNodeBehavior - node: TableFrame - - !type:SpawnEntitiesBehavior - spawn: - ShardGlass: - min: 1 - max: 1 - PartRodMetal1: - min: 1 - max: 1 - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: FootstepModifier - footstepSoundCollection: - collection: FootstepTile - - type: Construction - graph: PlasTitanium - node: LPPBlackPlasTitanium diff --git a/Resources/Prototypes/_LostParadise/Entities/Structures/Furniture/Table/titanium.yml b/Resources/Prototypes/_LostParadise/Entities/Structures/Furniture/Table/titanium.yml deleted file mode 100644 index e1fbf440d0..0000000000 --- a/Resources/Prototypes/_LostParadise/Entities/Structures/Furniture/Table/titanium.yml +++ /dev/null @@ -1,392 +0,0 @@ -#Каркас -- type: entity - id: LPPTitaniumRplasma - parent: TableBase - name: plastitanium rplasma - description: A square piece of glass plasma, standing on four metal legs. Extra robust. - components: - - type: Sprite - sprite: _LostParadise/Structures/Furniture/Tables/Titanium/frame_rplasma.rsi - noRot: true - - type: Icon - sprite: _LostParadise/Structures/Furniture/Tables/Titanium/frame_rplasma.rsi - - type: GlassTable - climberDamage: - types: - Slash: 25 - tableDamage: - types: - Blunt: 40 - tableMassLimit: 100 - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 125 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - trigger: - !type:DamageTrigger - damage: 20 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - !type:ChangeConstructionNodeBehavior - node: TableFrame - - !type:SpawnEntitiesBehavior - spawn: - ShardGlass: - min: 1 - max: 1 - PartRodMetal1: - min: 1 - max: 1 - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: Construction - graph: Titanium - node: LPPTitaniumRplasma - footstepSoundCollection: - collection: FootstepTile - -#Покрытие -#-Деревянное -- type: entity - id: LPPTitaniumWood - parent: TableBase - name: plastitanium wood - description: A square piece of glass plasma, standing on four metal legs. Extra robust. - components: - - type: Sprite - sprite: _LostParadise/Structures/Furniture/Tables/Titanium/frame_wood.rsi - - type: Icon - sprite: _LostParadise/Structures/Furniture/Tables/Titanium/frame_wood.rsi - - type: GlassTable - climberDamage: - types: - Slash: 25 - tableDamage: - types: - Blunt: 40 - tableMassLimit: 125 - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 150 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - trigger: - !type:DamageTrigger - damage: 20 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - !type:ChangeConstructionNodeBehavior - node: TableFrame - - !type:SpawnEntitiesBehavior - spawn: - ShardGlass: - min: 1 - max: 1 - PartRodMetal1: - min: 1 - max: 1 - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: Construction - graph: Titanium - node: LPPTitaniumWood - - type: FootstepModifier - footstepSoundCollection: - collection: FootstepTile - -#-Стекляный -- type: entity - id: LPPTitaniumGlass - parent: TableBase - name: plastitanium glass - description: A square piece of glass plasma, standing on four metal legs. Extra robust. - components: - - type: Sprite - sprite: _LostParadise/Structures/Furniture/Tables/Titanium/rplasmaglass_glass.rsi - - type: Icon - sprite: _LostParadise/Structures/Furniture/Tables/Titanium/rplasmaglass_glass.rsi - - type: GlassTable - climberDamage: - types: - Slash: 25 - tableDamage: - types: - Blunt: 40 - tableMassLimit: 100 - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 125 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - trigger: - !type:DamageTrigger - damage: 20 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - !type:ChangeConstructionNodeBehavior - node: TableFrame - - !type:SpawnEntitiesBehavior - spawn: - ShardGlass: - min: 1 - max: 1 - PartRodMetal1: - min: 1 - max: 1 - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: Construction - graph: Titanium - node: LPPTitaniumGlass - - type: FootstepModifier - footstepSoundCollection: - collection: FootstepTile - -#-Стекляный плазменый -- type: entity - id: LPPTitaniumPlasma - parent: TableBase - name: plastitanium plasma - description: A square piece of glass plasma, standing on four metal legs. Extra robust. - components: - - type: Sprite - sprite: _LostParadise/Structures/Furniture/Tables/Titanium/rplasmaglass_plasma.rsi - - type: Icon - sprite: _LostParadise/Structures/Furniture/Tables/Titanium/rplasmaglass_plasma.rsi - - type: GlassTable - climberDamage: - types: - Slash: 25 - tableDamage: - types: - Blunt: 40 - tableMassLimit: 125 - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 150 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - trigger: - !type:DamageTrigger - damage: 20 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - !type:ChangeConstructionNodeBehavior - node: TableFrame - - !type:SpawnEntitiesBehavior - spawn: - ShardGlass: - min: 1 - max: 1 - PartRodMetal1: - min: 1 - max: 1 - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: Construction - graph: Titanium - node: LPPTitaniumPlasma - - type: FootstepModifier - footstepSoundCollection: - collection: FootstepTile - -#-Стекляный ураневый -- type: entity - id: LPPTitaniumUranium - parent: TableBase - name: plastitanium uranium - description: A square piece of glass plasma, standing on four metal legs. Extra robust. - components: - - type: Sprite - sprite: _LostParadise/Structures/Furniture/Tables/Titanium/rplasmaglass_uranium.rsi - - type: Icon - sprite: _LostParadise/Structures/Furniture/Tables/Titanium/rplasmaglass_uranium.rsi - - type: GlassTable - climberDamage: - types: - Slash: 25 - tableDamage: - types: - Blunt: 40 - tableMassLimit: 150 - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 175 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - trigger: - !type:DamageTrigger - damage: 20 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - !type:ChangeConstructionNodeBehavior - node: TableFrame - - !type:SpawnEntitiesBehavior - spawn: - ShardGlass: - min: 1 - max: 1 - PartRodMetal1: - min: 1 - max: 1 - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: Construction - graph: Titanium - node: LPPTitaniumUranium - - type: FootstepModifier - footstepSoundCollection: - collection: FootstepTile - -#-Титановый -- type: entity - id: LPPTitanium - parent: TableBase - name: titanium titanium - description: A square piece of glass plasma, standing on four metal legs. Extra robust. - components: - - type: Sprite - sprite: _LostParadise/Structures/Furniture/Tables/Titanium/rplasmaglass_titanium.rsi - - type: Icon - sprite: _LostParadise/Structures/Furniture/Tables/Titanium/rplasmaglass_titanium.rsi - - type: GlassTable - climberDamage: - types: - Slash: 25 - tableDamage: - types: - Blunt: 40 - tableMassLimit: 125 - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 150 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - trigger: - !type:DamageTrigger - damage: 20 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - !type:ChangeConstructionNodeBehavior - node: TableFrame - - !type:SpawnEntitiesBehavior - spawn: - ShardGlass: - min: 1 - max: 1 - PartRodMetal1: - min: 1 - max: 1 - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: Construction - graph: Titanium - node: LPPTitanium - - type: FootstepModifier - footstepSoundCollection: - collection: FootstepTile - -#-ПлазТитановый -- type: entity - id: LPPPlasTitanium - parent: TableBase - name: titanium plastitanium - description: A square piece of glass plasma, standing on four metal legs. Extra robust. - components: - - type: Sprite - sprite: _LostParadise/Structures/Furniture/Tables/Titanium/rplasmaglass_plastitanium.rsi - - type: Icon - sprite: _LostParadise/Structures/Furniture/Tables/Titanium/rplasmaglass_plastitanium.rsi - - type: GlassTable - climberDamage: - types: - Slash: 25 - tableDamage: - types: - Blunt: 40 - tableMassLimit: 125 - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 150 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - trigger: - !type:DamageTrigger - damage: 20 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - !type:ChangeConstructionNodeBehavior - node: TableFrame - - !type:SpawnEntitiesBehavior - spawn: - ShardGlass: - min: 1 - max: 1 - PartRodMetal1: - min: 1 - max: 1 - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: FootstepModifier - footstepSoundCollection: - collection: FootstepTile - - type: Construction - graph: Titanium - node: LPPPlasTitanium diff --git a/Resources/Prototypes/_LostParadise/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/_LostParadise/Entities/Structures/Furniture/chairs.yml index b12556f768..af04548dad 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Structures/Furniture/chairs.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Structures/Furniture/chairs.yml @@ -45,7 +45,7 @@ acts: ["Destruction"] - !type:PlaySoundBehavior sound: - path: /Audio/Effects/metalbreak.ogg + path: /Audio/Effects/metal_break1.ogg - type: StaticPrice price: 10 #_________________________________________ diff --git a/Resources/Prototypes/_LostParadise/Entities/Structures/Windows/plastitanium_window.yml b/Resources/Prototypes/_LostParadise/Entities/Structures/Windows/plastitanium_window.yml deleted file mode 100644 index 3d6c7c16f0..0000000000 --- a/Resources/Prototypes/_LostParadise/Entities/Structures/Windows/plastitanium_window.yml +++ /dev/null @@ -1,180 +0,0 @@ -#- type: entity -# parent: Window -# id: PlastitaniumWindow -# name: plastitanium window -# components: -# - type: Sprite -# drawdepth: WallTops -# sprite: _LostParadise/Structures/Windows/plastitanium-window.rsi -# noRot: false -# - type: Icon -# sprite: _LostParadise/Structures/Windows/plastitanium-window.rsi -# state: full -# - type: Repairable -# fuelCost: 15 -# doAfterDelay: 3 -# - type: Damageable -# damageContainer: StructuralInorganic -# damageModifierSet: RGlass -# - type: Destructible -# thresholds: -# - trigger: -# !type:DamageTrigger -# damage: 1200 -# behaviors: -# - !type:DoActsBehavior -# acts: [ "Destruction" ] -# - trigger: -# !type:DamageTrigger -# damage: 1600 -# behaviors: -# - !type:PlaySoundBehavior -# sound: -# collection: WindowShatter -# - !type:SpawnEntitiesBehavior -# spawn: -# ShardGlassReinforced: -# min: 1 -# max: 2 -# PartRodMetal: -# min: 1 -# max: 2 -# - !type:DoActsBehavior -# acts: [ "Destruction" ] -# - type: IconSmooth -# base: swindow -# - type: Construction -# graph: PlastitaniumWindow -# node: PlastitaniumWindow -# - type: Appearance -# - type: DamageVisuals -# thresholds: [4, 8, 12] -# damageDivisor: 50 -# trackAllDamage: true -# damageOverlay: -# sprite: Structures/Windows/cracks.rsi -# - type: StaticPrice -# price: 100 -# -#- type: entity -# id: PlastitaniumWindowDiagonal -# name: plastitanium window (corner) -# placement: -# mode: SnapgridCenter -# snap: -# - Window -# components: -# - type: Transform -# anchored: true -# - type: Clickable -# - type: Tag -# tags: -# - Window -# - type: Sprite -# drawdepth: Walls -# sprite: _LostParadise/Structures/Windows/plastitanium-window-diagonal.rsi -# state: state0 -# noRot: false -# - type: IconSmooth -# mode: Diagonal -# key: walls -# base: state -# - type: Icon -# sprite: _LostParadise/Structures/Windows/plastitanium-window-diagonal.rsi -# state: state0 -# - type: Damageable -# damageContainer: StructuralInorganic -# damageModifierSet: RGlass -# - type: Physics -# bodyType: Static -# - type: Pullable -# - type: Airtight -# noAirWhenFullyAirBlocked: false -# airBlockedDirection: -# - South -# - East -# - type: Fixtures -# fixtures: -# fix1: -# shape: -# !type:PolygonShape -# vertices: -# - "-0.5,-0.5" -# - "0.5,0.5" -# - "0.5,-0.5" -# mask: -# - FullTileMask -# layer: -# - WallLayer -# - type: Destructible -# thresholds: -# - trigger: -# !type:DamageTrigger -# damage: 1200 -# behaviors: -# - !type:DoActsBehavior -# acts: [ "Destruction" ] -# - trigger: -# !type:DamageTrigger -# damage: 1600 -# behaviors: -# - !type:PlaySoundBehavior -# sound: -# path: /Audio/Effects/glass_step.ogg -# - !type:DoActsBehavior -# acts: ["Destruction"] -# destroySound: -# path: /Audio/Effects/glass_hit.ogg -# - type: InteractionPopup -# interactSuccessString: comp-window-knock -# messagePerceivedByOthers: comp-window-knock -# interactSuccessSound: -# path: /Audio/Effects/glass_knock.ogg -# - type: Appearance -# - type: DamageVisuals -# thresholds: [4, 8, 12] -# damageDivisor: 50 -# trackAllDamage: true -# damageOverlay: -# sprite: Structures/Windows/cracks_diagonal.rsi -# - type: StaticPrice -# price: 100 -# -# -##- type: entity -## parent: LPPPlastitaniumWindow -## id: LPPPlastitaniumWindowDiagonal -## suffix: diagonal -## placement: -## mode: SnapgridCenter -## snap: -## - Window -## components: -## - type: Sprite -## drawdepth: WallTops -## sprite: _LostParadise/Structures/Windows/plastitanium-window-diagonal.rsi -## state: state0 -## - type: IconSmooth -## mode: Diagonal -## key: walls # Corvax-Resprite -## base: state -## - type: Icon -## sprite: _LostParadise/Structures/Windows/shuttle-window-diagonal.rsi -## state: state0 -## - type: Fixtures -## fixtures: -## fix1: -## shape: -## !type:PolygonShape -## vertices: -## - "-0.5,-0.5" -## - "0.5,0.5" -## - "0.5,-0.5" -## mask: -## - FullTileMask -## layer: -## - GlassLayer -## - type: DamageVisuals -## damageOverlay: -## sprite: Structures/Windows/cracks_diagonal.rsi -# diff --git a/Resources/Prototypes/_LostParadise/Reagents/fun.yml b/Resources/Prototypes/_LostParadise/Reagents/fun.yml index 32c91dbb71..d8cfeab833 100644 --- a/Resources/Prototypes/_LostParadise/Reagents/fun.yml +++ b/Resources/Prototypes/_LostParadise/Reagents/fun.yml @@ -5,7 +5,6 @@ physicalDesc: ароматное group: Narcotics color: "#FF1493" - hideFromGuide: true metabolisms: Poison: effects: @@ -98,7 +97,6 @@ physicalDesc: ароматное group: Narcotics color: "#F50ACE" - hideFromGuide: true metabolisms: Poison: effects: diff --git a/Resources/Prototypes/_LostParadise/Reagents/narcotics.yml b/Resources/Prototypes/_LostParadise/Reagents/narcotics.yml index ef9eb98a52..d61d0ee726 100644 --- a/Resources/Prototypes/_LostParadise/Reagents/narcotics.yml +++ b/Resources/Prototypes/_LostParadise/Reagents/narcotics.yml @@ -5,7 +5,6 @@ physicalDesc: концентрированное зло group: Narcotics color: "#000000" - hideFromGuide: true metabolisms: Narcotic: effects: diff --git a/Resources/Prototypes/_LostParadise/Reagents/toxins.yml b/Resources/Prototypes/_LostParadise/Reagents/toxins.yml index 38e9fcf40d..0714582738 100644 --- a/Resources/Prototypes/_LostParadise/Reagents/toxins.yml +++ b/Resources/Prototypes/_LostParadise/Reagents/toxins.yml @@ -4,7 +4,6 @@ desc: Результат гниения physicalDesc: гниющее color: "#2F4F4F" - hideFromGuide: true metabolisms: Poison: effects: diff --git a/Resources/Prototypes/_LostParadise/Recipes/Construction/Furniture/tables/black_plastitanium.yml b/Resources/Prototypes/_LostParadise/Recipes/Construction/Furniture/tables/black_plastitanium.yml deleted file mode 100644 index 6f4d57ebf9..0000000000 --- a/Resources/Prototypes/_LostParadise/Recipes/Construction/Furniture/tables/black_plastitanium.yml +++ /dev/null @@ -1,36 +0,0 @@ -#______________________________________# -#________________Каркас________________# -#______________________________________# -- type: construction - name: каркас пластитан - id: LPPBlackPlasTitaniumRplasma - graph: PlasTitanium - startNode: start - targetNode: LPPBlackPlasTitaniumRplasma - category: construction-category-structures - description: Что то мрачное и темное... - conditions: - - !type:TileNotBlocked - icon: - sprite: _LostParadise/Structures/Furniture/Tables/BlackPlastitanium/black_plastitanium_rplasma.rsi - state: full - objectType: Structure - placementMode: SnapgridCenter - canBuildInImpassable: false - -- type: construction - name: каркас титан - id: LPPTitaniumRplasma - graph: Titanium - startNode: start - targetNode: LPPTitaniumRplasma - category: construction-category-structures - description: Что то красивое и белое... - conditions: - - !type:TileNotBlocked - icon: - sprite: _LostParadise/Structures/Furniture/Tables/Titanium/frame_rplasma.rsi - state: full - objectType: Structure - placementMode: SnapgridCenter - canBuildInImpassable: false diff --git a/Resources/Prototypes/_LostParadise/Recipes/Construction/Graphs/furniture/tables/Titanium.yml b/Resources/Prototypes/_LostParadise/Recipes/Construction/Graphs/furniture/tables/Titanium.yml deleted file mode 100644 index 239e4349dd..0000000000 --- a/Resources/Prototypes/_LostParadise/Recipes/Construction/Graphs/furniture/tables/Titanium.yml +++ /dev/null @@ -1,162 +0,0 @@ -- type: constructionGraph - id: Titanium - start: start - graph: - - node: start - actions: - - !type:DeleteEntity {} - edges: - - to: LPPTitaniumRplasma - completed: - - !type:SnapToGrid - southRotation: true - steps: - - material: Titanium - amount: 2 - doAfter: 1 - - - node: LPPTitaniumRplasma - entity: LPPTitaniumRplasma - edges: - - to: start - completed: - - !type:SpawnPrototype - prototype: SheetPlastitanium1 - amount: 2 - steps: - - tool: Anchoring - doAfter: 1.5 - - - to: LPPTitaniumWood - steps: - - material: WoodPlank - amount: 1 - doAfter: 1 - - - to: LPPTitaniumGlass - steps: - - material: Glass - amount: 1 - doAfter: 1 - - - to: LPPTitaniumPlasma - steps: - - material: PlasmaGlass - amount: 1 - doAfter: 1 - - - to: LPPTitaniumUranium - steps: - - material: UraniumGlass - amount: 1 - doAfter: 1 - - - to: LPPTitanium - steps: - - material: Titanium - amount: 1 - doAfter: 1 - - - to: LPPPlasTitanium - steps: - - material: Plastitanium - amount: 1 - doAfter: 1 - -#---разборки - - - node: LPPTitaniumWood - entity: LPPTitaniumWood - edges: - - to: LPPTitaniumRplasma - completed: - - !type:SpawnPrototype - prototype: MaterialWoodPlank1 - amount: 1 - steps: - - tool: Prying - doAfter: 1 - - - node: LPPTitaniumGlass - entity: LPPTitaniumGlass - edges: - - to: LPPTitaniumRplasma - completed: - - !type:SpawnPrototype - prototype: SheetGlass1 - amount: 1 - steps: - - tool: Prying - doAfter: 1 - - - node: LPPTitaniumPlasma - entity: LPPTitaniumPlasma - edges: - - to: LPPTitaniumRplasma - completed: - - !type:SpawnPrototype - prototype: SheetPGlass1 - amount: 1 - steps: - - tool: Prying - doAfter: 1 - - - node: LPPTitaniumUranium - entity: LPPTitaniumUranium - edges: - - to: LPPTitaniumRplasma - completed: - - !type:SpawnPrototype - prototype: SheetUGlass1 - amount: 1 - steps: - - tool: Prying - doAfter: 1 - - - node: LPPTitanium - entity: LPPTitanium - edges: - - to: LPPTitaniumRplasma - completed: - - !type:SpawnPrototype - prototype: SheetTitanium1 - amount: 1 - steps: - - tool: Prying - doAfter: 1 - - - node: LPPPlasTitanium - entity: LPPPlasTitanium - edges: - - to: LPPTitaniumRplasma - completed: - - !type:SpawnPrototype - prototype: SheetPlastitanium1 - amount: 1 - steps: - - tool: Prying - doAfter: 1 - - - node: TableReinforced - entity: TableReinforced - edges: - - to: LPPTitaniumRplasma - completed: - - !type:SpawnPrototype - prototype: SheetTitanium1 - amount: 1 - steps: - - tool: Prying - doAfter: 1 - - - node: TableReinforcedGlass - entity: TableReinforcedGlass - edges: - - to: LPPTitaniumRplasma - completed: - - !type:SpawnPrototype - prototype: SheetRGlass1 - amount: 1 - steps: - - tool: Anchoring - doAfter: 1 diff --git a/Resources/Prototypes/_LostParadise/Recipes/Construction/Graphs/furniture/tables/black_plastitanium.yml b/Resources/Prototypes/_LostParadise/Recipes/Construction/Graphs/furniture/tables/black_plastitanium.yml deleted file mode 100644 index 1e5e71cb4e..0000000000 --- a/Resources/Prototypes/_LostParadise/Recipes/Construction/Graphs/furniture/tables/black_plastitanium.yml +++ /dev/null @@ -1,138 +0,0 @@ -- type: constructionGraph - id: PlasTitanium - start: start - graph: - - node: start - actions: - - !type:DeleteEntity {} - edges: - - to: LPPBlackPlasTitaniumRplasma - completed: - - !type:SnapToGrid - southRotation: true - steps: - - material: Plastitanium - amount: 2 - doAfter: 1 - - - node: LPPBlackPlasTitaniumRplasma - entity: LPPBlackPlasTitaniumRplasma - edges: - - to: start - completed: - - !type:SpawnPrototype - prototype: SheetPlastitanium1 - amount: 2 - steps: - - tool: Anchoring - doAfter: 1.5 - - - to: LPPBlackPlasTitaniumWood - steps: - - material: WoodPlank - amount: 1 - doAfter: 1 - - - to: LPPBlackPlasTitaniumGlass - steps: - - material: Glass - amount: 1 - doAfter: 1 - - - to: LPPBlackPlasTitaniumPlasma - steps: - - material: PlasmaGlass - amount: 1 - doAfter: 1 - - - to: LPPBlackPlasTitaniumUranium - steps: - - material: UraniumGlass - amount: 1 - doAfter: 1 - - - to: LPPBlackPlasTitaniumTitanium - steps: - - material: Titanium - amount: 1 - doAfter: 1 - - - to: LPPBlackPlasTitanium - steps: - - material: Plastitanium - amount: 1 - doAfter: 1 - -#---разборки - - - node: LPPBlackPlasTitaniumWood - entity: LPPBlackPlasTitaniumWood - edges: - - to: LPPBlackPlasTitaniumRplasma - completed: - - !type:SpawnPrototype - prototype: MaterialWoodPlank1 - amount: 1 - steps: - - tool: Prying - doAfter: 1 - - - node: LPPBlackPlasTitaniumGlass - entity: LPPBlackPlasTitaniumGlass - edges: - - to: LPPBlackPlasTitaniumRplasma - completed: - - !type:SpawnPrototype - prototype: SheetGlass1 - amount: 1 - steps: - - tool: Prying - doAfter: 1 - - - node: LPPBlackPlasTitaniumPlasma - entity: LPPBlackPlasTitaniumPlasma - edges: - - to: LPPBlackPlasTitaniumRplasma - completed: - - !type:SpawnPrototype - prototype: SheetPGlass1 - amount: 1 - steps: - - tool: Prying - doAfter: 1 - - - node: LPPBlackPlasTitaniumUranium - entity: LPPBlackPlasTitaniumUranium - edges: - - to: LPPBlackPlasTitaniumRplasma - completed: - - !type:SpawnPrototype - prototype: SheetUGlass1 - amount: 1 - steps: - - tool: Prying - doAfter: 1 - - - node: LPPBlackPlasTitaniumTitanium - entity: LPPBlackPlasTitaniumTitanium - edges: - - to: LPPBlackPlasTitaniumRplasma - completed: - - !type:SpawnPrototype - prototype: SheetTitanium1 - amount: 1 - steps: - - tool: Prying - doAfter: 1 - - - node: LPPBlackPlasTitanium - entity: LPPBlackPlasTitanium - edges: - - to: LPPBlackPlasTitaniumRplasma - completed: - - !type:SpawnPrototype - prototype: SheetPlastitanium1 - amount: 1 - steps: - - tool: Prying - doAfter: 1 diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/CentCom/centcom_representative.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/CentCom/centcom_representative.yml index 640d62d012..164b303c19 100644 --- a/Resources/Prototypes/_LostParadise/Roles/Jobs/CentCom/centcom_representative.yml +++ b/Resources/Prototypes/_LostParadise/Roles/Jobs/CentCom/centcom_representative.yml @@ -27,7 +27,6 @@ jumpsuit: ClothingUniformJumpsuitCentcomOfficer back: ClothingBackpackHOPFilled shoes: ClothingShoesBootsLaceup - head: ClothingHeadHatBeretCentcomNaval eyes: ClothingEyesGlassesSunglasses gloves: ClothingHandsGlovesColorGray outerClothing: ClothingOuterVest @@ -40,7 +39,6 @@ underwear: LPPBoxerGreen underwear: LPPBriefsGreen breast: LPPBraAltGreen - innerClothingSkirt: ClothingUniformJumpskirtCentcomOfficer satchel: ClothingBackpackSatchelHOPFilled duffelbag: ClothingBackpackDuffelHOPFilled diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/CentCom/chronolegioner.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/CentCom/chronolegioner.yml index bebaf94b66..796b844b6a 100644 --- a/Resources/Prototypes/_LostParadise/Roles/Jobs/CentCom/chronolegioner.yml +++ b/Resources/Prototypes/_LostParadise/Roles/Jobs/CentCom/chronolegioner.yml @@ -11,7 +11,7 @@ ears: ClothingHeadsetCentCom pocket1: ChronoKnife pocket2: BlinkBook - innerclothingskirt: ClothingUniformJumpsuitNanotrasen + innerClothingSkirt: ClothingUniformJumpsuitNanotrasen satchel: LPPClothingBackpackHoldingChrono duffelbag: LPPClothingBackpackHoldingChrono diff --git a/Resources/Prototypes/_LostParadise/Stacks/Materials/Sheets/glass.yml b/Resources/Prototypes/_LostParadise/Stacks/Materials/Sheets/glass.yml deleted file mode 100644 index b929b1b45d..0000000000 --- a/Resources/Prototypes/_LostParadise/Stacks/Materials/Sheets/glass.yml +++ /dev/null @@ -1,16 +0,0 @@ - -- type: stack - id: PlasTitaniumGlass - name: plas titanium glass - icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: plastitaniumglass } - spawn: MaterialPlasTitaniumGlass - maxCount: 30 - itemSize: 1 - -- type: stack - id: LPPTitaniumGlass - name: titanium glass - icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: titaniumglass } - spawn: MaterialTitaniumGlass - maxCount: 30 - itemSize: 1 diff --git a/Resources/Prototypes/_LostParadise/Stacks/Materials/Sheets/metal.yml b/Resources/Prototypes/_LostParadise/Stacks/Materials/Sheets/metal.yml deleted file mode 100644 index 73ca1337d2..0000000000 --- a/Resources/Prototypes/_LostParadise/Stacks/Materials/Sheets/metal.yml +++ /dev/null @@ -1,17 +0,0 @@ -#LPP -- type: stack - id: Titanium - name: titanium - icon: { sprite: /Textures/Objects/Materials/Sheets/metal.rsi, state: titanium } - spawn: SheetTitanium1 - maxCount: 30 - itemSize: 1 - - -- type: stack - id: Plastitanium - name: plastitanium - icon: { sprite: /Textures/Objects/Materials/Sheets/metal.rsi, state: plastitanium } - spawn: SheetPlastitanium1 - maxCount: 30 - itemSize: 1