Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed inconsistent tiles, rebalanced explosives (#6339)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Client/Trigger/TimerTriggerVisualizer.cs
View File

@@ -16,7 +16,7 @@ namespace Content.Client.Trigger
{ {
private const string AnimationKey = "priming_animation"; private const string AnimationKey = "priming_animation";
[DataField("countdown_sound", required: true)] [DataField("countdown_sound", required: false)]
private SoundSpecifier _countdownSound = default!; private SoundSpecifier _countdownSound = default!;
private Animation PrimingAnimation = default!; private Animation PrimingAnimation = default!;
@@ -30,11 +30,14 @@ namespace Content.Client.Trigger
flick.LayerKey = TriggerVisualLayers.Base; flick.LayerKey = TriggerVisualLayers.Base;
flick.KeyFrames.Add(new AnimationTrackSpriteFlick.KeyFrame("primed", 0f)); flick.KeyFrames.Add(new AnimationTrackSpriteFlick.KeyFrame("primed", 0f));
if (_countdownSound != null)
{
var sound = new AnimationTrackPlaySound(); var sound = new AnimationTrackPlaySound();
PrimingAnimation.AnimationTracks.Add(sound); PrimingAnimation.AnimationTracks.Add(sound);
sound.KeyFrames.Add(new AnimationTrackPlaySound.KeyFrame(_countdownSound.GetSound(), 0)); sound.KeyFrames.Add(new AnimationTrackPlaySound.KeyFrame(_countdownSound.GetSound(), 0));
} }
} }
}
public override void InitializeEntity(EntityUid entity) public override void InitializeEntity(EntityUid entity)
{ {

2
Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
View File

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

4
Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml
View File

@@ -36,8 +36,6 @@
- type: Appearance - type: Appearance
visuals: visuals:
- type: TimerTriggerVisualizer - type: TimerTriggerVisualizer
countdown_sound:
path: /Audio/Effects/countdown.ogg
- type: entity - type: entity
name: flashbang name: flashbang
@@ -114,8 +112,6 @@
- type: Appearance - type: Appearance
visuals: visuals:
- type: TimerTriggerVisualizer - type: TimerTriggerVisualizer
countdown_sound:
path: /Audio/Effects/countdown.ogg
- type: entity - type: entity
name: the nuclear option name: the nuclear option

3
Resources/Prototypes/Tiles/floors.yml
View File

@@ -1,4 +1,4 @@
- type: tile - type: tile
id: floor_steel id: floor_steel
name: steel floor name: steel floor
texture: "steel" texture: "steel"
@@ -18,7 +18,6 @@
name: wood name: wood
texture: "wood" texture: "wood"
base_turfs: base_turfs:
- space
- plating - plating
is_subfloor: false is_subfloor: false
can_crowbar: true can_crowbar: true