From 1a676bdbfa545c92032d9df8b981381f3583c539 Mon Sep 17 00:00:00 2001
From: Vasilis <vasilis@pikachu.systems>
Date: Mon, 13 Nov 2023 00:24:07 +0100
Subject: [PATCH] Puppy Ian. Awwww (And a puppy crate) (#21508)

* Awwww

* May as well add a crate

* forgor

* Im dumb

* Ok im done being dumb

* You monster...
---
 .../catalog/fills/crates/livestock-crates.ftl    |  5 ++++-
 .../Prototypes/Catalog/Cargo/cargo_livestock.yml | 10 ++++++++++
 .../Prototypes/Catalog/Fills/Crates/npc.yml      |  8 ++++++++
 .../Entities/Markers/Spawners/mobs.yml           |  1 +
 .../Prototypes/Entities/Mobs/NPCs/animals.yml    |  2 ++
 Resources/Prototypes/Entities/Mobs/NPCs/pets.yml | 16 ++++++++++++++++
 6 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/livestock-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/livestock-crates.ftl
index 9742b83b34..78a4e3686e 100644
--- a/Resources/Locale/en-US/prototypes/catalog/fills/crates/livestock-crates.ftl
+++ b/Resources/Locale/en-US/prototypes/catalog/fills/crates/livestock-crates.ftl
@@ -19,6 +19,9 @@ ent-CrateNPCDuck = Duck crate
 ent-CrateNPCCorgi = Corgi crate
     .desc = A crate containing a single corgi.
 
+ent-CrateNPCPuppyCorgi = Puppy Corgi crate
+    .desc = A crate containing a single puppy corgi. Awww.
+
 ent-CrateNPCCow = Cow crate
     .desc = A crate containing a single cow.
 
@@ -53,4 +56,4 @@ ent-CrateNPCLizard = Lizard crate
     .desc = A crate containing a lizard.
 
 ent-CrateNPCKangaroo = Kangaroo crate
-    .desc = A crate containing a kangaroo.
\ No newline at end of file
+    .desc = A crate containing a kangaroo.
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
index d82e4d8d26..86c79b133e 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
@@ -68,6 +68,16 @@
   category: Livestock
   group: market
 
+- type: cargoProduct
+  id: LivestockPupCorgi
+  icon:
+    sprite: Mobs/Pets/corgi.rsi
+    state: puppy
+  product: CrateNPCPuppyCorgi
+  cost: 1200
+  category: Livestock
+  group: market
+
 - type: cargoProduct
   id: LivestockCow
   icon:
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/npc.yml b/Resources/Prototypes/Catalog/Fills/Crates/npc.yml
index 6ff49fb8ec..e9ac33c412 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/npc.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/npc.yml
@@ -77,6 +77,14 @@
     contents:
       - id: MobCorgi
 
+- type: entity
+  id: CrateNPCPuppyCorgi
+  parent: CrateLivestock
+  components:
+  - type: StorageFill
+    contents:
+    - id: MobCorgiPuppy
+
 - type: entity
   id: CrateNPCCow
   parent: CrateLivestock
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
index 501d0f0264..bf47656008 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
@@ -46,6 +46,7 @@
       - MobCorgiIan
       - MobCorgiIanOld
       - MobCorgiLisa
+      - MobCorgiIanPup
 
 - type: entity
   name: Possum Morty Spawner
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 89c9f4fbfe..26e7a62018 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -2262,6 +2262,8 @@
     states:
       Alive:
         Base: puppy
+      Critical:
+        Base: puppy_dead
       Dead:
         Base: puppy_dead
   - type: Grammar
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
index 88d7cbaae2..661f64080f 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -83,6 +83,22 @@
       proper: true
       gender: female
 
+- type: entity
+  name: Puppy Ian
+  parent: MobCorgiPuppy
+  id: MobCorgiIanPup
+  description: Favourite puppy corgi. Awww.
+  components:
+  - type: Grammar
+    attributes:
+      proper: true
+      gender: male
+  - type: Butcherable # A puppy? You monster...
+    spawned:
+    - id: FoodMeatCorgi
+      amount: 2
+    - id: MaterialHideCorgi
+
 - type: entity
   name: Runtime
   parent: MobCat
-- 
2.51.2