From 16ac0248f0b600ac2ecf39106867f0fd8bd140ab Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Thu, 22 Aug 2024 20:02:16 -0400
Subject: [PATCH 1/7] Return Of The Great

---
 .../interaction-popup-component.ftl           |   1 +
 .../Catalog/Cargo/cargo_livestock.yml         |  10 ++
 .../Prototypes/Catalog/Fills/Crates/npc.yml   |  11 ++
 .../Prototypes/Datasets/Names/pitbull.yml     |  34 +++++
 .../Prototypes/Entities/Mobs/NPCs/dogs.yml    | 120 ++++++++++++++++++
 .../Prototypes/Entities/Mobs/Player/harpy.yml |   1 +
 Resources/Prototypes/GameRules/events.yml     |   2 +
 .../Entities/Clothing/Uniforms/jumpsuits.yml  |   8 +-
 .../Markers/Spawners/Random/animals.yml       |   1 +
 .../Entities/Mobs/Player/felinid.yml          |   1 +
 Resources/Prototypes/ai_factions.yml          |  16 +++
 .../Textures/Mobs/Pets/pitbull.rsi/meta.json  |  22 ++++
 .../Textures/Mobs/Pets/pitbull.rsi/pibble.png | Bin 0 -> 2543 bytes
 .../Mobs/Pets/pitbull.rsi/pibble_dead.png     | Bin 0 -> 1259 bytes
 .../Textures/Mobs/Pets/ventbull.rsi/meta.json |  22 ++++
 .../Mobs/Pets/ventbull.rsi/pibble.png         | Bin 0 -> 1966 bytes
 .../Mobs/Pets/ventbull.rsi/pibble_dead.png    | Bin 0 -> 744 bytes
 17 files changed, 245 insertions(+), 4 deletions(-)
 create mode 100644 Resources/Prototypes/Datasets/Names/pitbull.yml
 create mode 100644 Resources/Prototypes/Entities/Mobs/NPCs/dogs.yml
 create mode 100644 Resources/Textures/Mobs/Pets/pitbull.rsi/meta.json
 create mode 100644 Resources/Textures/Mobs/Pets/pitbull.rsi/pibble.png
 create mode 100644 Resources/Textures/Mobs/Pets/pitbull.rsi/pibble_dead.png
 create mode 100644 Resources/Textures/Mobs/Pets/ventbull.rsi/meta.json
 create mode 100644 Resources/Textures/Mobs/Pets/ventbull.rsi/pibble.png
 create mode 100644 Resources/Textures/Mobs/Pets/ventbull.rsi/pibble_dead.png

diff --git a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
index a6eacf13c5d..24d20d3368e 100644
--- a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
+++ b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
@@ -50,6 +50,7 @@ petting-failure-sloth = You reach out to pet {THE($target)}, but {SUBJECT($targe
 petting-failure-holo = You reach out to pet {THE($target)}, but {POSS-ADJ($target)} spikes almost impale your hand!
 petting-failure-dragon = You raise your hand, but as {THE($target)} roars, you decide you'd rather not be toasty carp food.
 petting-failure-hamster = You reach out to pet {THE($target)}, but {SUBJECT($target)} attempts to bite your finger and only your quick reflexes save you from an almost fatal injury.
+petting-failure-pibble = You reach out to pet {THE($target)}, and {SUBJECT($target)} lunges at you!
 petting-failure-bear = You reach out to pet {THE($target)}, but {SUBJECT($target)} growls, making you think twice.
 petting-failure-monkey = You reach out to pet {THE($target)}, but {SUBJECT($target)} almost bites your fingers!
 petting-failure-nymph = You reach out to pet {THE($target)}, but {POSS-ADJ($target)} moves their branches away.
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
index f44cb61f737..55e256c7bbe 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
@@ -58,6 +58,16 @@
   category: cargoproduct-category-name-livestock
   group: market
 
+- type: cargoProduct
+  id: LivestockPibble
+  icon:
+    sprite: Mobs/Pets/pitbull.rsi
+    state: pibble
+  product: CrateNPCPibble
+  cost: 700
+  category: Livestock
+  group: market
+
 - type: cargoProduct
   id: LivestockCorgi
   icon:
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/npc.yml b/Resources/Prototypes/Catalog/Fills/Crates/npc.yml
index 10c715bb99e..b2dc4b223bb 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/npc.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/npc.yml
@@ -81,6 +81,17 @@
       - id: MobDuckWhite
         amount: 2
 
+- type: entity
+  id: CrateNPCPibble
+  parent: CrateLivestock
+  name: pitbull crate
+  description: "Note from the shelter: Lab mix. Looking for a home without cats, birds, or children. Anxious when pet."
+  components:
+  - type: StorageFill
+    contents:
+      - id: MobPibble
+        amount: 1
+
 - type: entity
   id: CrateNPCCorgi
   parent: CrateLivestock
diff --git a/Resources/Prototypes/Datasets/Names/pitbull.yml b/Resources/Prototypes/Datasets/Names/pitbull.yml
new file mode 100644
index 00000000000..628c600a5c4
--- /dev/null
+++ b/Resources/Prototypes/Datasets/Names/pitbull.yml
@@ -0,0 +1,34 @@
+- type: dataset
+  id: names_pitbull
+  values:
+  - Zeus
+  - Magnum
+  - Diesel
+  - Satan
+  - Dante
+  - Midas
+  - Blue
+  - Petunia
+  - Luna
+  - Bubbles
+  - Rainbow
+  - Echo
+  - Cuddles
+  - Killer
+  - Paisley
+  - Echo
+  - Sweetie
+  - Tutu
+  - Reaper
+  - Peaches
+  - Cujo
+  - Cuddles
+  - Lucifer
+  - Daisy
+  - Blaze
+  - Lady
+  - Franny
+  - Hades
+  - Baby
+  - Demon
+  - Trixie
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/dogs.yml b/Resources/Prototypes/Entities/Mobs/NPCs/dogs.yml
new file mode 100644
index 00000000000..a5d51026338
--- /dev/null
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/dogs.yml
@@ -0,0 +1,120 @@
+- type: entity
+  parent: SimpleMobBase
+  id: MobPibble
+  name: pitbull
+  description: Nanny dog. Or a lab mix depending on who is asking.
+  components:
+  - type: MeleeWeapon
+    hidden: true
+    soundHit:
+        path: /Audio/Effects/bite.ogg
+    angle: 0
+    animation: WeaponArcBite
+    damage:
+      types:
+        Slash: 4
+        Piercing: 8
+        Blunt: 1
+        Structural: 4
+  - type: MobState
+  - type: Sprite
+    drawdepth: Mobs
+    sprite: Mobs/Pets/pitbull.rsi
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: pibble
+  - type: Physics
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.35
+        density: 65
+        mask:
+        - MobMask
+        layer:
+        - MobLayer
+  - type: Appearance
+  - type: Inventory
+    speciesId: dog
+    templateId: pet
+  - type: InventorySlots
+  - type: Strippable
+  - type: UserInterface
+    interfaces:
+    - key: enum.StrippingUiKey.Key
+      type: StrippableBoundUserInterface
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: pibble
+      Critical:
+        Base: pibble_dead
+      Dead:
+        Base: pibble_dead
+  - type: Butcherable
+    spawned:
+    - id: FoodMeat
+      amount: 3
+  - type: ReplacementAccent
+    accent: dog
+  - type: InteractionPopup
+    successChance: 0.7
+    interactSuccessString: petting-success-dog
+    interactFailureString: petting-failure-pibble
+    interactSuccessSound:
+      path: /Audio/Animals/small_dog_bark_happy.ogg
+    hostileOnFail: true
+  - type: DogVision
+  - type: NpcFactionMember
+    factions:
+    - Pet
+    - Pibble
+  - type: HTN
+    rootTask: SimpleHostileCompound
+    blackboard:
+      NavSmash: !type:Bool
+        true
+  - type: Grammar
+    attributes:
+      proper: true
+  - type: RandomMetadata
+    nameSegments: [names_pitbull]
+
+- type: entity
+  parent: MobPibble
+  id: MobPibbleVent
+  name: ventbull
+  description: Some kind of pitbull mix... or maybe the next stage in pibble evolution?
+  components:
+  - type: MeleeWeapon
+    hidden: true
+    soundHit:
+        path: /Audio/Effects/bite.ogg
+    angle: 0
+    animation: WeaponArcBite
+    damage:
+      types:
+        Slash: 2
+        Piercing: 5
+        Blunt: 0.5
+        Structural: 2
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.28
+        density: 35
+        mask:
+        - SmallMobMask
+        layer:
+        - SmallMobLayer
+  - type: Sprite
+    scale: 0.8, 0.6
+    drawdepth: Mobs
+    sprite: Mobs/Pets/ventbull.rsi
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: pibble
diff --git a/Resources/Prototypes/Entities/Mobs/Player/harpy.yml b/Resources/Prototypes/Entities/Mobs/Player/harpy.yml
index 12df7ff1037..f4222301b50 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/harpy.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/harpy.yml
@@ -21,3 +21,4 @@
   - type: NpcFactionMember
     factions:
     - NanoTrasen
+    - Birb
diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index ca885117449..300e7a7f3b9 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -243,6 +243,8 @@
       prob: 0.02
     - id: MobMouse2
       prob: 0.02
+    - id: MobPibbleVent
+      prob: 0.005
 
 - type: entity
   id: PowerGridCheck
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Uniforms/jumpsuits.yml
index b238ef7b063..55b85222486 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -8,8 +8,8 @@
     sprite: Nyanotrasen/Clothing/Uniforms/Jumpsuit/mailman.rsi
   - type: Clothing
     sprite: Nyanotrasen/Clothing/Uniforms/Jumpsuit/mailman.rsi
-#  - type: ClothingAddFaction
-#    faction: Mailman
+  - type: ClothingAddFaction
+    faction: Mailman
 
 - type: entity
   parent: ClothingUniformSkirtBase
@@ -21,8 +21,8 @@
     sprite: Nyanotrasen/Clothing/Uniforms/Jumpskirt/mailman.rsi
   - type: Clothing
     sprite: Nyanotrasen/Clothing/Uniforms/Jumpskirt/mailman.rsi
-#  - type: ClothingAddFaction
-#    faction: Mailman
+  - type: ClothingAddFaction
+    faction: Mailman
 
 - type: entity
   parent: ClothingUniformJumpsuitResearchDirector
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/animals.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/animals.yml
index 0a84109a98c..a632a0a22b0 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/animals.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/animals.yml
@@ -51,4 +51,5 @@
       - MobFrog
       - MobMothroach
       - MobArcticFox
+      - MobPibble
     rareChance: 0.15
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml
index 18047aa2e20..9a04a0458e0 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml
@@ -44,4 +44,5 @@
   - type: NpcFactionMember
     factions:
     - NanoTrasen
+    - Cat
 
diff --git a/Resources/Prototypes/ai_factions.yml b/Resources/Prototypes/ai_factions.yml
index 3dfb35c7a69..02a2ac168d3 100644
--- a/Resources/Prototypes/ai_factions.yml
+++ b/Resources/Prototypes/ai_factions.yml
@@ -83,3 +83,19 @@
   - Zombie
   - SimpleHostile
   - Dragon
+
+- type: npcFaction
+  id: Pibble
+  hostile:
+  - Cat
+  - Birb
+  - Mailman
+
+- type: npcFaction
+  id: Mailman
+
+- type: npcFaction
+  id: Cat
+
+- type: npcFaction
+  id: Birb
diff --git a/Resources/Textures/Mobs/Pets/pitbull.rsi/meta.json b/Resources/Textures/Mobs/Pets/pitbull.rsi/meta.json
new file mode 100644
index 00000000000..8a705368911
--- /dev/null
+++ b/Resources/Textures/Mobs/Pets/pitbull.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "size":
+  {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Hyenh",
+  "states":
+  [
+    {
+      "name": "pibble",
+      "directions": 4
+    },
+
+    {
+      "name": "pibble_dead",
+      "directions": 1
+    }
+  ]
+}
diff --git a/Resources/Textures/Mobs/Pets/pitbull.rsi/pibble.png b/Resources/Textures/Mobs/Pets/pitbull.rsi/pibble.png
new file mode 100644
index 0000000000000000000000000000000000000000..8644989d936abbd23ac0d4d948536cff955b9ec5
GIT binary patch
literal 2543
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
FV1lzCzxDtC

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Pets/pitbull.rsi/pibble_dead.png b/Resources/Textures/Mobs/Pets/pitbull.rsi/pibble_dead.png
new file mode 100644
index 0000000000000000000000000000000000000000..2054aea3e5dd58bf162f53712d96fb4dd083a9cd
GIT binary patch
literal 1259
zcmV<H1Qh#;P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmP!xqvQ>8^K4i*t{$WWauh>AE$6^me@v=v%)FnQ@8G-*gu
zTpR`0f`dPcRR<SmT^(EnLGTB})x}BCMM}IcDYS_3!sC6MchBLy`v9R)VXE0R0jQc~
zq~b9#n_CqFukfK4g9srgF;h>Z7c=mzuY2mIx{LBG@4i2)Psy7M@QK88OgAjz4dR(i
zOXs{#9A+g+AwDM_H|T=Ik6f2se&bwpSm2pqBa@mZ4ik&T4wgHZl?;`5nmD4U8s!UF
zmle)ioYhK=weHDZ7|LraX|B^6K^#j+APEsNYAB-u3sKrNQcR@iJm%pacKk_l$>b`7
zkz)Z>sE`~#_#gb9ty!3wbdy3cp!>zPKSqJTF3_yo_V=-EH%|cnGjOG~{nZ9A`$>Ae
ztwoN2{%zpmx~<83z~v4w^rTCM<Vb#6LZJY>pV2qvfPq_}XU&~k>l~*KK!#?ud;=UD
z0%JwWUiWx+uybzz_O#~r0~p<MgWx-Gwg3PC24YJ`L;!;TZ2(ifXej^y000SaNLh0L
z04^f{04^f|c%?sf00007bV*G`2j>9|0R%VIjC#ue000?uMObu0Z*6U5Zgc=ca%Ew3
zWn>_CX>@2HM@dakSAh-}0008QNkl<ZSi|jCF>KR76n#lESdK4&Avq-q0zuOvRI)~*
zOQlwsP?wBl=)w|-0TwD&mNEbX5*-*|fDv_ILx32lDi#LRfzl#T#n>E0D)!k?HnVUi
zJ9ZS?39$4pR^;>l@4x@<-32&~<M_{!8MWa4%@t2ON%8&L0Zc>3!{_faX$n1Bzu`GY
z3{I~f$deuQ;q^PuGG9J@1OOBWN!{tywR;)H7&KK0<jKZOps5OM&c~+Q>GcD7VgV2z
zRH`*}+D$J_;oH~R9;Gxi#%z)#nyMgeaZOd=^!lN9xuo=^(Sge?`5Y8+Hc9a`(P=k5
zO6gGcVgV3cn}!aXbF8f{d2x$Zsx=8dO2oOiBD6V2rCO7nblOd?KnQHkL$t1~E_s9N
zhm9{6w+k^xf8<FKlu~rs@cha1qzIey0PUKpMCKSdf{T|HG2glz*ad=8)6l^fL#0}i
zVDh90)6h{MB%m9o*GHZdlL6Scd&`@hsmtGc`}=TueYo60eR^7s$K{p;C!TpylpPBo
zsTcr&QmG7^a})@H%Pmk!r7=bA5-|=+sRS$poCv_|OdX|CSthkP574No3M$o_WWf(Y
zbgQWfD5U|gi5WON{DD?`CAK>Xh6EtNLexnb+lY2Q@1Z~lOhXTulIYIQ0;Lo#x4;;K
zY3Nvg@+y<)KJeznW3N;y<K5O4etzAB@N%K>bLSfn=ex@-sgXhd7<GRLyj)&rNQb*{
zrW{amo)n>}3K(P3l>D=fQ!FZS{=)O8&f=hFhRnuaXmGC&qc#x$QT%Aik)8R)B}_zs
z80Ts>RD?%UPNaDZn#&}MO8}?;5MdfRHn+QQxrL`McS0bBZKbhC@Zjx-jQ=Ft-0os=
z?u1;#7>o4riH<<T=5`lXT61{4^DA`l{ImZBgBK3r;ghC6b}TP6ytKFBiNxP5{u?c0
Vg{*)Q?Pvf1002ovPDHLkV1j_uFQWhe

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Pets/ventbull.rsi/meta.json b/Resources/Textures/Mobs/Pets/ventbull.rsi/meta.json
new file mode 100644
index 00000000000..8a705368911
--- /dev/null
+++ b/Resources/Textures/Mobs/Pets/ventbull.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "size":
+  {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Hyenh",
+  "states":
+  [
+    {
+      "name": "pibble",
+      "directions": 4
+    },
+
+    {
+      "name": "pibble_dead",
+      "directions": 1
+    }
+  ]
+}
diff --git a/Resources/Textures/Mobs/Pets/ventbull.rsi/pibble.png b/Resources/Textures/Mobs/Pets/ventbull.rsi/pibble.png
new file mode 100644
index 0000000000000000000000000000000000000000..57b5a3d2b5ef61184305356006b179c7e7276c4d
GIT binary patch
literal 1966
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
Ap#T5?

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Pets/ventbull.rsi/pibble_dead.png b/Resources/Textures/Mobs/Pets/ventbull.rsi/pibble_dead.png
new file mode 100644
index 0000000000000000000000000000000000000000..5482582a1835d226815dd36c4996cabd35be1838
GIT binary patch
literal 744
zcmV<E0vG*>P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800087Nkl<ZScUDD
zKWGzC9LGOtJH+HJp-A#fh$zxOAXpcrV3&eY5Tr}SE-o$w2VE?#E_F}`K?et299`<*
zVx>bmNJX$+tf^ojP5P`-lDoug=MdlXE|>JuCgPIsl=t56-uL(S`vQIR(MKQu8KEG9
zM|b8NV_2}evrVa3;K{4^f#0;kv&Gwvy)UtAb=EfWEUm1E00x3SymkL&=<DZo0Ai+j
z6m9@+EIbTJDKR2pGRKeU{Xhp4j7XS@WgXdpdpENVfL*J5_B(Pw5vS4_=ChN|VaXS+
zUvU705Ug$FJ!Kr~^pgD67O8Z`b794@DE$1T>**$}SQatUL<pgymQs4s4;?h&e0I`F
zr888mGEp;*5eZ}0>XeEF-4iN9Y8^G>9(!n{zG{_OeDT)98CZgImo76ka}7XWW<<iI
z(iu-_Qt1pr2%=`3QnBE%SHGiX+;{(h4m^Eu*BKuh)oXVH8IdrfBO^LmH)+f?Tas0+
zvTv`W9!MmTI$C#B&1<_>_nj+9DO*m_ff*Pd8zqrQ0*(4sEXy}W$_bTvbzZf~7{fx_
zw8}`J0}6Y4-<iqI1=^`56rw@AyR(g5tLp}ArJ@~=;pUe-G1H_}ERafPe5rTW*RItO
zLLj9C8dK6v!rMCV?)7sgkw}tTUFFBOO<xxq!vdx4Rjcf)ui6WGJM`h~^n^#@&Yn){
z4hK9Mpk`bV1x0xfh7|GC$un%%N<M>TB9(e2M9so-Xa^Me{-CX;)=dPBn!2;m&9mH$
z0f7BM+ZSoG=m2`udPNQ}aOzJVmWl;R#RAK@JXNdA(wh%HC)$ltHyC=n^3nH_E$8xF
zJbyy(Nh#Y3Nw@F`(Q+=&?9~gbecA>7mO^QLuhBA{>b+M`Gv4d;cZ}KT3Fj#PgnEX5
aN&XwDu1$>KFTbMz0000<MNUMnLSTZuGg`<1

literal 0
HcmV?d00001


From 0b824589cd341d9656b097559cccc7b9f0428a5a Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Thu, 22 Aug 2024 20:10:23 -0400
Subject: [PATCH 2/7] Update dogs.yml

---
 Resources/Prototypes/Entities/Mobs/NPCs/dogs.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/dogs.yml b/Resources/Prototypes/Entities/Mobs/NPCs/dogs.yml
index a5d51026338..f84c5d29279 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/dogs.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/dogs.yml
@@ -72,7 +72,8 @@
     - Pet
     - Pibble
   - type: HTN
-    rootTask: SimpleHostileCompound
+    rootTask:
+      task: SimpleHostileCompound
     blackboard:
       NavSmash: !type:Bool
         true

From 14f9507f988900ea488c47e14b482f3567c7dfd3 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Thu, 22 Aug 2024 20:15:00 -0400
Subject: [PATCH 3/7] Update dogs.yml

---
 Resources/Prototypes/Entities/Mobs/NPCs/dogs.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/dogs.yml b/Resources/Prototypes/Entities/Mobs/NPCs/dogs.yml
index f84c5d29279..0c5b84df807 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/dogs.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/dogs.yml
@@ -69,7 +69,6 @@
   - type: DogVision
   - type: NpcFactionMember
     factions:
-    - Pet
     - Pibble
   - type: HTN
     rootTask:

From 928d798f639b67cdc54bf8c6cb73f5f5fd3ef2f2 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Mon, 26 Aug 2024 17:26:13 -0400
Subject: [PATCH 4/7] Apply suggestions from code review

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: VMSolidus <evilexecutive@gmail.com>
---
 Resources/Textures/Mobs/Pets/pitbull.rsi/meta.json  | 2 +-
 Resources/Textures/Mobs/Pets/ventbull.rsi/meta.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Textures/Mobs/Pets/pitbull.rsi/meta.json b/Resources/Textures/Mobs/Pets/pitbull.rsi/meta.json
index 8a705368911..86ff0bf07d7 100644
--- a/Resources/Textures/Mobs/Pets/pitbull.rsi/meta.json
+++ b/Resources/Textures/Mobs/Pets/pitbull.rsi/meta.json
@@ -6,7 +6,7 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "Hyenh",
+  "copyright": "Hyenh#6078 (313846233099927552)",
   "states":
   [
     {
diff --git a/Resources/Textures/Mobs/Pets/ventbull.rsi/meta.json b/Resources/Textures/Mobs/Pets/ventbull.rsi/meta.json
index 8a705368911..86ff0bf07d7 100644
--- a/Resources/Textures/Mobs/Pets/ventbull.rsi/meta.json
+++ b/Resources/Textures/Mobs/Pets/ventbull.rsi/meta.json
@@ -6,7 +6,7 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "Hyenh",
+  "copyright": "Hyenh#6078 (313846233099927552)",
   "states":
   [
     {

From 9b90de228d9f088ea5369ff53e4d3a2f5e860ad8 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Mon, 26 Aug 2024 18:00:08 -0400
Subject: [PATCH 5/7] Update Dogs per Feedback

---
 .../Prototypes/Datasets/Names/pitbull.yml     | 50 ++++++++++---------
 .../Prototypes/Entities/Mobs/NPCs/dogs.yml    | 13 ++++-
 2 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/Resources/Prototypes/Datasets/Names/pitbull.yml b/Resources/Prototypes/Datasets/Names/pitbull.yml
index 628c600a5c4..6da1770cd56 100644
--- a/Resources/Prototypes/Datasets/Names/pitbull.yml
+++ b/Resources/Prototypes/Datasets/Names/pitbull.yml
@@ -1,34 +1,38 @@
 - type: dataset
   id: names_pitbull
   values:
-  - Zeus
-  - Magnum
-  - Diesel
-  - Satan
-  - Dante
-  - Midas
+  - Amon
+  - Baby
+  - Blaze
   - Blue
-  - Petunia
-  - Luna
   - Bubbles
-  - Rainbow
-  - Echo
+  - Buttercup
   - Cuddles
-  - Killer
-  - Paisley
-  - Echo
-  - Sweetie
-  - Tutu
-  - Reaper
-  - Peaches
   - Cujo
-  - Cuddles
-  - Lucifer
+  - Daffodil
   - Daisy
-  - Blaze
-  - Lady
+  - Dante
+  - Demon
+  - Diesel
+  - Echo
+  - Face Eater
   - Franny
   - Hades
-  - Baby
-  - Demon
+  - Killer
+  - Lady
+  - Lucifer
+  - Luna
+  - Magnum
+  - Mammon
+  - Midas
+  - Paisley
+  - Peaches
+  - Petunia
+  - Rainbow
+  - Reaper
+  - Satan
+  - Sweetie
   - Trixie
+  - Trogdor
+  - Tutu
+  - Zeus
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/dogs.yml b/Resources/Prototypes/Entities/Mobs/NPCs/dogs.yml
index 0c5b84df807..22da7583723 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/dogs.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/dogs.yml
@@ -30,7 +30,7 @@
         shape:
           !type:PhysShapeCircle
           radius: 0.35
-        density: 65
+        density: 135 #Bigger than Laika
         mask:
         - MobMask
         layer:
@@ -81,6 +81,15 @@
       proper: true
   - type: RandomMetadata
     nameSegments: [names_pitbull]
+  - type: Speech
+    speechVerb: Canine
+    speechSounds: Vulpkanin
+  - type: LanguageKnowledge
+    speaks:
+    - Dog
+    understands:
+    - Dog
+    - GalacticCommon
 
 - type: entity
   parent: MobPibble
@@ -106,7 +115,7 @@
         shape:
           !type:PhysShapeCircle
           radius: 0.28
-        density: 35
+        density: 135
         mask:
         - SmallMobMask
         layer:

From f7054a2ebb37f84edded244bbb418cb09175b731 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Mon, 26 Aug 2024 18:07:53 -0400
Subject: [PATCH 6/7] Update pitbull.yml

---
 Resources/Prototypes/Datasets/Names/pitbull.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Prototypes/Datasets/Names/pitbull.yml b/Resources/Prototypes/Datasets/Names/pitbull.yml
index 6da1770cd56..fb0765b1981 100644
--- a/Resources/Prototypes/Datasets/Names/pitbull.yml
+++ b/Resources/Prototypes/Datasets/Names/pitbull.yml
@@ -28,6 +28,7 @@
   - Paisley
   - Peaches
   - Petunia
+  - Princess
   - Rainbow
   - Reaper
   - Satan

From 1eb978738bf583d28f7c5b3ac36f45d53be38b35 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Mon, 26 Aug 2024 18:10:11 -0400
Subject: [PATCH 7/7] Update pitbull.yml

---
 Resources/Prototypes/Datasets/Names/pitbull.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Prototypes/Datasets/Names/pitbull.yml b/Resources/Prototypes/Datasets/Names/pitbull.yml
index fb0765b1981..adc4778d86c 100644
--- a/Resources/Prototypes/Datasets/Names/pitbull.yml
+++ b/Resources/Prototypes/Datasets/Names/pitbull.yml
@@ -2,6 +2,7 @@
   id: names_pitbull
   values:
   - Amon
+  - Arioch
   - Baby
   - Blaze
   - Blue