Space Bear Minor Overhaul (#14566)

diff --git a/Resources/Audio/Animals/bear.ogg b/Resources/Audio/Animals/bear.ogg
new file mode 100644 (file)
index 0000000..45041ff
Binary files /dev/null and b/Resources/Audio/Animals/bear.ogg differ

diff --git a/Resources/Audio/Animals/license.txt b/Resources/Audio/Animals/license.txt
index 792f0bfe014c7b5d023d507b4ab36503cb9ff18f..96ac52d28f64eaf00c205901a13e5067e37bcf7e 100644 (file)
--- a/Resources/Audio/Animals/license.txt
+++ b/Resources/Audio/Animals/license.txt
@@ -45,3 +45,5 @@ The following sounds were used from youtube:
     goat_bah.ogg: audio is created by youtube user "Winry Marini" (https://youtu.be/QIhwzsk5bww) licensed under CC BY 3.0
 
     lizard_happy.ogg: audio created by youtube user "Nagaty Studio" (https://youtu.be/I7CX0AS8RNI) licensed under CC by 3.0.
+
+    bear.ogg: audio is recorded by "Nagaty Studio" (https://www.youtube.com/watch?v=pz6eZbESlU8) licensed under CC by 3.0. The original audio was reverbed.

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/bear.yml b/Resources/Prototypes/Entities/Mobs/NPCs/bear.yml
index ace46bc0da1e15c1ff9730aa467ba708b638a1d9..eebc7b4037a6c84208e4f2ecc3fed40607f8ae6f 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/NPCs/bear.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/bear.yml
@@ -21,8 +21,8 @@
     fixtures:
     - shape:
         !type:PhysShapeCircle
-        radius: 0.48
-      density: 400
+        radius: 0.40
+      density: 100
       mask:
       - MobMask
       layer:
@@ -56,6 +56,12 @@
       prob: 0.3
   - type: Bloodstream
     bloodMaxVolume: 500
+    bloodReagent: Cryoxadone
+  - type: Vocal
+    sounds:
+      Male: Bear
+      Female: Bear
+      Unsexed: Bear
   - type: CombatMode
     disarmAction:
       enabled: false

diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml
index 88af527c39ad75756fce1af556b8be843db334df..f6f45cadd3a0b6bc308a2e15e10bf08f82949cfa 100644 (file)
--- a/Resources/Prototypes/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml
@@ -95,3 +95,10 @@
     collection: CluwneScreams
     params:
       variation: 0.125
+
+- type: emoteSounds
+  id: Bear
+  sound:
+    path: /Audio/Animals/bear.ogg
+    params:
+      variation: 0.125

diff --git a/Resources/Textures/Mobs/Animals/bear.rsi/bear.png b/Resources/Textures/Mobs/Animals/bear.rsi/bear.png
index a2eb0ef3c35be0f66bb2cddbcadb18083e27fca4..11f8ba5ed484198393ceca14b4248fbe62cfa9e2 100644 (file)
Binary files a/Resources/Textures/Mobs/Animals/bear.rsi/bear.png and b/Resources/Textures/Mobs/Animals/bear.rsi/bear.png differ

diff --git a/Resources/Textures/Mobs/Animals/bear.rsi/bear_dead.png b/Resources/Textures/Mobs/Animals/bear.rsi/bear_dead.png
index 2e47b74683ea5b09d5e17d670648a1fc561525fe..97f0ee5a7fd793d067e77b50a1bc39f0c698bcd5 100644 (file)
Binary files a/Resources/Textures/Mobs/Animals/bear.rsi/bear_dead.png and b/Resources/Textures/Mobs/Animals/bear.rsi/bear_dead.png differ

diff --git a/Resources/Textures/Mobs/Animals/bear.rsi/meta.json b/Resources/Textures/Mobs/Animals/bear.rsi/meta.json
index 5ac44ac4e97b32e3993a674dbd444a550b6dcc17..f42435e4f28d35c8431f975a1e4032f717b8e46b 100644 (file)
--- a/Resources/Textures/Mobs/Animals/bear.rsi/meta.json
+++ b/Resources/Textures/Mobs/Animals/bear.rsi/meta.json
@@ -5,7 +5,7 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b , remade by Alekshhh",
   "states": [
     {
       "name": "bear",