diff --git a/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs b/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs index 782189c545..ddd5e97de7 100644 --- a/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs +++ b/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs @@ -25,7 +25,6 @@ namespace Content.IntegrationTests.Tests.Commands - type: MobThresholds thresholds: 0: Alive - 100: Critical 200: Dead "; diff --git a/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs b/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs index e90ed8ff4a..6954dc1215 100644 --- a/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs +++ b/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs @@ -83,7 +83,6 @@ namespace Content.IntegrationTests.Tests.Disposal - type: MobThresholds thresholds: 0: Alive - 100: Critical 200: Dead - type: Damageable damageContainer: Biological diff --git a/Content.IntegrationTests/Tests/Minds/MindTests.cs b/Content.IntegrationTests/Tests/Minds/MindTests.cs index 446c9be017..d8aff81a82 100644 --- a/Content.IntegrationTests/Tests/Minds/MindTests.cs +++ b/Content.IntegrationTests/Tests/Minds/MindTests.cs @@ -38,7 +38,6 @@ public sealed partial class MindTests - type: MobThresholds thresholds: 0: Alive - 100: Critical 200: Dead - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 2e5b69f7cd..fd70dc7896 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -31,8 +31,6 @@ states: Alive: Base: bat - Critical: - Base: dead Dead: Base: dead - type: Butcherable @@ -96,7 +94,6 @@ - type: MobThresholds thresholds: 0: Alive - 5: Critical 10: Dead - type: Stamina excess: 10 @@ -104,8 +101,6 @@ states: Alive: Base: 0 - Critical: - Base: dead Dead: Base: dead - type: Tag @@ -173,8 +168,6 @@ states: Alive: Base: chicken-0 - Critical: - Base: dead-0 Dead: Base: dead-0 - type: Butcherable @@ -229,8 +222,6 @@ states: Alive: Base: duck-0 - Critical: - Base: dead-0 Dead: Base: dead-0 - type: Butcherable @@ -270,8 +261,6 @@ states: Alive: Base: duck-1 - Critical: - Base: dead-1 Dead: Base: dead-1 @@ -289,8 +278,6 @@ states: Alive: Base: duck-2 - Critical: - Base: dead-2 Dead: Base: dead-2 @@ -325,7 +312,6 @@ - type: MobThresholds thresholds: 0: Alive - 5: Critical 10: Dead - type: RandomSprite available: @@ -335,8 +321,6 @@ states: Alive: Base: butterfly - Critical: - Base: dead Dead: Base: dead - type: Bloodstream @@ -375,8 +359,6 @@ states: Alive: Base: cow - Critical: - Base: dead Dead: Base: dead - type: SolutionContainerManager @@ -446,8 +428,6 @@ states: Alive: Base: crab - Critical: - Base: dead Dead: Base: dead - type: Butcherable @@ -488,8 +468,6 @@ states: Alive: Base: goat - Critical: - Base: dead Dead: Base: dead - type: SolutionContainerManager @@ -553,8 +531,6 @@ states: Alive: Base: goose - Critical: - Base: dead Dead: Base: dead - type: Butcherable @@ -602,8 +578,6 @@ states: Alive: Base: crawling - Critical: - Base: dead Dead: Base: dead - type: Butcherable @@ -1008,8 +982,6 @@ states: Alive: Base: lizard - Critical: - Base: dead Dead: Base: dead - type: Butcherable @@ -1062,8 +1034,6 @@ states: Alive: Base: slug - Critical: - Base: dead Dead: Base: dead - type: Butcherable @@ -1108,8 +1078,6 @@ states: Alive: Base: frog - Critical: - Base: dead Dead: Base: dead - type: Butcherable @@ -1159,8 +1127,6 @@ states: Alive: Base: parrot - Critical: - Base: dead Dead: Base: dead - type: Butcherable @@ -1205,8 +1171,6 @@ states: Alive: Base: penguin - Critical: - Base: penguin_dead Dead: Base: penguin_dead - type: Butcherable @@ -1261,8 +1225,6 @@ states: Alive: Base: penguin - Critical: - Base: dead Dead: Base: dead - type: Butcherable @@ -1328,8 +1290,6 @@ states: Alive: Base: snake - Critical: - Base: dead Dead: Base: dead - type: Butcherable @@ -1378,8 +1338,6 @@ states: Alive: Base: tarantula - Critical: - Base: tarantula_dead Dead: Base: tarantula_dead - type: Butcherable @@ -1390,7 +1348,6 @@ - type: MobThresholds thresholds: 0: Alive - 90: Critical 150: Dead - type: MeleeWeapon hidden: true @@ -1517,8 +1474,6 @@ states: Alive: Base: possum - Critical: - Base: possum_dead Dead: Base: possum_dead - type: Butcherable @@ -1572,8 +1527,6 @@ states: Alive: Base: raccoon - Critical: - Base: raccoon_dead Dead: Base: raccoon_dead - type: Butcherable @@ -1627,8 +1580,6 @@ states: Alive: Base: fox - Critical: - Base: fox_dead Dead: Base: fox_dead - type: Butcherable @@ -1684,8 +1635,6 @@ states: Alive: Base: corgi - Critical: - Base: corgi_dead Dead: Base: corgi_dead - type: Butcherable @@ -1724,8 +1673,6 @@ states: Alive: Base: narsian - Critical: - Base: narsian_dead Dead: Base: narsian_dead - type: MeleeWeapon @@ -1789,8 +1736,6 @@ states: Alive: Base: puppy - Critical: - Base: puppy_dead Dead: Base: puppy_dead - type: Grammar @@ -1834,8 +1779,6 @@ states: Alive: Base: cat - Critical: - Base: cat_dead Dead: Base: cat_dead - type: Butcherable @@ -1870,8 +1813,6 @@ states: Alive: Base: cat2 - Critical: - Base: cat2_dead Dead: Base: cat2_dead @@ -1889,8 +1830,6 @@ states: Alive: Base: spacecat - Critical: - Base: spacecat_dead Dead: Base: spacecat_dead - type: InteractionPopup @@ -1915,8 +1854,6 @@ states: Alive: Base: caracal_flop - Critical: - Base: caracal_dead Dead: Base: caracal_dead @@ -1960,8 +1897,6 @@ states: Alive: Base: sloth - Critical: - Base: sloth_dead Dead: Base: sloth_dead - type: Butcherable @@ -2015,8 +1950,6 @@ states: Alive: Base: ferret - Critical: - Base: ferret_dead Dead: Base: ferret_dead - type: Butcherable @@ -2191,8 +2124,6 @@ states: Alive: Base: pig - Critical: - Base: dead Dead: Base: dead - type: Butcherable diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml b/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml index bc6d983e3a..9c0b047e55 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml @@ -60,7 +60,6 @@ - type: MobThresholds thresholds: 0: Alive - 450: Critical 500: Dead - type: Metabolizer solutionOnBody: false diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml index f781a27b4f..845e8d1717 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml @@ -38,7 +38,6 @@ - type: MobThresholds thresholds: 0: Alive - 50: Critical 100: Dead - type: Stamina excess: 100 diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index 37e1280d97..3974cb079a 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -502,8 +502,6 @@ states: Alive: Base: shiva - Critical: - Base: shiva_dead Dead: Base: shiva_dead - type: Butcherable @@ -514,7 +512,6 @@ - type: MobThresholds thresholds: 0: Alive - 90: Critical 150: Dead - type: MeleeWeapon hidden: true diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml index 09d284a701..7f2ea1d70c 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml @@ -42,7 +42,6 @@ - type: MobThresholds thresholds: 0: Alive - 150: Critical 200: Dead - type: MeleeWeapon hidden: true @@ -78,8 +77,6 @@ states: Alive: Base: regalrat - Critical: - Base: dead Dead: Base: dead - type: GhostRole @@ -139,7 +136,6 @@ - type: MobThresholds thresholds: 0: Alive - 300: Critical 350: Dead - type: MeleeWeapon hidden: true diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml index 5a73e4a525..b42da5c906 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml @@ -33,7 +33,6 @@ - type: MobThresholds thresholds: 0: Alive - 100: Critical 150: Dead - type: Stamina excess: 150 @@ -217,7 +216,6 @@ - type: MobThresholds thresholds: 0: Alive - 90: Critical 130: Dead - type: Stamina excess: 150 @@ -226,8 +224,6 @@ Alive: Base: spacespider BaseUnshaded: glow - Critical: - Base: spacespider_dead Dead: Base: spacespider_dead - type: Butcherable diff --git a/Resources/Prototypes/Entities/Mobs/Player/familiars.yml b/Resources/Prototypes/Entities/Mobs/Player/familiars.yml index c41a3349a9..26128b1224 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/familiars.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/familiars.yml @@ -65,7 +65,6 @@ - type: MobThresholds thresholds: 0: Alive - 80: Critical 160: Dead - type: Grammar attributes: