From 2ea4d0d6b5c58db019000beb969709cb7e430047 Mon Sep 17 00:00:00 2001 From: "I.K" <45953835+notquitehadouken@users.noreply.github.com> Date: Thu, 5 Oct 2023 14:56:40 -0500 Subject: [PATCH] Make slimes not rot (#20761) --- Resources/Prototypes/Entities/Mobs/Species/arachnid.yml | 2 +- Resources/Prototypes/Entities/Mobs/Species/base.yml | 1 - Resources/Prototypes/Entities/Mobs/Species/diona.yml | 1 + Resources/Prototypes/Entities/Mobs/Species/dwarf.yml | 2 +- Resources/Prototypes/Entities/Mobs/Species/moth.yml | 1 + Resources/Prototypes/Entities/Mobs/Species/reptilian.yml | 2 +- Resources/Prototypes/Entities/Mobs/Species/vox.yml | 1 + 7 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml index 4d07970947..fa78f426ce 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml @@ -8,7 +8,6 @@ - type: Body prototype: Arachnid requiredLegs: 2 # It would be funny if arachnids could use their little back limbs to move around once they lose their legs, but just something to consider post-woundmed - - type: Perishable - type: HumanoidAppearance species: Arachnid - type: Hunger @@ -36,6 +35,7 @@ productionLength: 3 entityProduced: MaterialWebSilk1 hungerCost: 9 # Should total to 12 total silk on full hunger + - type: Perishable - type: Butcherable butcheringType: Spike spawned: diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml index d00f93fb76..422e1aa4e1 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml @@ -276,7 +276,6 @@ shiveringHeatRegulation: 2000 normalBodyTemperature: 310.15 thermalRegulationTemperatureThreshold: 25 - - type: Perishable - type: Butcherable butcheringType: Spike # TODO human. spawned: diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml index d7366ae3b0..0e34ae0ff5 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/diona.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/diona.yml @@ -28,6 +28,7 @@ Brute: sprite: Mobs/Effects/brute_damage.rsi color: "#75b1f0" + - type: Perishable - type: Butcherable butcheringType: Spike spawned: diff --git a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml index 47f9f8be9d..70e75e5483 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml @@ -28,6 +28,7 @@ - type: Body prototype: Dwarf requiredLegs: 2 + - type: Perishable - type: Butcherable butcheringType: Spike spawned: @@ -55,7 +56,6 @@ accent: dwarf - type: Speech speechSounds: Bass - - type: Perishable - type: entity parent: BaseSpeciesDummy diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml index ce757b0fb4..0e144b3bf3 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml @@ -26,6 +26,7 @@ speechVerb: Moth - type: TypingIndicator proto: moth + - type: Perishable - type: Butcherable butcheringType: Spike spawned: diff --git a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml index 58824629cb..91fe16b924 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml @@ -18,6 +18,7 @@ - type: Body prototype: Reptilian requiredLegs: 2 + - type: Perishable - type: Butcherable butcheringType: Spike spawned: @@ -58,7 +59,6 @@ - type: MovementSpeedModifier baseWalkSpeed : 2.7 baseSprintSpeed : 4.5 - - type: Perishable - type: entity parent: BaseSpeciesDummy diff --git a/Resources/Prototypes/Entities/Mobs/Species/vox.yml b/Resources/Prototypes/Entities/Mobs/Species/vox.yml index 17dd70ada6..b6c5edf751 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml @@ -97,6 +97,7 @@ - type: Inventory speciesId: vox - type: InventorySlots + - type: Perishable - type: Butcherable butcheringType: Spike spawned: -- 2.51.2