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

Merge remote-tracking branch 'upstream/master' into upstream

Browse Source 
# Conflicts:
#	Content.Client/_Ohio/UI/AnimatedBackgroundControl.cs
#	Resources/Prototypes/_White/AnimatedLobbyScreens/lobbyScreens.yml
This commit is contained in:
Cinka
2024-03-17 15:51:30 +03:00
parent fdee5c808a 0377fc7091
commit 2d24788571
187 changed files with 2301 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Resources/Textures/White/Actions/changeling.rsi/augmented_eyesight.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 520 B

BIN
Resources/Textures/White/Actions/changeling.rsi/dissonant_shriek.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 398 B

11
Resources/Textures/White/Actions/changeling.rsi/meta.json
View File

@@ -1,4 +1,4 @@
{
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "By SS14 White Dream",
@@ -22,6 +22,15 @@
{
"name": "biodegrade"
},
{
"name": "augmented_eyesight"
},
{
"name": "dissonant_shriek"
},
{
"name": "organic_suit"
},
{
"name": "fleshmend"
},

BIN
Resources/Textures/White/Actions/changeling.rsi/organic_suit.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 579 B

BIN
Resources/Textures/White/Fluff/DoxXxoM/hair.rsi/hair_allthefuzz.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

15
Resources/Textures/White/Fluff/DoxXxoM/hair.rsi/meta.json Normal file
View File

@@ -0,0 +1,15 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "FrostyDev",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "hair_allthefuzz",
"directions": 4
}
]
}

BIN
Resources/Textures/White/Fluff/DoxXxoM/horns.rsi/m_frills_hornsdouble_ADJ.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 401 B

15
Resources/Textures/White/Fluff/DoxXxoM/horns.rsi/meta.json Normal file
View File

@@ -0,0 +1,15 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "FrostyDev",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "m_frills_hornsdouble_ADJ",
"directions": 4
}
]
}

BIN
Resources/Textures/White/Fluff/DoxXxoM/tail.rsi/m_tail_lizard_wagging_smooth_BEHIND.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

61
Resources/Textures/White/Fluff/DoxXxoM/tail.rsi/meta.json Normal file
View File

@@ -0,0 +1,61 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "FrostyDev",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "m_tail_lizard_wagging_smooth_BEHIND",
"directions": 4,
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
}
]
}

BIN
Resources/Textures/White/Fluff/Ritoka/cloak.rsi/equipped-OUTERCLOTHING.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
Resources/Textures/White/Fluff/Ritoka/cloak.rsi/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 496 B

84
Resources/Textures/White/Fluff/Ritoka/cloak.rsi/meta.json Normal file
View File

@@ -0,0 +1,84 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Ritoka",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "equipped-OUTERCLOTHING",
"directions": 4,
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "icon"
}
]
}

BIN
Resources/Textures/White/Fluff/Ritoka/hood.rsi/equipped-HELMET.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 798 B

BIN
Resources/Textures/White/Fluff/Ritoka/hood.rsi/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 285 B

18
Resources/Textures/White/Fluff/Ritoka/hood.rsi/meta.json Normal file
View File

@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Ritoka",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
}
]
}

BIN
Resources/Textures/White/Mobs/Customization/nigga.rsi/ebaniyhvost.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

57
Resources/Textures/White/Mobs/Customization/nigga.rsi/meta.json Normal file
View File

@@ -0,0 +1,57 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "dddddddddasdasdasdasdasd",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "ebaniyhvost",
"directions": 4,
"delays": [
[
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2
]
]
}
]
}

BIN
Resources/Textures/White/Objects/Storage/ziplocks.rsi/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

14
Resources/Textures/White/Objects/Storage/ziplocks.rsi/meta.json Normal file
View File

@@ -0,0 +1,14 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Maked by CaypenNow",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
}
]
}

BIN
Resources/Textures/White/Structures/Power/Generation/ame.rsi/control.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
Resources/Textures/White/Structures/Power/Generation/ame.rsi/control_critical.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
Resources/Textures/White/Structures/Power/Generation/ame.rsi/control_fuck.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.6 KiB

BIN
Resources/Textures/White/Structures/Power/Generation/ame.rsi/control_on.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
Resources/Textures/White/Structures/Power/Generation/ame.rsi/control_warning.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 643 B

BIN
Resources/Textures/White/Structures/Power/Generation/ame.rsi/core.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
Resources/Textures/White/Structures/Power/Generation/ame.rsi/core_strong.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.5 KiB

BIN
Resources/Textures/White/Structures/Power/Generation/ame.rsi/core_weak.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

217
Resources/Textures/White/Structures/Power/Generation/ame.rsi/meta.json Normal file
View File

@@ -0,0 +1,217 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "FrostyDev",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "shield_0"
},
{
"name": "shield_1"
},
{
"name": "shield_10"
},
{
"name": "shield_11"
},
{
"name": "shield_12"
},
{
"name": "shield_13"
},
{
"name": "shield_14"
},
{
"name": "shield_15"
},
{
"name": "shield_2"
},
{
"name": "shield_3"
},
{
"name": "shield_4"
},
{
"name": "shield_5"
},
{
"name": "shield_6"
},
{
"name": "shield_7"
},
{
"name": "shield_8"
},
{
"name": "core"
},
{
"name": "shield_9"
},
{
"name": "core_weak",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "core_strong",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "control"
},
{
"name": "static"
},
{
"name": "control_warning",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "control_critical",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "control_fuck",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "control_on",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
}
]
}

BIN
Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_10.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.0 KiB

BIN
Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_11.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_12.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_13.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_14.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_15.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_5.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_6.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_7.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_8.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
Resources/Textures/White/Structures/Power/Generation/ame.rsi/static.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
Resources/Textures/White/Structures/Power/Generation/solar_panel.rsi/broken.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.9 KiB

30
Resources/Textures/White/Structures/Power/Generation/solar_panel.rsi/meta.json Normal file
View File

@@ -0,0 +1,30 @@
{
"version":1,
"license":"CC-BY-SA-3.0",
"copyright":"FrostyDev",
"size":{"x":32,"y":32},
"states":
[
{
"name": "normal",
"select": [],
"flags": {},
"directions": 8
},
{
"name": "broken",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "static"
},
{
"name": "solar_assembly"
},
{
"name": "solar_tracker"
}
]
}

BIN
Resources/Textures/White/Structures/Power/Generation/solar_panel.rsi/normal.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
Resources/Textures/White/Structures/Power/Generation/solar_panel.rsi/solar_assembly.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
Resources/Textures/White/Structures/Power/Generation/solar_panel.rsi/solar_tracker.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
Resources/Textures/White/Structures/Power/Generation/solar_panel.rsi/static.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB