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

Merge branch 'master' into 2020-08-19-firelocks

Browse Source 
# Conflicts:
#	Content.Server/GameObjects/Components/Atmos/AirtightComponent.cs
#	Content.Server/GameObjects/Components/Atmos/GridAtmosphereComponent.cs
#	SpaceStation14.sln.DotSettings
This commit is contained in:
Víctor Aguilera Puerto
2020-08-28 14:35:45 +02:00
parent a5fbe0f024 fb0ac3d70e
commit 16f0eebf15
494 changed files with 11527 additions and 3829 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Resources/Textures/Constructible/Lighting/emergency_light.rsi/emergency_light_off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 336 B

BIN
Resources/Textures/Constructible/Lighting/emergency_light.rsi/emergency_light_on.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

66
Resources/Textures/Constructible/Lighting/emergency_light.rsi/meta.json Normal file
View File

@@ -0,0 +1,66 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"states": [
{
"name": "emergency_light_off",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "emergency_light_on",
"directions": 4,
"delays": [
[
0.3,
0.3,
0.3,
0.3,
0.3,
0.3
],
[
0.3,
0.3,
0.3,
0.3,
0.3,
0.3
],
[
0.3,
0.3,
0.3,
0.3,
0.3,
0.3
],
[
0.3,
0.3,
0.3,
0.3,
0.3,
0.3
]
]
}
]
}