From: ravage <142820619+ravage123321@users.noreply.github.com>
Date: Thu, 9 Nov 2023 12:24:00 +0000 (+0300)
Subject: Adding a kitten (#20726)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=c2de7ec5b3c4e84aa9bb3a5671be564bddd66d5b;p=space-station-14.git

Adding a kitten (#20726)

* Update animals.yml

* Update

* ANOTHER UPDATE

change mobcat meleeweapon from brute to piercing, deleting extra lines

* oops

* Update npc.yml

* Update npc.yml

* Update animals.yml
---

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/npc.yml b/Resources/Prototypes/Catalog/Fills/Crates/npc.yml
index 8dc0104bbb..6ff49fb8ec 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/npc.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/npc.yml
@@ -31,6 +31,9 @@
       - id: MobCatCaracal
         prob: 0.5
         orGroup: MobCat
+      - id: MobCatKitten
+        prob: 0.25
+        orGroup: MobCat
       - id: MobBingus
         prob: 0.005
         orGroup: MobCat
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
index bf77600f5b..501d0f0264 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
@@ -164,6 +164,19 @@
   - type: ConditionalSpawner
     prototypes:
       - MobCatSpace
+    
+- type: entity
+  name: Kitten Spawner
+  id: SpawnMobCatKitten
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: green
+      - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+      - MobCatKitten
 
 - type: entity
   name: Cat Spawner
@@ -195,6 +208,7 @@
       - MobCat
       - MobCatCalico
       - MobCatCaracal
+      - MobCatKitten
     rarePrototypes:
       - MobCatSpace
     rareChance: 0.05
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 95657cc431..57aae21347 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -2318,6 +2318,10 @@
     interactSuccessSpawn: EffectHearts
     interactSuccessSound:
       path: /Audio/Animals/cat_meow.ogg
+  - type: MeleeWeapon
+    damage:
+      types:
+        Piercing: 5
   - type: Grammar
     attributes:
       gender: epicene
@@ -2392,6 +2396,39 @@
       Dead:
         Base: caracal_dead
 
+- type: entity
+  name: kitten
+  parent: MobCat
+  id: MobCatKitten
+  description: Small and fluffy.
+  components:
+  - type: Sprite
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: kitten
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: kitten
+      Critical:
+        Base: kitten_dead
+      Dead:
+        Base: kitten_dead
+  - type: Butcherable
+    spawned:
+    - id: FoodMeat
+      amount: 1
+  - type: MobPrice
+    price: 100
+  - type: MeleeWeapon
+    damage:
+      types:
+        Piercing: 3
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      25: Dead
+
 - type: entity
   name: sloth
   parent: SimpleMobBase
@@ -2711,3 +2748,4 @@
   - type: NpcFactionMember
     factions:
     - Passive
+
diff --git a/Resources/Textures/Mobs/Pets/cat.rsi/kitten.png b/Resources/Textures/Mobs/Pets/cat.rsi/kitten.png
index fd579cb8cd..62c4883e63 100644
Binary files a/Resources/Textures/Mobs/Pets/cat.rsi/kitten.png and b/Resources/Textures/Mobs/Pets/cat.rsi/kitten.png differ
diff --git a/Resources/Textures/Mobs/Pets/cat.rsi/kittencollar.png b/Resources/Textures/Mobs/Pets/cat.rsi/kittencollar.png
index 079698ec85..09bf4c2526 100644
Binary files a/Resources/Textures/Mobs/Pets/cat.rsi/kittencollar.png and b/Resources/Textures/Mobs/Pets/cat.rsi/kittencollar.png differ
diff --git a/Resources/Textures/Mobs/Pets/cat.rsi/kittentag.png b/Resources/Textures/Mobs/Pets/cat.rsi/kittentag.png
index 6f3bf14f5c..b37123fb00 100644
Binary files a/Resources/Textures/Mobs/Pets/cat.rsi/kittentag.png and b/Resources/Textures/Mobs/Pets/cat.rsi/kittentag.png differ