From 9d9dd00ed4068d0c1abcc3ce6eb0e63110ce650d Mon Sep 17 00:00:00 2001
From: Emisse <99158783+Emisse@users.noreply.github.com>
Date: Sun, 13 Mar 2022 17:32:33 -0600
Subject: [PATCH] Foxes and Renault (#7111)

---
 .../Entities/Markers/Spawners/mobs.yml        |  13 ++++
 .../Prototypes/Entities/Mobs/NPCs/animals.yml |  58 ++++++++++++++++++
 .../Textures/Mobs/Animals/fox.rsi/fox.png     | Bin 0 -> 1583 bytes
 .../Mobs/Animals/fox.rsi/fox_dead.png         | Bin 0 -> 571 bytes
 .../Textures/Mobs/Animals/fox.rsi/meta.json   |  24 ++++++++
 5 files changed, 95 insertions(+)
 create mode 100644 Resources/Textures/Mobs/Animals/fox.rsi/fox.png
 create mode 100644 Resources/Textures/Mobs/Animals/fox.rsi/fox_dead.png
 create mode 100644 Resources/Textures/Mobs/Animals/fox.rsi/meta.json

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
index 0cbd61626d..84dc0221a3 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
@@ -85,3 +85,16 @@
   - type: ConditionalSpawner
     prototypes:
       - Drone
+
+- type: entity
+  name: Fox Renault Spawner
+  id: SpawnMobFoxRenault
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: green
+      - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+      - MobFoxRenault
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 1908ccb311..ffdf54aca9 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1117,3 +1117,61 @@
     attributes:
       proper: true
       gender: female
+
+- type: entity
+  name: fox
+  parent: SimpleMobBase
+  id: MobFox
+  description: They're a fox.
+  components:
+  - type: Sprite
+    drawdepth: Mobs
+    sprite: Mobs/Animals/fox.rsi
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: fox
+  - type: Physics
+  - type: Fixtures
+    fixtures:
+    - shape:
+        !type:PhysShapeCircle
+        radius: 0.35
+      mass: 10
+      mask:
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
+      layer:
+      - Opaque
+  - type: Appearance
+    visuals:
+    - type: DamageStateVisualizer
+      normal: fox
+      crit: fox_dead
+      dead: fox_dead
+  - type: Butcherable
+    spawned: FoodMeat
+    pieces: 3
+  - type: InteractionPopup
+    successChance: 0.5
+    interactSuccessString: petting-success-soft-floofy
+    interactFailureString: petting-failure-generic
+  - type: Grammar
+    attributes:
+      gender: epicene
+  - type: Bloodstream
+    bloodMaxVolume: 100
+      
+- type: entity
+  name: Renault
+  parent: MobFox
+  id: MobFoxRenault
+  description: The captain's trustworthy fox.
+  components:
+  - type: InteractionPopup
+    successChance: 1
+  - type: Grammar
+    attributes:
+      proper: true
+      gender: female
diff --git a/Resources/Textures/Mobs/Animals/fox.rsi/fox.png b/Resources/Textures/Mobs/Animals/fox.rsi/fox.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d57f2c17e85d19722b2fb1c3c42cbbc7179e57d
GIT binary patch
literal 1583
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Animals/fox.rsi/fox_dead.png b/Resources/Textures/Mobs/Animals/fox.rsi/fox_dead.png
new file mode 100644
index 0000000000000000000000000000000000000000..d22528e63112afdad031924e55402c5a55401beb
GIT binary patch
literal 571
zcmV-B0>u4^P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<S?MXyIRCt{2ls!wsP!xtwYLU=}QfR3*q;8T>D2Ua?!KFI5h~VU)
zql?}B0S@BkFL1DqPW}O@gNq*sLTGeTNwKs@tCbEy%stI*Z)}p*N^!}%+>f4f-Y4hY
z+aUb2d;lN72k-%W03W~y@Busl7N!$M^{oLRejM&z8r+~of0O44aQRr_Xt5b7Vhjr5
zm8YtzLFegon(KQ6!$LTTm`jpmTaV-pP+%vuS}h!Tp2x8-08*c<nzINj9#;l7zuuNW
zf7U@MbUQ{`PU=OYNdyV(&v^sTU<k)>eX#{*(XY-KDuqwmag;VghM0;VEXfg5WKTEP
zIASWKM1X|s+yVBI#N%<`59iy#f(h|a1JQzkW(|w8xuTM3PbOrH#XScI{2(FL1z=6d
z7Yo7|I0fU_teSgq%P`iSlRXm%jj3o31JQxB@)4lZW|G4i6CG{Xf^Eea16K*%Zgsjt
z>M^;&TrLNirr|=CWw^OfA)8HuwmaKv@~XK5c_|$0G1iNxc!z@Ja+%Y2Cb2zQJ_E9w
zIT739K_TdoS-%rwB6=r+>>`<bGPL{@$OpHe?JYajqXmZ5&zEC+1=x*J-8f$Yc)zMa
zy;^~_;ys+L1Y8UJRXxv;8mQ|PgP1>5TbxpWk;(Osh?>KQ^$p!;;(t>!gT(*<002ov
JPDHLkV1hAw`i=kq

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Animals/fox.rsi/meta.json b/Resources/Textures/Mobs/Animals/fox.rsi/meta.json
new file mode 100644
index 0000000000..c3e16806c9
--- /dev/null
+++ b/Resources/Textures/Mobs/Animals/fox.rsi/meta.json
@@ -0,0 +1,24 @@
+{
+  "version": 1,
+  "size":
+  {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from TG git https://github.com/tgstation/tgstation/blob/master/icons/mob/pets.dmi",
+  "states":
+  [
+    {
+      "name": "fox",
+      "directions": 4,
+      "delays": [[1],[1],[1],[1]]
+    },
+
+    {
+      "name": "fox_dead",
+      "directions": 1,
+      "delays": [[1]]
+    }
+  ]
+}