Post-merge fixes

SerbiaStrong-220 · Aug 10, 2023 · b1bd431 · b1bd431
1 parent 5914538
commit b1bd431
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/Content.Client/Corvax/TTS/HumanoidProfileEditor.TTS.cs b/Content.Client/Corvax/TTS/HumanoidProfileEditor.TTS.cs
@@ -35,7 +35,7 @@ private void InitializeVoice()
             _voiceButton.SelectId(args.Id);
             SetVoice(_voiceList[args.Id].ID);
         };
-            
+
         _voicePlayButton.OnPressed += _ => { PlayTTS(); };
     }
 
@@ -52,7 +52,7 @@ private void UpdateTTSVoicesControls()
             var voice = _voiceList[i];
             if (!HumanoidCharacterProfile.CanHaveVoice(voice, Profile.Sex))
                 continue;
-                
+
             var name = Loc.GetString(voice.Name);
             _voiceButton.AddItem(name, i);
 

diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
@@ -57,6 +57,7 @@ public sealed partial class HumanoidProfileEditor : Control
         private readonly IConfigurationManager _configurationManager;
         private readonly MarkingManager _markingManager;
         private readonly JobRequirementsManager _requirements;
+        private readonly IRobustRandom _random;
 
         private LineEdit _ageEdit => CAgeEdit;
         private LineEdit _nameEdit => CNameEdit;
@@ -76,7 +77,7 @@ public sealed partial class HumanoidProfileEditor : Control
         private SingleMarkingPicker _facialHairPicker => CFacialHairPicker;
         private EyeColorPicker _eyesPicker => CEyeColorPicker;
 
-        private CheckBox _teleportAfkToCryoStorage => CTeleportAfkToCryoStorage; 
+        private CheckBox _teleportAfkToCryoStorage => CTeleportAfkToCryoStorage;
 
         private TabContainer _tabContainer => CTabContainer;
         private BoxContainer _jobList => CJobList;
@@ -122,6 +123,7 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
             _preferencesManager = preferencesManager;
             _configurationManager = configurationManager;
             _markingManager = IoCManager.Resolve<MarkingManager>();
+            _random = IoCManager.Resolve<IRobustRandom>();
 
             #region Left
 
@@ -519,9 +521,9 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
             };
             _previewSpriteSideControl.AddChild(_previewSpriteSide);
             #endregion Dummy
-            
+
             #region TeleportAfkToCryoStorage
-            
+
             _tabContainer.SetTabTitle(5, Loc.GetString("humanoid-profile-edtior-afkPreferences-tab"));
             _teleportAfkToCryoStorage.Pressed = Profile?.TeleportAfkToCryoStorage ?? true;
             _teleportAfkToCryoStorage.OnToggled += args => SetTeleportAfkToCryoStorage(args.Pressed);

diff --git a/Content.Server/SS220/SwitchableWeapon/SwitchableWeaponSystem.cs b/Content.Server/SS220/SwitchableWeapon/SwitchableWeaponSystem.cs
@@ -43,8 +43,6 @@ private void OnStaminaHitAttempt(EntityUid uid, SwitchableWeaponComponent compon
     {
         if (!component.IsOpen)
             return;
-
-        args.HitSoundOverride = component.BonkSound;
     }
 
     private void OnExamined(EntityUid uid, SwitchableWeaponComponent comp, ExaminedEvent args)

diff --git a/Content.Shared/SS220/SwitchableWeapon/SwitchableWeaponComponent.cs b/Content.Shared/SS220/SwitchableWeapon/SwitchableWeaponComponent.cs
@@ -33,9 +33,6 @@ public sealed class SwitchableWeaponComponent : Component
     [ViewVariables(VVAccess.ReadWrite)][DataField("closeSound")]
     public SoundSpecifier? CloseSound;
 
-    [ViewVariables(VVAccess.ReadWrite)][DataField("bonkSound")]
-    public SoundSpecifier? BonkSound;
-
     [ViewVariables(VVAccess.ReadWrite)][DataField("sizeOpened")]
     public int SizeOpened = 15;
 

diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/telescopichka.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/telescopichka.yml
@@ -29,6 +29,8 @@
   - type: StaminaDamageOnHit
     damage: 0
   - type: MeleeWeapon
+    soundHit: !type:SoundCollectionSpecifier
+      collection: BatonHit
     damage:
       types:
         Blunt: 0