From: Ed <96445749+TheShuEd@users.noreply.github.com>
Date: Thu, 16 Nov 2023 08:12:56 +0000 (+0300)
Subject: Cak Upgrade (#21678)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=d6870f4a491ea05c03ef134aa26eb56f72dca5f0;p=space-station-14.git

Cak Upgrade (#21678)

* added fun

* change recipe, add OwO

* fix?

* upgrade
---

diff --git a/Resources/Audio/Animals/attributions.yml b/Resources/Audio/Animals/attributions.yml
index b6b5f8552b..180502850f 100644
--- a/Resources/Audio/Animals/attributions.yml
+++ b/Resources/Audio/Animals/attributions.yml
@@ -7,6 +7,11 @@
   license: "CC-BY-3.0"
   copyright: "Modified from 'Meow 4.wav' by freesound user 'TRNGLE. The original audio was trimmed, split to mono, and converted from WAV to OGG format"
   source: "https://freesound.org/people/TRNGLE/sounds/368006/"
+  
+- files: ["cat_meow2.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "Created by freesound user 'TRNGLE. The original audio split to mono, and converted from WAV to OGG format"
+  source: "https://freesound.org/people/TRNGLE/sounds/362652/"
 
 - files: ["cat_hiss.ogg"]
   license: "CC0-1.0"
diff --git a/Resources/Audio/Animals/cat_meow2.ogg b/Resources/Audio/Animals/cat_meow2.ogg
new file mode 100644
index 0000000000..7b854a983e
Binary files /dev/null and b/Resources/Audio/Animals/cat_meow2.ogg differ
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
index 92f77be738..97eaeb1145 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
@@ -586,6 +586,29 @@
     rules: ghost-role-information-Cak-rules
   - type: GhostTakeoverAvailable
   - type: OwOAccent
+  - type: Speech
+    speechSounds: Cat
+    speechVerb: SmallMob
+  - type: MovementSpeedModifier
+    baseWalkSpeed : 5
+    baseSprintSpeed : 3
+  - type: Tag
+    tags:
+    - VimPilot
+    - DoorBumpOpener
+  - type: CanEscapeInventory
+    baseResistTime: 2
+  - type: Puller
+    needsHands: false
+  - type: Examiner
+  - type: CombatMode
+  - type: MeleeWeapon
+    soundHit:
+      path: /Audio/Animals/cat_hiss.ogg
+    hidden: true
+    damage:
+      groups:
+        Brute: 1
 
 # Suppermatter
 # I can't figure out where to put this. It kind of acts like a cake I guess?
diff --git a/Resources/Prototypes/Voice/speech_sounds.yml b/Resources/Prototypes/Voice/speech_sounds.yml
index d59e3189da..ece518a7cc 100644
--- a/Resources/Prototypes/Voice/speech_sounds.yml
+++ b/Resources/Prototypes/Voice/speech_sounds.yml
@@ -96,3 +96,12 @@
     path: /Audio/Voice/Talk/arachnid_ask.ogg
   exclaimSound:
     path: /Audio/Voice/Talk/arachnid_exclaim.ogg
+
+- type: speechSounds
+  id: Cat
+  saySound:
+    path: /Audio/Animals/cat_meow2.ogg
+  askSound:
+    path: /Audio/Animals/cat_meow.ogg
+  exclaimSound:
+    path: /Audio/Animals/cat_meow.ogg
\ No newline at end of file