From 7e604317543801bfaadcb922ee2ef1258b210f46 Mon Sep 17 00:00:00 2001 From: Rouge2t7 <81053047+Sarahon@users.noreply.github.com> Date: Thu, 22 Aug 2024 00:44:43 +0100 Subject: [PATCH] Long human ears (#30490) Long human ears colour fix. Shortcut removed. --- Content.Shared/Humanoid/HumanoidVisualLayers.cs | 3 +++ .../Humanoid/Markings/MarkingCategories.cs | 2 ++ Resources/Locale/en-US/markings/ears.ftl | 1 + .../en-US/preferences/ui/markings-picker.ftl | 1 + .../Mobs/Customization/Markings/cat_parts.yml | 4 ++-- .../Mobs/Customization/Markings/ears.yml | 10 ++++++++++ Resources/Prototypes/Species/human.yml | 9 +++++++-- .../Mobs/Customization/ears.rsi/long_ears.png | Bin 0 -> 186 bytes .../Mobs/Customization/ears.rsi/meta.json | 16 ++++++++++++++++ 9 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 Resources/Locale/en-US/markings/ears.ftl create mode 100644 Resources/Prototypes/Entities/Mobs/Customization/Markings/ears.yml create mode 100644 Resources/Textures/Mobs/Customization/ears.rsi/long_ears.png create mode 100644 Resources/Textures/Mobs/Customization/ears.rsi/meta.json diff --git a/Content.Shared/Humanoid/HumanoidVisualLayers.cs b/Content.Shared/Humanoid/HumanoidVisualLayers.cs index 938b789f7a..cecd8a1c13 100644 --- a/Content.Shared/Humanoid/HumanoidVisualLayers.cs +++ b/Content.Shared/Humanoid/HumanoidVisualLayers.cs @@ -6,6 +6,7 @@ namespace Content.Shared.Humanoid [Serializable, NetSerializable] public enum HumanoidVisualLayers : byte { + Special, // for the cat ears Tail, Hair, FacialHair, @@ -18,6 +19,7 @@ namespace Content.Shared.Humanoid RArm, LArm, RHand, + LHand, RLeg, LLeg, @@ -27,5 +29,6 @@ namespace Content.Shared.Humanoid StencilMask, Ensnare, Fire, + } } diff --git a/Content.Shared/Humanoid/Markings/MarkingCategories.cs b/Content.Shared/Humanoid/Markings/MarkingCategories.cs index 5d407063c2..db82fb1fd3 100644 --- a/Content.Shared/Humanoid/Markings/MarkingCategories.cs +++ b/Content.Shared/Humanoid/Markings/MarkingCategories.cs @@ -5,6 +5,7 @@ namespace Content.Shared.Humanoid.Markings [Serializable, NetSerializable] public enum MarkingCategories : byte { + Special, Hair, FacialHair, Head, @@ -24,6 +25,7 @@ namespace Content.Shared.Humanoid.Markings { return layer switch { + HumanoidVisualLayers.Special => MarkingCategories.Special, HumanoidVisualLayers.Hair => MarkingCategories.Hair, HumanoidVisualLayers.FacialHair => MarkingCategories.FacialHair, HumanoidVisualLayers.Head => MarkingCategories.Head, diff --git a/Resources/Locale/en-US/markings/ears.ftl b/Resources/Locale/en-US/markings/ears.ftl new file mode 100644 index 0000000000..62921f5e44 --- /dev/null +++ b/Resources/Locale/en-US/markings/ears.ftl @@ -0,0 +1 @@ +marking-HumanLongEars = Long Ears diff --git a/Resources/Locale/en-US/preferences/ui/markings-picker.ftl b/Resources/Locale/en-US/preferences/ui/markings-picker.ftl index 0e192c1294..ba274ec9ca 100644 --- a/Resources/Locale/en-US/preferences/ui/markings-picker.ftl +++ b/Resources/Locale/en-US/preferences/ui/markings-picker.ftl @@ -14,6 +14,7 @@ marking-slot = Slot {$number} # Categories +markings-category-Special = Special markings-category-Hair = Hair markings-category-FacialHair = Facial Hair markings-category-Head = Head diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml index de88a17fd7..32ac26abc1 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml @@ -1,7 +1,7 @@ - type: marking id: CatEars - bodyPart: HeadTop - markingCategory: HeadTop + bodyPart: Special + markingCategory: Special speciesRestriction: [Human] coloring: default: diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/ears.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/ears.yml new file mode 100644 index 0000000000..6e35088032 --- /dev/null +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/ears.yml @@ -0,0 +1,10 @@ +- type: marking + id: HumanLongEars + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [Human, Dwarf] + forcedColoring: true + followSkinColor: true + sprites: + - sprite: Mobs/Customization/ears.rsi + state: long_ears diff --git a/Resources/Prototypes/Species/human.yml b/Resources/Prototypes/Species/human.yml index 0cbd9cc03f..2549529606 100644 --- a/Resources/Prototypes/Species/human.yml +++ b/Resources/Prototypes/Species/human.yml @@ -17,12 +17,14 @@ - type: speciesBaseSprites id: MobHumanSprites sprites: + Special: MobHumanoidAnyMarking Head: MobHumanHead Hair: MobHumanoidAnyMarking FacialHair: MobHumanoidAnyMarking Snout: MobHumanoidAnyMarking Chest: MobHumanTorso Eyes: MobHumanoidEyes + HeadTop: MobHumanoidAnyMarking LArm: MobHumanLArm RArm: MobHumanRArm LHand: MobHumanLHand @@ -35,6 +37,9 @@ - type: markingPoints id: MobHumanMarkingLimits points: + Special: # the cat ear joke + points: 0 + required: false Hair: points: 1 required: false @@ -47,8 +52,8 @@ Tail: # the cat tail joke points: 0 required: false - HeadTop: # the cat ear joke - points: 0 + HeadTop: + points: 1 required: false Chest: points: 1 diff --git a/Resources/Textures/Mobs/Customization/ears.rsi/long_ears.png b/Resources/Textures/Mobs/Customization/ears.rsi/long_ears.png new file mode 100644 index 0000000000000000000000000000000000000000..6779427f10a258cdba250d689807facf126133d0 GIT binary patch literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|N<3X0Ln`LH zy|t0^Z~za>h0{XvHm%>~or5|43Hd!eXHl3abh!GhqTk*r3Tc%G+iM@XMbNP*WrehM3)1LmDd+yzr{SV9` bs(u`kF4>WGs!jRi3Xp)OtDnm{r-UW|q1j2p literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/ears.rsi/meta.json b/Resources/Textures/Mobs/Customization/ears.rsi/meta.json new file mode 100644 index 0000000000..9e443733ad --- /dev/null +++ b/Resources/Textures/Mobs/Customization/ears.rsi/meta.json @@ -0,0 +1,16 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Drawn by Rouge2t7/Sarahon", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "long_ears", + "directions": 4 + } + + ] +} -- 2.51.2