Merge pull request #984 from SweptWasTaken/airlocks

* Speeds up Airlocks
* Merges Swept into the repo
This commit is contained in:
Víctor Aguilera Puerto
2020-05-27 18:30:39 +02:00
committed by GitHub
13 changed files with 521 additions and 521 deletions

View File

@@ -1,4 +1,4 @@
using System; using System;
using Content.Client.GameObjects.Components.Wires; using Content.Client.GameObjects.Components.Wires;
using Content.Shared.GameObjects.Components.Doors; using Content.Shared.GameObjects.Components.Doors;
using Robust.Client.Animations; using Robust.Client.Animations;
@@ -27,7 +27,7 @@ namespace Content.Client.GameObjects.Components.Doors
var closeSound = node.GetNode("close_sound").AsString(); var closeSound = node.GetNode("close_sound").AsString();
var denySound = node.GetNode("deny_sound").AsString(); var denySound = node.GetNode("deny_sound").AsString();
CloseAnimation = new Animation {Length = TimeSpan.FromSeconds(1.2f)}; CloseAnimation = new Animation {Length = TimeSpan.FromSeconds(0.8f)};
{ {
var flick = new AnimationTrackSpriteFlick(); var flick = new AnimationTrackSpriteFlick();
CloseAnimation.AnimationTracks.Add(flick); CloseAnimation.AnimationTracks.Add(flick);
@@ -49,7 +49,7 @@ namespace Content.Client.GameObjects.Components.Doors
sound.KeyFrames.Add(new AnimationTrackPlaySound.KeyFrame(closeSound, 0)); sound.KeyFrames.Add(new AnimationTrackPlaySound.KeyFrame(closeSound, 0));
} }
OpenAnimation = new Animation {Length = TimeSpan.FromSeconds(1.2f)}; OpenAnimation = new Animation {Length = TimeSpan.FromSeconds(0.8f)};
{ {
var flick = new AnimationTrackSpriteFlick(); var flick = new AnimationTrackSpriteFlick();
OpenAnimation.AnimationTracks.Add(flick); OpenAnimation.AnimationTracks.Add(flick);

View File

@@ -25,14 +25,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -41,12 +41,12 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.5, 0.25,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.15
] ]
] ]
}, },
@@ -75,14 +75,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.4 0.07,
0.2
] ]
] ]
}, },
@@ -91,14 +91,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -116,14 +116,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -132,12 +132,12 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.5 0.07,
0.07,
0.25
] ]
] ]
}, },

View File

@@ -25,14 +25,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -41,12 +41,12 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.5, 0.25,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.15
] ]
] ]
}, },
@@ -75,14 +75,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -91,14 +91,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -116,14 +116,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -132,12 +132,12 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.5 0.07,
0.07,
0.25
] ]
] ]
}, },

View File

@@ -25,14 +25,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -41,12 +41,12 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.5, 0.25,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.15
] ]
] ]
}, },
@@ -75,14 +75,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -91,14 +91,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -116,14 +116,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -132,12 +132,12 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.5 0.07,
0.07,
0.25
] ]
] ]
}, },

View File

@@ -25,14 +25,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -41,12 +41,12 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.5, 0.25,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.15
] ]
] ]
}, },
@@ -75,14 +75,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -91,14 +91,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -116,14 +116,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -132,12 +132,12 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.5 0.07,
0.07,
0.25
] ]
] ]
}, },

View File

@@ -25,14 +25,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -41,12 +41,12 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.5, 0.25,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.15
] ]
] ]
}, },
@@ -75,14 +75,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -91,14 +91,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -116,14 +116,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -132,12 +132,12 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.5 0.07,
0.07,
0.25
] ]
] ]
}, },

View File

@@ -25,14 +25,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -41,12 +41,12 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.5, 0.25,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.15
] ]
] ]
}, },
@@ -75,14 +75,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -91,14 +91,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -116,14 +116,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -132,12 +132,12 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.5 0.07,
0.07,
0.25
] ]
] ]
}, },

View File

@@ -25,14 +25,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -41,12 +41,12 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.5, 0.25,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.15
] ]
] ]
}, },
@@ -75,14 +75,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -91,14 +91,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -116,14 +116,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -132,12 +132,12 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.5 0.07,
0.07,
0.25
] ]
] ]
}, },

View File

@@ -25,14 +25,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -41,12 +41,12 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.5, 0.25,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.15
] ]
] ]
}, },
@@ -75,14 +75,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -91,14 +91,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -116,14 +116,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -132,12 +132,12 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.5 0.07,
0.07,
0.25
] ]
] ]
}, },

View File

@@ -25,14 +25,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -41,12 +41,12 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.5, 0.25,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.15
] ]
] ]
}, },
@@ -75,14 +75,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -91,14 +91,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -116,14 +116,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -132,12 +132,12 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.5 0.07,
0.07,
0.25
] ]
] ]
}, },

View File

@@ -25,14 +25,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -41,12 +41,12 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.5, 0.25,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.15
] ]
] ]
}, },
@@ -75,14 +75,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -91,14 +91,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -116,14 +116,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -132,12 +132,12 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.5 0.07,
0.07,
0.25
] ]
] ]
}, },

View File

@@ -25,14 +25,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -41,12 +41,12 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.5, 0.25,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.15
] ]
] ]
}, },
@@ -75,14 +75,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -91,14 +91,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -116,14 +116,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },

View File

@@ -25,14 +25,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -41,12 +41,12 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.5, 0.25,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.15
] ]
] ]
}, },
@@ -75,14 +75,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -91,14 +91,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -116,14 +116,14 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.1, 0.07,
0.1, 0.07,
0.3 0.07,
0.07,
0.2
] ]
] ]
}, },
@@ -132,12 +132,12 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.2,
0.2,
0.1, 0.1,
0.1, 0.1,
0.1, 0.07,
0.5 0.07,
0.07,
0.25
] ]
] ]
}, },