From: Alekshhh <44923899+Alekshhh@users.noreply.github.com>
Date: Fri, 24 Mar 2023 20:28:29 +0000 (+0300)
Subject: Cerberus Resprite (#14653)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=230e058593d6f834755bbe90fbb676ef636ac673;p=space-station-14.git

Cerberus Resprite (#14653)
---

diff --git a/Resources/Audio/Animals/cerberus.ogg b/Resources/Audio/Animals/cerberus.ogg
new file mode 100644
index 0000000000..2ee93d951a
Binary files /dev/null and b/Resources/Audio/Animals/cerberus.ogg differ
diff --git a/Resources/Audio/Animals/license.txt b/Resources/Audio/Animals/license.txt
index 96ac52d28f..70a76ec2cf 100644
--- a/Resources/Audio/Animals/license.txt
+++ b/Resources/Audio/Animals/license.txt
@@ -32,6 +32,8 @@ The following sounds were used from freesound:
 
     pig_oink.ogg:  modified from "Pig Oink.wav" by freesound user "qubodup" (https://freesound.org/people/qubodup/sounds/442906/) licensed under CC0 1.0 (public domain). The original audio was converted from WAV to OGG format.
 
+    cerberus.ogg: modified from "DogBARKING.wav" by freesound user "ahill86" (https://freesound.org/people/ahill86/sounds/207124/) licensed under CCO 1.0 (Public domain dedication). The original audio was converted from WAV to OGG format, echoed, amplified and pitched down.
+
 The following sounds are taken from TGstation github (licensed under CC by 3.0):
 
     space_dragon_roar.ogg: taken at https://github.com/tgstation/tgstation/commit/d4f678a1772007ff8d7eddd21cf7218c8e07bfc0
diff --git a/Resources/Prototypes/Entities/Mobs/Player/familiars.yml b/Resources/Prototypes/Entities/Mobs/Player/familiars.yml
index 88b26536ed..d8477281ed 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/familiars.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/familiars.yml
@@ -75,3 +75,8 @@
   - type: Mind
     showExamineInfo: true
   - type: Familiar
+  - type: Vocal
+    sounds:
+      Male: Cerberus
+      Female: Cerberus
+      Unsexed: Cerberus
diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml
index f6f45cadd3..88306ab8a8 100644
--- a/Resources/Prototypes/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml
@@ -102,3 +102,10 @@
     path: /Audio/Animals/bear.ogg
     params:
       variation: 0.125
+
+- type: emoteSounds
+  id: Cerberus
+  sound:
+    path: /Audio/Animals/cerberus.ogg
+    params:
+      variation: 0.125
diff --git a/Resources/Textures/Mobs/Pets/corgi.rsi/meta.json b/Resources/Textures/Mobs/Pets/corgi.rsi/meta.json
index 084ea74d93..3a54093164 100644
--- a/Resources/Textures/Mobs/Pets/corgi.rsi/meta.json
+++ b/Resources/Textures/Mobs/Pets/corgi.rsi/meta.json
@@ -5,7 +5,7 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b",
+  "copyright": "https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b , cerberus by Alekshhh",
   "states": [
     {
       "name": "corgi",
@@ -209,29 +209,11 @@
     },
     {
       "name": "narsian",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
+      "directions": 4
     },
     {
       "name": "narsian_dead",
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "directions": 1
     },
     {
       "name": "old_ian",
diff --git a/Resources/Textures/Mobs/Pets/corgi.rsi/narsian.png b/Resources/Textures/Mobs/Pets/corgi.rsi/narsian.png
index 41a2622388..bdeec84662 100644
Binary files a/Resources/Textures/Mobs/Pets/corgi.rsi/narsian.png and b/Resources/Textures/Mobs/Pets/corgi.rsi/narsian.png differ
diff --git a/Resources/Textures/Mobs/Pets/corgi.rsi/narsian_dead.png b/Resources/Textures/Mobs/Pets/corgi.rsi/narsian_dead.png
index 6d792a2b54..0d2c5b3a35 100644
Binary files a/Resources/Textures/Mobs/Pets/corgi.rsi/narsian_dead.png and b/Resources/Textures/Mobs/Pets/corgi.rsi/narsian_dead.png differ