diff --git a/Content.Client/Trigger/TimerTriggerVisualizer.cs b/Content.Client/Trigger/TimerTriggerVisualizer.cs index b3406411e4..77f7c1ab23 100644 --- a/Content.Client/Trigger/TimerTriggerVisualizer.cs +++ b/Content.Client/Trigger/TimerTriggerVisualizer.cs @@ -16,7 +16,7 @@ namespace Content.Client.Trigger { private const string AnimationKey = "priming_animation"; - [DataField("countdown_sound", required: true)] + [DataField("countdown_sound", required: false)] private SoundSpecifier _countdownSound = default!; private Animation PrimingAnimation = default!; @@ -30,9 +30,12 @@ namespace Content.Client.Trigger flick.LayerKey = TriggerVisualLayers.Base; flick.KeyFrames.Add(new AnimationTrackSpriteFlick.KeyFrame("primed", 0f)); - var sound = new AnimationTrackPlaySound(); - PrimingAnimation.AnimationTracks.Add(sound); - sound.KeyFrames.Add(new AnimationTrackPlaySound.KeyFrame(_countdownSound.GetSound(), 0)); + if (_countdownSound != null) + { + var sound = new AnimationTrackPlaySound(); + PrimingAnimation.AnimationTracks.Add(sound); + sound.KeyFrames.Add(new AnimationTrackPlaySound.KeyFrame(_countdownSound.GetSound(), 0)); + } } } diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml index 6c51a9f8db..acada967e2 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml @@ -120,7 +120,7 @@ - type: SolutionContainerManager solutions: beaker: - maxVol: 60 + maxVol: 40 canReact: false - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml index b302c6dd9b..eaf25ef0d3 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml @@ -36,8 +36,6 @@ - type: Appearance visuals: - type: TimerTriggerVisualizer - countdown_sound: - path: /Audio/Effects/countdown.ogg - type: entity name: flashbang @@ -114,8 +112,6 @@ - type: Appearance visuals: - type: TimerTriggerVisualizer - countdown_sound: - path: /Audio/Effects/countdown.ogg - type: entity name: the nuclear option diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index 056527ffd6..18e94d23a2 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -1,4 +1,4 @@ -- type: tile +- type: tile id: floor_steel name: steel floor texture: "steel" @@ -18,7 +18,6 @@ name: wood texture: "wood" base_turfs: - - space - plating is_subfloor: false can_crowbar: true