Fixed inconsistent tiles, rebalanced explosives (#6339)

This commit is contained in:
Rane
2022-01-30 09:34:11 -05:00
committed by GitHub
parent 20c2c53f33
commit b360f80da5
4 changed files with 9 additions and 11 deletions

View File

@@ -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));
}
}
}

View File

@@ -120,7 +120,7 @@
- type: SolutionContainerManager
solutions:
beaker:
maxVol: 60
maxVol: 40
canReact: false
- type: entity

View File

@@ -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

View File

@@ -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