diff --git a/Content.Client/GameObjects/Components/Mobs/HumanoidAppearanceComponent.cs b/Content.Client/GameObjects/Components/Mobs/HumanoidAppearanceComponent.cs index c7c4cd182e..ef6ac85f17 100644 --- a/Content.Client/GameObjects/Components/Mobs/HumanoidAppearanceComponent.cs +++ b/Content.Client/GameObjects/Components/Mobs/HumanoidAppearanceComponent.cs @@ -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)) diff --git a/Content.Shared/Preferences/Appearance/HumanoidCharacterAppearance.cs b/Content.Shared/Preferences/Appearance/HumanoidCharacterAppearance.cs index 31ede8b7c1..253ca32729 100644 --- a/Content.Shared/Preferences/Appearance/HumanoidCharacterAppearance.cs +++ b/Content.Shared/Preferences/Appearance/HumanoidCharacterAppearance.cs @@ -4,6 +4,13 @@ namespace Content.Shared.Preferences.Appearance { Hair, FacialHair, - Body + Chest, + Head, + RArm, + LArm, + RHand, + LHand, + RLeg, + LLeg, } } diff --git a/Resources/Prototypes/Entities/mobs/human.yml b/Resources/Prototypes/Entities/mobs/human.yml index c0f4198e47..7e818e5534 100644 --- a/Resources/Prototypes/Entities/mobs/human.yml +++ b/Resources/Prototypes/Entities/mobs/human.yml @@ -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,32 +138,65 @@ drawdepth: Mobs layers: - - map: ["enum.HumanoidVisualLayers.Body"] - sprite: Mob/human.rsi - state: male - - map: ["enum.Slots.INNERCLOTHING"] - - map: ["enum.Slots.IDCARD"] - - map: ["enum.Slots.GLOVES"] - - map: ["enum.Slots.SHOES"] - - map: ["enum.Slots.EARS"] - - map: ["enum.Slots.OUTERCLOTHING"] - - map: ["enum.Slots.EYES"] - - map: ["enum.Slots.BELT"] - - map: ["enum.Slots.BACKPACK"] - - map: ["enum.HumanoidVisualLayers.FacialHair"] - state: shaved - sprite: Mob/human_facial_hair.rsi - - map: ["enum.HumanoidVisualLayers.Hair"] - state: bald - sprite: Mob/human_hair.rsi - - map: ["enum.Slots.MASK"] - - map: ["enum.Slots.HEAD"] - - map: ["hand-left"] - - map: ["hand-right"] + - map: ["enum.HumanoidVisualLayers.Chest"] + color: "#e8b59b" + sprite: Mob/human.rsi + 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"] + - map: ["enum.Slots.SHOES"] + - map: ["enum.Slots.EARS"] + - map: ["enum.Slots.OUTERCLOTHING"] + - map: ["enum.Slots.EYES"] + - map: ["enum.Slots.BELT"] + - map: ["enum.Slots.BACKPACK"] + - map: ["enum.HumanoidVisualLayers.FacialHair"] + state: shaved + sprite: Mob/human_facial_hair.rsi + - map: ["enum.HumanoidVisualLayers.Hair"] + state: bald + sprite: Mob/human_hair.rsi + - map: ["enum.Slots.MASK"] + - map: ["enum.Slots.HEAD"] + - map: ["hand-left"] + - map: ["hand-right"] - type: Icon sprite: Mob/human.rsi - state: male + state: human_basic - type: Physics mass: 85 diff --git a/Resources/Textures/Mob/eyes.rsi/eyes.png b/Resources/Textures/Mob/eyes.rsi/eyes.png new file mode 100644 index 0000000000..6af803f9aa Binary files /dev/null and b/Resources/Textures/Mob/eyes.rsi/eyes.png differ diff --git a/Resources/Textures/Mob/eyes.rsi/meta.json b/Resources/Textures/Mob/eyes.rsi/meta.json new file mode 100644 index 0000000000..4c492624ed --- /dev/null +++ b/Resources/Textures/Mob/eyes.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "eyes", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Mob/human.rsi/fat_husk.png b/Resources/Textures/Mob/human.rsi/fat_husk.png deleted file mode 100644 index 24eec54b40..0000000000 Binary files a/Resources/Textures/Mob/human.rsi/fat_husk.png and /dev/null differ diff --git a/Resources/Textures/Mob/human.rsi/female.png b/Resources/Textures/Mob/human.rsi/female.png deleted file mode 100644 index d6465cccf7..0000000000 Binary files a/Resources/Textures/Mob/human.rsi/female.png and /dev/null differ diff --git a/Resources/Textures/Mob/human.rsi/female_fat.png b/Resources/Textures/Mob/human.rsi/female_fat.png deleted file mode 100644 index 19b3235c02..0000000000 Binary files a/Resources/Textures/Mob/human.rsi/female_fat.png and /dev/null differ diff --git a/Resources/Textures/Mob/human.rsi/female_slim.png b/Resources/Textures/Mob/human.rsi/female_slim.png deleted file mode 100644 index 14450f6e23..0000000000 Binary files a/Resources/Textures/Mob/human.rsi/female_slim.png and /dev/null differ diff --git a/Resources/Textures/Mob/human.rsi/human_basic.png b/Resources/Textures/Mob/human.rsi/human_basic.png new file mode 100644 index 0000000000..39d9a69915 Binary files /dev/null and b/Resources/Textures/Mob/human.rsi/human_basic.png differ diff --git a/Resources/Textures/Mob/human.rsi/human_chest_f.png b/Resources/Textures/Mob/human.rsi/human_chest_f.png new file mode 100644 index 0000000000..cf7d2e72b5 Binary files /dev/null and b/Resources/Textures/Mob/human.rsi/human_chest_f.png differ diff --git a/Resources/Textures/Mob/human.rsi/human_chest_m.png b/Resources/Textures/Mob/human.rsi/human_chest_m.png new file mode 100644 index 0000000000..3097763a95 Binary files /dev/null and b/Resources/Textures/Mob/human.rsi/human_chest_m.png differ diff --git a/Resources/Textures/Mob/human.rsi/human_head_f.png b/Resources/Textures/Mob/human.rsi/human_head_f.png new file mode 100644 index 0000000000..b705d2d50e Binary files /dev/null and b/Resources/Textures/Mob/human.rsi/human_head_f.png differ diff --git a/Resources/Textures/Mob/human.rsi/human_head_m.png b/Resources/Textures/Mob/human.rsi/human_head_m.png new file mode 100644 index 0000000000..e555d030be Binary files /dev/null and b/Resources/Textures/Mob/human.rsi/human_head_m.png differ diff --git a/Resources/Textures/Mob/human.rsi/human_l_arm.png b/Resources/Textures/Mob/human.rsi/human_l_arm.png new file mode 100644 index 0000000000..cf3997a120 Binary files /dev/null and b/Resources/Textures/Mob/human.rsi/human_l_arm.png differ diff --git a/Resources/Textures/Mob/human.rsi/human_l_hand.png b/Resources/Textures/Mob/human.rsi/human_l_hand.png new file mode 100644 index 0000000000..7bf47c949a Binary files /dev/null and b/Resources/Textures/Mob/human.rsi/human_l_hand.png differ diff --git a/Resources/Textures/Mob/human.rsi/human_l_leg.png b/Resources/Textures/Mob/human.rsi/human_l_leg.png new file mode 100644 index 0000000000..c54733e42c Binary files /dev/null and b/Resources/Textures/Mob/human.rsi/human_l_leg.png differ diff --git a/Resources/Textures/Mob/human.rsi/human_r_arm.png b/Resources/Textures/Mob/human.rsi/human_r_arm.png new file mode 100644 index 0000000000..8887c30fa2 Binary files /dev/null and b/Resources/Textures/Mob/human.rsi/human_r_arm.png differ diff --git a/Resources/Textures/Mob/human.rsi/human_r_hand.png b/Resources/Textures/Mob/human.rsi/human_r_hand.png new file mode 100644 index 0000000000..a481028126 Binary files /dev/null and b/Resources/Textures/Mob/human.rsi/human_r_hand.png differ diff --git a/Resources/Textures/Mob/human.rsi/human_r_leg.png b/Resources/Textures/Mob/human.rsi/human_r_leg.png new file mode 100644 index 0000000000..941b96e032 Binary files /dev/null and b/Resources/Textures/Mob/human.rsi/human_r_leg.png differ diff --git a/Resources/Textures/Mob/human.rsi/husk.png b/Resources/Textures/Mob/human.rsi/husk.png deleted file mode 100644 index 02249f2eac..0000000000 Binary files a/Resources/Textures/Mob/human.rsi/husk.png and /dev/null differ diff --git a/Resources/Textures/Mob/human.rsi/male.png b/Resources/Textures/Mob/human.rsi/male.png deleted file mode 100644 index 5d021234c8..0000000000 Binary files a/Resources/Textures/Mob/human.rsi/male.png and /dev/null differ diff --git a/Resources/Textures/Mob/human.rsi/male_fat.png b/Resources/Textures/Mob/human.rsi/male_fat.png deleted file mode 100644 index 507369263f..0000000000 Binary files a/Resources/Textures/Mob/human.rsi/male_fat.png and /dev/null differ diff --git a/Resources/Textures/Mob/human.rsi/male_slim.png b/Resources/Textures/Mob/human.rsi/male_slim.png deleted file mode 100644 index db0d08b483..0000000000 Binary files a/Resources/Textures/Mob/human.rsi/male_slim.png and /dev/null differ diff --git a/Resources/Textures/Mob/human.rsi/meta.json b/Resources/Textures/Mob/human.rsi/meta.json index 48bf02436c..99a7d1ab13 100644 --- a/Resources/Textures/Mob/human.rsi/meta.json +++ b/Resources/Textures/Mob/human.rsi/meta.json @@ -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]]}]} \ No newline at end of file