diff --git a/Content.Client/IgnoredComponents.cs b/Content.Client/IgnoredComponents.cs index a032972f02..fd11f67b25 100644 --- a/Content.Client/IgnoredComponents.cs +++ b/Content.Client/IgnoredComponents.cs @@ -157,6 +157,7 @@ "DamageOnHighSpeedImpact", "Barotrauma", "MobStateManager", + "Metabolism", }; } } diff --git a/Content.Shared/GameObjects/Components/Damage/DamageableComponent.cs b/Content.Shared/GameObjects/Components/Damage/DamageableComponent.cs index 614bf90abd..2d31eeb42b 100644 --- a/Content.Shared/GameObjects/Components/Damage/DamageableComponent.cs +++ b/Content.Shared/GameObjects/Components/Damage/DamageableComponent.cs @@ -17,6 +17,7 @@ namespace Content.Shared.GameObjects.Components.Damage /// Component that allows attached entities to take damage. /// This basic version never dies (thus can take an indefinite amount of damage). /// + [RegisterComponent] [ComponentReference(typeof(IDamageableComponent))] public class DamageableComponent : Component, IDamageableComponent { diff --git a/Resources/Prototypes/Entities/Constructible/Ground/pilot_chair.yml b/Resources/Prototypes/Entities/Constructible/Ground/pilot_chair.yml index 1a9307108f..f986636ee2 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/pilot_chair.yml +++ b/Resources/Prototypes/Entities/Constructible/Ground/pilot_chair.yml @@ -13,7 +13,6 @@ - type: Collidable - type: Clickable - type: InteractionOutline - - type: Damageable - type: Destructible maxHP: 100 - type: Physics diff --git a/Resources/Prototypes/Entities/Constructible/Walls/signs.yml b/Resources/Prototypes/Entities/Constructible/Walls/signs.yml index 3d9cb3c09f..222ff68297 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/signs.yml +++ b/Resources/Prototypes/Entities/Constructible/Walls/signs.yml @@ -8,7 +8,6 @@ - type: Collidable shapes: - !type:PhysShapeAabb - - type: Damageable - type: Destructible thresholdvalue: 5 - type: Sprite diff --git a/Resources/Prototypes/Entities/Constructible/disposal.yml b/Resources/Prototypes/Entities/Constructible/disposal.yml index f5fe46c91e..5187ce2a88 100644 --- a/Resources/Prototypes/Entities/Constructible/disposal.yml +++ b/Resources/Prototypes/Entities/Constructible/disposal.yml @@ -13,7 +13,6 @@ - type: SnapGrid offset: Center - type: Anchorable - - type: Damageable - type: Breakable - type: Rotatable diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index a321ae397e..9ab31e8bcb 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -39,14 +39,10 @@ layer: - Opaque - MobImpassable - - type: Species - Template: Human - HeatResistance: 50 - type: BodyManager BaseTemplate: bodyTemplate.Humanoid BasePreset: bodyPreset.BasicHuman - type: HeatResistance - - type: Damageable - type: CombatMode - type: Teleportable - type: Stunnable diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml index fe506f344b..00d7371892 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml @@ -34,14 +34,10 @@ layer: - Opaque - MobImpassable - - type: Species - Template: Human - HeatResistance: 323 - type: BodyManager BaseTemplate: bodyTemplate.Humanoid BasePreset: bodyPreset.BasicHuman - type: HeatResistance - - type: Damageable - type: CombatMode - type: Teleportable - type: Stunnable diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index 284b5124ec..fc01a43eb8 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -31,14 +31,10 @@ layer: - Opaque - MobImpassable - - type: Species - Template: Human - HeatResistance: 50 - type: BodyManager BaseTemplate: bodyTemplate.Humanoid BasePreset: bodyPreset.BasicHuman - type: HeatResistance - - type: Damageable - type: CombatMode - type: Teleportable - type: Stunnable @@ -64,7 +60,6 @@ drawdepth: Mobs suffix: AI components: - - type: Damageable - type: Sprite drawdepth: Mobs sprite: Mobs/Pets/corgi.rsi diff --git a/Resources/Prototypes/Entities/Mobs/Species/human.yml b/Resources/Prototypes/Entities/Mobs/Species/human.yml index d12d5fd9f0..637f722349 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/human.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml @@ -258,7 +258,6 @@ baseTemplate: bodyTemplate.Humanoid basePreset: bodyPreset.BasicHuman - type: MobStateManager - - type: Damageable - type: Appearance visuals: - type: RotationVisualizer diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml index e8b4a9dd96..ffe5c80017 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml @@ -106,7 +106,6 @@ devastationRange: 25 heavyImpactRange: 25 flashRange: 50 - - type: Damageable - type: Destructible thresholdvalue: 50 - type: Appearance