From: Alekshhh <44923899+Alekshhh@users.noreply.github.com> Date: Fri, 10 Mar 2023 13:45:44 +0000 (+0200) Subject: Space Bear Minor Overhaul (#14566) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=47253bfaebf3c5be78eaff07fdffe1257fc5ff04;p=space-station-14.git Space Bear Minor Overhaul (#14566) --- diff --git a/Resources/Audio/Animals/bear.ogg b/Resources/Audio/Animals/bear.ogg new file mode 100644 index 0000000000..45041ff0cb 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 792f0bfe01..96ac52d28f 100644 --- 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 ace46bc0da..eebc7b4037 100644 --- 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 88af527c39..f6f45cadd3 100644 --- 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 a2eb0ef3c3..11f8ba5ed4 100644 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 2e47b74683..97f0ee5a7f 100644 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 5ac44ac4e9..f42435e4f2 100644 --- 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",