From: Ed <96445749+TheShuEd@users.noreply.github.com>
Date: Sat, 25 May 2024 20:18:40 +0000 (+0300)
Subject: Tomato killers don't kill the server anymore. (#28173)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=7c9e5a0779e7d44f183575b1fce6ab95dc0c8996;p=space-station-14.git

Tomato killers don't kill the server anymore. (#28173)

* tomato killer auto death

* fix

* Update miscellaneous.yml
---

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
index f77429d597..e09d3917c7 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
@@ -114,13 +114,22 @@
     - trigger:
         !type:DamageTypeTrigger
         damageType: Blunt
-        damage: 100
+        damage: 40
       behaviors:
-      - !type:GibBehavior { }
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          FoodMeatTomato:
+            min: 1
+            max: 2
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: gib
   - type: MobThresholds
     thresholds:
       0: Alive
-      24: Dead
+      35: Dead
   - type: Fixtures
     fixtures:
       fix1:
@@ -136,7 +145,7 @@
     hidden: true
     damage:
       groups:
-        Brute: 4
+        Brute: 9
     animation: WeaponArcBite
   - type: Climbing
   - type: NameIdentifier
@@ -156,3 +165,13 @@
   - type: Appearance
   - type: Produce
     seedId: killerTomato
+  - type: PassiveDamage # Slight passive damage. 35 hp \ 5 min \ 60 sec = 0.08
+    allowedStates:
+    - Alive
+    - Dead
+    damageCap: 50
+    damage:
+      types:
+        Blunt: 0.11
+  - type: StaticPrice
+    price: 400
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
index 81c98750dc..bb0f05c181 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
@@ -599,6 +599,8 @@
   - type: SliceableFood
     count: 3
     slice: FoodMeatTomatoCutlet
+  - type: StaticPrice
+    price: 100
 
 - type: entity
   name: salami
@@ -1270,6 +1272,8 @@
   - type: Sprite
     state: salami-slice
     color: red
+  - type: StaticPrice
+    price: 30
 
 - type: entity
   name: salami slice