From 90b46699f6a88eef5c0db093fb44078984145c59 Mon Sep 17 00:00:00 2001 From: Pancake Date: Tue, 7 Jan 2025 16:51:53 -0800 Subject: [PATCH 1/4] Update vessel_warning.ogg (#34263) * Update vessel_warning.ogg Remove DC offset and apply short fade out. * Update attributions.yml * Update attributions.yml --- Resources/Audio/Machines/attributions.yml | 2 +- Resources/Audio/Machines/vessel_warning.ogg | Bin 4555 -> 4716 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Audio/Machines/attributions.yml b/Resources/Audio/Machines/attributions.yml index fe144d4338..e5756369be 100644 --- a/Resources/Audio/Machines/attributions.yml +++ b/Resources/Audio/Machines/attributions.yml @@ -35,7 +35,7 @@ - files: ["vessel_warning.ogg"] license: "CC-BY-4.0" - copyright: "Created by AUDACITIER (freesound), converted to MONO and .ogg and edited by EmoGarbage404 (github)." + copyright: "Created by AUDACITIER (freesound), converted to MONO and .ogg and edited by EmoGarbage404 (github). Removed click at beginning/end with fade in/out (Pancake)." source: "https://freesound.org/people/AUDACITIER/sounds/629196/" - files: ["quickbeep.ogg"] diff --git a/Resources/Audio/Machines/vessel_warning.ogg b/Resources/Audio/Machines/vessel_warning.ogg index 966c80eae6a61e470ea5a8699b1d0111bdced2c1..4385eb10e417794d60de435428fab72f3440efb3 100644 GIT binary patch delta 819 zcmV-31I+x(BkUv^PiJRS00IC200000007!K00000000YUxXh6nE)3c^000310070} zy85wH9uI%oIRF3x0000c_)bX(CnYCSKz*#XJUSo0Gyp$Hml@T7tHbb_2LI)mKf`Bk&T1I+j=x{*h{Y60(<8tM9H%YHdM5n0|Lg!i`jI?n8 zB(LAz4CGY`q`4{p$Dp>z;bNK?9(DR5eaQz7P+fly8AoBx{+}oU`ib5Lp7b?$*E4b6 zVbf7l`~v{Y0Ny0b0f{mI005xJaU93-6J-Hj<{APEpfod5DMe!h0FWm;(A4hzra%AU z=iRpb=hxkK*m1{;0Z{YEkxc_aNVwA5Ljmp%l z!M88&Vd1)s-kyUmg`AaBEWd0myIDdVMgLhy!3l|+_#zGQUb?g3;UUM>rT%d>{i}c0 z?XcBHOTcayc=dvuX_Hs2EWaCQIr_pX%#w^Ye|0l|X{eV%*Aws#2kuk~H0!!~)&K7G zzkBf~`6Ofu*g?5Ys{`l)-Ae!-ha88WZ3*-`D-P5S4@2B4}$m8^sUaQ2E3KRmp!J`82UC|#qnX{$y)u8C*5%y;&@#zjHM3~8htAagnAI5M(Xx?Gv+`6+ z`OIo;;kO=AG(GKcU{X%CsQ#AErqS?~PI=^ei|n3EU{Y>sQPeV@LGhTONvZbGIgy_X xFPl*0i>!fP<3!`>?ingB0bY|wi|n32`O`I%*_0K3tcOGsXqjW=f#DTUs{$1(d+GoH delta 657 zcmV;C0&e~6B+DZjPiJRS00IC200000004I^000000022WMTLkDnnER1TOKRh8+{$Tqm!K%Z{O=(Pv zX))C;=z`ON&yIij+l|U@dV6&ZyIG?H1fO63WREYV8DY9Q;Dp+#wumsJZ?C)V&wi$| z5ujgpMzwJO+KE2$4_36@`owvM&$Xub2M}NenE!tn^b-io0001h9>=lAakx%^m$SKA zK!EYfz(5r^L$BPR93D{f5%?!}w*onsK<)-!+7fC6+sgE88W(OOTs2?V#Ve-DVf9)mDj z1rPvY!kJ@UK~;iw%3#`60~EJ!zdYu)`b0Pw+IshEEuY0yDYcA8YxbepU7{WnDH9=H3$!uLA ze^UC9HILP}Y$Uf|E}r3660~;-q*_?cv&}TD>56W#8FkZZ&UTH%fScW1BHM`uB(KMz r7$x`@;keUdzzyWi2$|d}&OW64XYZYPCJ*U@oWDk4p?hc3XY)t{y(u81 From 23f0b304f284d2600cb2c6b4c9d36fdca7f99ec4 Mon Sep 17 00:00:00 2001 From: Tayrtahn Date: Tue, 7 Jan 2025 20:00:20 -0500 Subject: [PATCH 2/4] Add bleating accent to goats (#34273) --- .../Components/BleatingAccentComponent.cs | 7 +++++ .../EntitySystems/BleatingAccentSystem.cs | 28 +++++++++++++++++++ .../en-US/chat/managers/chat-manager.ftl | 5 ++++ .../Prototypes/Entities/Mobs/NPCs/animals.yml | 9 ++++++ .../Prototypes/Voice/speech_emote_sounds.yml | 7 +++++ Resources/Prototypes/Voice/speech_sounds.yml | 9 ++++++ Resources/Prototypes/Voice/speech_verbs.yml | 8 ++++++ 7 files changed, 73 insertions(+) create mode 100644 Content.Server/Speech/Components/BleatingAccentComponent.cs create mode 100644 Content.Server/Speech/EntitySystems/BleatingAccentSystem.cs diff --git a/Content.Server/Speech/Components/BleatingAccentComponent.cs b/Content.Server/Speech/Components/BleatingAccentComponent.cs new file mode 100644 index 0000000000..484235ab90 --- /dev/null +++ b/Content.Server/Speech/Components/BleatingAccentComponent.cs @@ -0,0 +1,7 @@ +namespace Content.Server.Speech.Components; + +/// +/// Makes this entity speak like a sheep or a goat in all chat messages it sends. +/// +[RegisterComponent] +public sealed partial class BleatingAccentComponent : Component { } diff --git a/Content.Server/Speech/EntitySystems/BleatingAccentSystem.cs b/Content.Server/Speech/EntitySystems/BleatingAccentSystem.cs new file mode 100644 index 0000000000..903377477e --- /dev/null +++ b/Content.Server/Speech/EntitySystems/BleatingAccentSystem.cs @@ -0,0 +1,28 @@ +using System.Text.RegularExpressions; +using Content.Server.Speech.Components; + +namespace Content.Server.Speech.EntitySystems; + +public sealed partial class BleatingAccentSystem : EntitySystem +{ + private static readonly Regex BleatRegex = new("([mbdlpwhrkcnytfo])([aiu])", RegexOptions.IgnoreCase); + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnAccentGet); + } + + private void OnAccentGet(Entity entity, ref AccentGetEvent args) + { + args.Message = Accentuate(args.Message); + } + + public static string Accentuate(string message) + { + // Repeats the vowel in certain consonant-vowel pairs + // So you taaaalk liiiike thiiiis + return BleatRegex.Replace(message, "$1$2$2$2$2"); + } +} diff --git a/Resources/Locale/en-US/chat/managers/chat-manager.ftl b/Resources/Locale/en-US/chat/managers/chat-manager.ftl index 59b927742b..c3d35c9739 100644 --- a/Resources/Locale/en-US/chat/managers/chat-manager.ftl +++ b/Resources/Locale/en-US/chat/managers/chat-manager.ftl @@ -118,6 +118,11 @@ chat-speech-verb-canine-1 = barks chat-speech-verb-canine-2 = woofs chat-speech-verb-canine-3 = howls +chat-speech-verb-name-goat = Goat +chat-speech-verb-goat-1 = bleats +chat-speech-verb-goat-2 = grunts +chat-speech-verb-goat-3 = cries + chat-speech-verb-name-small-mob = Mouse chat-speech-verb-small-mob-1 = squeaks chat-speech-verb-small-mob-2 = pieps diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 2413d5531b..e88100d22c 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -998,6 +998,15 @@ - type: Grammar attributes: gender: female # Here because of UdderComponent + - type: Speech + speechSounds: Goat + speechVerb: Goat + - type: Vocal + sounds: + Female: Goat + Male: Goat + Unsexed: Goat + - type: BleatingAccent - type: InteractionPopup successChance: 0.2 interactSuccessString: petting-success-goat diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml index a45260093f..8f4d4fc88e 100644 --- a/Resources/Prototypes/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml @@ -527,3 +527,10 @@ path: /Audio/Animals/parrot_raught.ogg params: variation: 0.125 + +- type: emoteSounds + id: Goat + sound: + path: /Audio/Animals/goat_bah.ogg + params: + variation: 0.125 diff --git a/Resources/Prototypes/Voice/speech_sounds.yml b/Resources/Prototypes/Voice/speech_sounds.yml index bc3cffb359..c1ad6b9e40 100644 --- a/Resources/Prototypes/Voice/speech_sounds.yml +++ b/Resources/Prototypes/Voice/speech_sounds.yml @@ -159,3 +159,12 @@ path: /Audio/Animals/chicken_cluck_happy.ogg exclaimSound: path: /Audio/Animals/chicken_cluck_happy.ogg + +- type: speechSounds + id: Goat + saySound: + path: /Audio/Animals/goat_bah.ogg + askSound: + path: /Audio/Animals/goat_bah.ogg + exclaimSound: + path: /Audio/Animals/goat_bah.ogg diff --git a/Resources/Prototypes/Voice/speech_verbs.yml b/Resources/Prototypes/Voice/speech_verbs.yml index 9879cefb75..f8202847fd 100644 --- a/Resources/Prototypes/Voice/speech_verbs.yml +++ b/Resources/Prototypes/Voice/speech_verbs.yml @@ -110,6 +110,14 @@ - chat-speech-verb-canine-2 - chat-speech-verb-canine-3 +- type: speechVerb + id: Goat + name: chat-speech-verb-name-goat + speechVerbStrings: + - chat-speech-verb-goat-1 + - chat-speech-verb-goat-2 + - chat-speech-verb-goat-3 + - type: speechVerb id: LargeMob name: chat-speech-verb-name-large-mob From 4d26ea619ea8f000e03acdc212ad4695e3dc9222 Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 8 Jan 2025 01:01:30 +0000 Subject: [PATCH 3/4] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index e8b2bdfd64..2d0f28d80f 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Fildrance - changes: - - message: random uplink discounts for traitors - type: Add - id: 7287 - time: '2024-09-05T12:12:39.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26297 - author: ScarKy0 changes: - message: AI Actions now work. @@ -3932,3 +3925,10 @@ id: 7786 time: '2025-01-07T17:45:03.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/34265 +- author: Tayrtahn + changes: + - message: Sentient goats now have a bleating effect when speaking. + type: Add + id: 7787 + time: '2025-01-08T01:00:20.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/34273 From 010924611da101c20e31d65a30f1e3122930ea8c Mon Sep 17 00:00:00 2001 From: Piras314 Date: Tue, 7 Jan 2025 21:50:46 -0500 Subject: [PATCH 4/4] Happy New Year (#34288) happy new year --- LICENSE.TXT | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.TXT b/LICENSE.TXT index 84187b79a3..30d1999e16 100644 --- a/LICENSE.TXT +++ b/LICENSE.TXT @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2017-2024 Space Wizards Federation +Copyright (c) 2017-2025 Space Wizards Federation Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal