tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use TG human sprites.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2020-01-20 15:13:03 +01:00
parent 54f5f0ac08
commit 77fcc4a673
25 changed files with 104 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Client/GameObjects/Components/Mobs/HumanoidAppearanceComponent.cs
View File

@@ -44,7 +44,8 @@ namespace Content.Client.GameObjects.Components.Mobs
sprite.LayerSetColor(HumanoidVisualLayers.Hair, Appearance.HairColor);
sprite.LayerSetColor(HumanoidVisualLayers.FacialHair, Appearance.FacialHairColor);
sprite.LayerSetState(HumanoidVisualLayers.Body, Sex == Sex.Male ? "male" : "female");
sprite.LayerSetState(HumanoidVisualLayers.Chest, Sex == Sex.Male ? "human_chest_m" : "human_chest_f");
sprite.LayerSetState(HumanoidVisualLayers.Head, Sex == Sex.Male ? "human_head_m" : "human_head_f");
var hairStyle = Appearance.HairStyleName;
if (string.IsNullOrWhiteSpace(hairStyle) || !HairStyles.HairStylesMap.ContainsKey(hairStyle))

9
Content.Shared/Preferences/Appearance/HumanoidCharacterAppearance.cs
View File

@@ -4,6 +4,13 @@ namespace Content.Shared.Preferences.Appearance
{
Hair,
FacialHair,
Body
Chest,
Head,
RArm,
LArm,
RHand,
LHand,
RLeg,
LLeg,
}
}

78
Resources/Prototypes/Entities/mobs/human.yml
View File

@@ -22,9 +22,42 @@
drawdepth: Mobs
layers:
- map: ["enum.HumanoidVisualLayers.Body"]
- map: ["enum.HumanoidVisualLayers.Chest"]
color: "#e8b59b"
sprite: Mob/human.rsi
state: male
state: human_chest_m
- map: ["enum.HumanoidVisualLayers.Head"]
color: "#e8b59b"
sprite: Mob/human.rsi
state: human_head_m
- sprite: Mob/eyes.rsi
state: eyes
color: "#008800"
- map: ["enum.HumanoidVisualLayers.RArm"]
color: "#e8b59b"
sprite: Mob/human.rsi
state: human_r_arm
- map: ["enum.HumanoidVisualLayers.LArm"]
color: "#e8b59b"
sprite: Mob/human.rsi
state: human_l_arm
- map: ["enum.HumanoidVisualLayers.LHand"]
color: "#e8b59b"
sprite: Mob/human.rsi
state: human_l_hand
- map: ["enum.HumanoidVisualLayers.RHand"]
color: "#e8b59b"
sprite: Mob/human.rsi
state: human_r_hand
- map: ["enum.HumanoidVisualLayers.RLeg"]
color: "#e8b59b"
sprite: Mob/human.rsi
state: human_r_leg
- map: ["enum.HumanoidVisualLayers.LLeg"]
color: "#e8b59b"
sprite: Mob/human.rsi
state: human_l_leg
- map: ["enum.Slots.INNERCLOTHING"]
- map: ["enum.Slots.IDCARD"]
- map: ["enum.Slots.GLOVES"]
@@ -47,7 +80,7 @@
- type: Icon
sprite: Mob/human.rsi
state: male
state: human_basic
- type: Physics
mass: 85
@@ -105,9 +138,42 @@
drawdepth: Mobs
layers:
- map: ["enum.HumanoidVisualLayers.Body"]
- map: ["enum.HumanoidVisualLayers.Chest"]
color: "#e8b59b"
sprite: Mob/human.rsi
state: male
state: human_chest_m
- map: ["enum.HumanoidVisualLayers.Head"]
color: "#e8b59b"
sprite: Mob/human.rsi
state: human_head_m
- sprite: Mob/eyes.rsi
state: eyes
color: "#008800"
- map: ["enum.HumanoidVisualLayers.RArm"]
color: "#e8b59b"
sprite: Mob/human.rsi
state: human_r_arm
- map: ["enum.HumanoidVisualLayers.LArm"]
color: "#e8b59b"
sprite: Mob/human.rsi
state: human_l_arm
- map: ["enum.HumanoidVisualLayers.LHand"]
color: "#e8b59b"
sprite: Mob/human.rsi
state: human_l_hand
- map: ["enum.HumanoidVisualLayers.RHand"]
color: "#e8b59b"
sprite: Mob/human.rsi
state: human_r_hand
- map: ["enum.HumanoidVisualLayers.RLeg"]
color: "#e8b59b"
sprite: Mob/human.rsi
state: human_r_leg
- map: ["enum.HumanoidVisualLayers.LLeg"]
color: "#e8b59b"
sprite: Mob/human.rsi
state: human_l_leg
- map: ["enum.Slots.INNERCLOTHING"]
- map: ["enum.Slots.IDCARD"]
- map: ["enum.Slots.GLOVES"]
@@ -130,7 +196,7 @@
- type: Icon
sprite: Mob/human.rsi
state: male
state: human_basic
- type: Physics
mass: 85

BIN
Resources/Textures/Mob/eyes.rsi/eyes.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 112 B

1
Resources/Textures/Mob/eyes.rsi/meta.json Normal file
View File

@@ -0,0 +1 @@
{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "eyes", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}

BIN
Resources/Textures/Mob/human.rsi/fat_husk.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.9 KiB

BIN
Resources/Textures/Mob/human.rsi/female.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.8 KiB

BIN
Resources/Textures/Mob/human.rsi/female_fat.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

BIN
Resources/Textures/Mob/human.rsi/female_slim.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.5 KiB

BIN
Resources/Textures/Mob/human.rsi/human_basic.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 486 B

BIN
Resources/Textures/Mob/human.rsi/human_chest_f.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 785 B

BIN
Resources/Textures/Mob/human.rsi/human_chest_m.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 682 B

BIN
Resources/Textures/Mob/human.rsi/human_head_f.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 442 B

BIN
Resources/Textures/Mob/human.rsi/human_head_m.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 435 B

BIN
Resources/Textures/Mob/human.rsi/human_l_arm.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 266 B

BIN
Resources/Textures/Mob/human.rsi/human_l_hand.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 257 B

BIN
Resources/Textures/Mob/human.rsi/human_l_leg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 354 B

BIN
Resources/Textures/Mob/human.rsi/human_r_arm.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 276 B

BIN
Resources/Textures/Mob/human.rsi/human_r_hand.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 261 B

BIN
Resources/Textures/Mob/human.rsi/human_r_leg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 349 B

BIN
Resources/Textures/Mob/human.rsi/husk.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

BIN
Resources/Textures/Mob/human.rsi/male.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

BIN
Resources/Textures/Mob/human.rsi/male_fat.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

BIN
Resources/Textures/Mob/human.rsi/male_slim.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

154
Resources/Textures/Mob/human.rsi/meta.json
View File

@@ -1,153 +1 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "fat_husk",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "female",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "female_fat",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "female_slim",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "husk",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "male",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "male_fat",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "male_slim",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
}
]
}
{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "human_basic", "directions": 1, "delays": [[1.0]]}, {"name": "human_chest_f", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "human_chest_m", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "human_head_f", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "human_head_m", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "human_l_arm", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "human_l_hand", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "human_l_leg", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "human_r_arm", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "human_r_hand", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "human_r_leg", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}