[Feat] Тонкие спрайты снова в строю (#102)

* Revert "Hair Overhaul (#19298)"

This reverts commit 9491f322de.

# Conflicts:
#	Resources/Textures/Mobs/Customization/human_hair.rsi/a.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/afro.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/afro2.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/bigafro.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/cornrows2.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/emofringe.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/keanu.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/long.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/long2.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/long3.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
#	Resources/Textures/Mobs/Customization/human_hair.rsi/modern.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/quiff.png

* add: возврат системы тонкоспрайтов

* fix: небольшие фиксы после реверта причесок

* add: старые текстуры для slim бодитайпа

* fix: фикс причесок после апстрима
This commit is contained in:
Remuchi
2024-02-24 17:06:32 +07:00
committed by GitHub
parent ac2d162c53
commit 3515e87f74
850 changed files with 6170 additions and 675 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 1016 B

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "monkey derivative derived by brainfood1183 (github) for ss14 from tgstation at commit https://github.com/tgstation/tgstation/commit/dd97a0e45d904fffadd9d2caad22aedd0d09f3ab then edited by Skarletto (github). Other sprites taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 and edited by Skarletto (github), edited by Emisse for ss14",
"copyright": "monkey derivative derived by brainfood1183 (github) for ss14 from tgstation at commit https://github.com/tgstation/tgstation/commit/dd97a0e45d904fffadd9d2caad22aedd0d09f3ab then edited by Skarletto (github). Other sprites taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 and edited by Skarletto (github)",
"size": {
"x": 32,
"y": 32
@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 994 B

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 924 B

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 1013 B

View File

@@ -18,6 +18,10 @@
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4

Some files were not shown because too many files have changed in this diff Show More