From a5637392a3c08036fc0da8f7905fdfe09b95e943 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Fri, 6 Sep 2024 17:22:12 -0400 Subject: [PATCH 1/2] Split Arm and Legs --- .../Humanoid/Markings/MarkingCategories.cs | 26 +++-- .../en-US/preferences/ui/markings-picker.ftl | 10 +- .../Mobs/Customization/Markings/vulpkanin.yml | 16 +-- .../Prototypes/DeltaV/Species/vulpkanin.yml | 26 ++++- .../Mobs/Customization/Markings/arachnid.yml | 8 +- .../Mobs/Customization/Markings/harpy.yml | 32 +++--- .../Mobs/Customization/Markings/moth.yml | 104 +++++++++--------- .../Mobs/Customization/Markings/oni_feet.yml | 2 +- .../Mobs/Customization/Markings/reptilian.yml | 8 +- .../Mobs/Customization/Markings/slime.yml | 16 +-- .../Mobs/Customization/Markings/tattoos.yml | 12 +- .../Mobs/Customization/cyberlimbs/bishop.yml | 40 +++---- .../Customization/cyberlimbs/hesphiastos.yml | 40 +++---- .../Customization/cyberlimbs/morpheus.yml | 38 +++---- .../Customization/cyberlimbs/shellguard.yml | 38 +++---- .../cyberlimbs/wardtakahashi.yml | 40 +++---- .../Mobs/Customization/cyberlimbs/xion.yml | 38 +++---- .../Mobs/Customization/cyberlimbs/zenghu.yml | 36 +++--- .../Mobs/Customization/Markings/moth.yml | 104 +++++++++--------- .../Prototypes/Nyanotrasen/Species/Oni.yml | 26 ++++- .../Nyanotrasen/Species/felinid.yml | 26 ++++- Resources/Prototypes/Species/arachne.yml | 11 +- Resources/Prototypes/Species/arachnid.yml | 26 ++++- Resources/Prototypes/Species/diona.yml | 22 +++- Resources/Prototypes/Species/harpy.yml | 22 +++- Resources/Prototypes/Species/human.yml | 26 ++++- Resources/Prototypes/Species/ipc.yml | 82 +++++++++----- Resources/Prototypes/Species/moth.yml | 26 ++++- Resources/Prototypes/Species/reptilian.yml | 26 ++++- Resources/Prototypes/Species/slime.yml | 26 ++++- Resources/Prototypes/Species/vox.yml | 22 +++- 31 files changed, 609 insertions(+), 366 deletions(-) diff --git a/Content.Shared/Humanoid/Markings/MarkingCategories.cs b/Content.Shared/Humanoid/Markings/MarkingCategories.cs index 5d407063c2d..fe1e128b0b4 100644 --- a/Content.Shared/Humanoid/Markings/MarkingCategories.cs +++ b/Content.Shared/Humanoid/Markings/MarkingCategories.cs @@ -12,8 +12,14 @@ public enum MarkingCategories : byte HeadSide, Snout, Chest, - Arms, - Legs, + RightArm, + RightHand, + LeftArm, + LeftHand, + RightLeg, + RightFoot, + LeftLeg, + LeftFoot, Tail, Overlay } @@ -31,14 +37,14 @@ public static MarkingCategories FromHumanoidVisualLayers(HumanoidVisualLayers la HumanoidVisualLayers.HeadSide => MarkingCategories.HeadSide, HumanoidVisualLayers.Snout => MarkingCategories.Snout, HumanoidVisualLayers.Chest => MarkingCategories.Chest, - HumanoidVisualLayers.RArm => MarkingCategories.Arms, - HumanoidVisualLayers.LArm => MarkingCategories.Arms, - HumanoidVisualLayers.RHand => MarkingCategories.Arms, - HumanoidVisualLayers.LHand => MarkingCategories.Arms, - HumanoidVisualLayers.LLeg => MarkingCategories.Legs, - HumanoidVisualLayers.RLeg => MarkingCategories.Legs, - HumanoidVisualLayers.LFoot => MarkingCategories.Legs, - HumanoidVisualLayers.RFoot => MarkingCategories.Legs, + HumanoidVisualLayers.RArm => MarkingCategories.RightArm, + HumanoidVisualLayers.LArm => MarkingCategories.LeftArm, + HumanoidVisualLayers.RHand => MarkingCategories.RightHand, + HumanoidVisualLayers.LHand => MarkingCategories.LeftHand, + HumanoidVisualLayers.LLeg => MarkingCategories.LeftLeg, + HumanoidVisualLayers.RLeg => MarkingCategories.RightLeg, + HumanoidVisualLayers.LFoot => MarkingCategories.LeftFoot, + HumanoidVisualLayers.RFoot => MarkingCategories.RightFoot, HumanoidVisualLayers.Tail => MarkingCategories.Tail, _ => MarkingCategories.Overlay }; diff --git a/Resources/Locale/en-US/preferences/ui/markings-picker.ftl b/Resources/Locale/en-US/preferences/ui/markings-picker.ftl index ae7f401a4ba..0ed75a7add8 100644 --- a/Resources/Locale/en-US/preferences/ui/markings-picker.ftl +++ b/Resources/Locale/en-US/preferences/ui/markings-picker.ftl @@ -20,7 +20,13 @@ markings-category-HeadTop = Head (Top) markings-category-HeadSide = Head (Side) markings-category-Snout = Snout markings-category-Chest = Chest -markings-category-Arms = Arms -markings-category-Legs = Legs +markings-category-RightArm = Right Arm +markings-category-RightHand = Right Hand +markings-category-LeftArm = Left Arm +markings-category-LeftHand = Left Hand +markings-category-RightLeg = Right Leg +markings-category-RightFoot = Right Foot +markings-category-LeftLeg = Left Leg +markings-category-LeftFoot = Left Foot markings-category-Tail = Tail markings-category-Overlay = Overlay diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/vulpkanin.yml index 69bbb2bd96d..e91c2762058 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/vulpkanin.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/vulpkanin.yml @@ -588,7 +588,7 @@ # Leg Markings - type: marking id: VulpPointsFeet - markingCategory: Overlay + markingCategory: RightFoot bodyPart: RFoot speciesRestriction: [Vulpkanin] sprites: @@ -597,7 +597,7 @@ - type: marking id: VulpPointsCrestLegs - markingCategory: Legs + markingCategory: LeftLeg bodyPart: LLeg speciesRestriction: [Vulpkanin] sprites: @@ -606,7 +606,7 @@ - type: marking id: VulpPointsFadeLegs - markingCategory: Legs + markingCategory: LeftLeg bodyPart: LLeg speciesRestriction: [Vulpkanin] sprites: @@ -615,7 +615,7 @@ - type: marking id: VulpPointsSharpLegs - markingCategory: Legs + markingCategory: LeftLeg bodyPart: LLeg speciesRestriction: [Vulpkanin] sprites: @@ -625,7 +625,7 @@ # Arm Markings - type: marking id: VulpPointsHands - markingCategory: Overlay + markingCategory: RightHand bodyPart: RHand speciesRestriction: [Vulpkanin] sprites: @@ -634,7 +634,7 @@ - type: marking id: VulpPointsCrestArms - markingCategory: Arms + markingCategory: LeftArm bodyPart: LArm speciesRestriction: [Vulpkanin] sprites: @@ -643,7 +643,7 @@ - type: marking id: VulpPointsFadeArms - markingCategory: Arms + markingCategory: LeftArm bodyPart: LArm speciesRestriction: [Vulpkanin] sprites: @@ -652,7 +652,7 @@ - type: marking id: VulpPointsSharpArms - markingCategory: Arms + markingCategory: LeftArm bodyPart: LArm speciesRestriction: [Vulpkanin] sprites: diff --git a/Resources/Prototypes/DeltaV/Species/vulpkanin.yml b/Resources/Prototypes/DeltaV/Species/vulpkanin.yml index e139279dd5c..47c8e37b56c 100644 --- a/Resources/Prototypes/DeltaV/Species/vulpkanin.yml +++ b/Resources/Prototypes/DeltaV/Species/vulpkanin.yml @@ -49,11 +49,29 @@ Head: points: 1 required: false - Legs: - points: 6 + RightLeg: + points: 2 required: false - Arms: - points: 6 + RightFoot: + points: 2 + required: false + LeftLeg: + points: 2 + required: false + LeftFoot: + points: 2 + required: false + RightArm: + points: 2 + required: false + RightHand: + points: 2 + required: false + LeftArm: + points: 2 + required: false + LeftHand: + points: 2 required: false Snout: points: 1 diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/arachnid.yml index f4c446df5b7..395a7368baa 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/arachnid.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/arachnid.yml @@ -291,7 +291,7 @@ - type: marking id: ArachnidRArmStripes bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm speciesRestriction: [Arachnid] sprites: - sprite: Mobs/Customization/Arachnid/arms.rsi @@ -304,7 +304,7 @@ - type: marking id: ArachnidLArmStripes bodyPart: LArm - markingCategory: Arms + markingCategory: LeftArm speciesRestriction: [Arachnid] sprites: - sprite: Mobs/Customization/Arachnid/arms.rsi @@ -318,7 +318,7 @@ - type: marking id: ArachnidRLegStripes bodyPart: RLeg - markingCategory: Legs + markingCategory: RightLeg speciesRestriction: [Arachnid] sprites: - sprite: Mobs/Customization/Arachnid/legs.rsi @@ -331,7 +331,7 @@ - type: marking id: ArachnidLLegStripes bodyPart: LLeg - markingCategory: Legs + markingCategory: LeftLeg speciesRestriction: [Arachnid] sprites: - sprite: Mobs/Customization/Arachnid/legs.rsi diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/harpy.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/harpy.yml index 2629d836516..72cccec9528 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/harpy.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/harpy.yml @@ -4,7 +4,7 @@ - type: marking id: HarpyWingDefaultHuescale bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm speciesRestriction: [Harpy] coloring: default: @@ -21,7 +21,7 @@ - type: marking id: HarpyWingDefaultWhitescale bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm speciesRestriction: [Harpy] coloring: default: @@ -38,7 +38,7 @@ - type: marking id: HarpyWingClassic bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm speciesRestriction: [Harpy] coloring: default: @@ -55,7 +55,7 @@ - type: marking id: HarpyWingFoldedHuescale bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm speciesRestriction: [Harpy] coloring: default: @@ -72,7 +72,7 @@ - type: marking id: HarpyWingFoldedWhitescale bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm speciesRestriction: [Harpy] coloring: default: @@ -89,7 +89,7 @@ - type: marking id: HarpyWingOwlHuescale bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm speciesRestriction: [Harpy] coloring: default: @@ -106,7 +106,7 @@ - type: marking id: HarpyWingOwlWhitescale bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm speciesRestriction: [Harpy] coloring: default: @@ -306,7 +306,7 @@ - type: marking id: HarpyWing2ToneClassic bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm speciesRestriction: [Harpy] sprites: - sprite: Mobs/Customization/Harpy/harpy_wings.rsi @@ -317,7 +317,7 @@ - type: marking id: HarpyWing3ToneClassic bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm speciesRestriction: [Harpy] sprites: - sprite: Mobs/Customization/Harpy/harpy_wings.rsi @@ -330,7 +330,7 @@ - type: marking id: HarpyWingSpeckledClassic bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm speciesRestriction: [Harpy] sprites: - sprite: Mobs/Customization/Harpy/harpy_wings.rsi @@ -341,7 +341,7 @@ - type: marking id: HarpyWingUndertoneClassic bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm speciesRestriction: [Harpy] sprites: - sprite: Mobs/Customization/Harpy/harpy_wings.rsi @@ -352,7 +352,7 @@ - type: marking id: HarpyWingTipsClassic bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm speciesRestriction: [Harpy] sprites: - sprite: Mobs/Customization/Harpy/harpy_wings.rsi @@ -363,7 +363,7 @@ - type: marking id: HarpyWingBat bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm speciesRestriction: [Harpy] sprites: - sprite: Mobs/Customization/Harpy/harpy_wings.rsi @@ -374,7 +374,7 @@ - type: marking id: HarpyWingBionic bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm speciesRestriction: [Harpy] sprites: - sprite: Mobs/Customization/Harpy/harpy_wings.rsi @@ -405,7 +405,7 @@ - type: marking id: HarpyLegsDefault bodyPart: LLeg - markingCategory: Legs + markingCategory: RightLeg speciesRestriction: [Harpy] coloring: default: @@ -422,7 +422,7 @@ - type: marking id: HarpyFeetDefault bodyPart: RFoot - markingCategory: Legs + markingCategory: RightLeg speciesRestriction: [Harpy] coloring: default: diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/moth.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/moth.yml index c1d5df24633..432b7a79a34 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/moth.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/moth.yml @@ -417,7 +417,7 @@ - type: marking id: MothLLegCharred bodyPart: LLeg - markingCategory: Legs + markingCategory: LeftLeg speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -426,7 +426,7 @@ - type: marking id: MothRLegCharred bodyPart: RLeg - markingCategory: Legs + markingCategory: RightLeg speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -435,7 +435,7 @@ - type: marking id: MothLArmCharred bodyPart: LArm - markingCategory: Arms + markingCategory: LeftArm speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -444,7 +444,7 @@ - type: marking id: MothRArmCharred bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -472,7 +472,7 @@ - type: marking id: MothLLegDeathhead bodyPart: LLeg - markingCategory: Legs + markingCategory: LeftLeg speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -481,7 +481,7 @@ - type: marking id: MothRLegDeathhead bodyPart: RLeg - markingCategory: Legs + markingCategory: RightLeg speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -490,7 +490,7 @@ - type: marking id: MothLArmDeathhead bodyPart: LArm - markingCategory: Arms + markingCategory: LeftArm speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -499,7 +499,7 @@ - type: marking id: MothRArmDeathhead bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -527,7 +527,7 @@ - type: marking id: MothLLegFan bodyPart: LLeg - markingCategory: Legs + markingCategory: LeftLeg speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -536,7 +536,7 @@ - type: marking id: MothRLegFan bodyPart: RLeg - markingCategory: Legs + markingCategory: RightLeg speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -545,7 +545,7 @@ - type: marking id: MothLArmFan bodyPart: LArm - markingCategory: Arms + markingCategory: LeftArm speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -554,7 +554,7 @@ - type: marking id: MothRArmFan bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -582,7 +582,7 @@ - type: marking id: MothLLegFirewatch bodyPart: LLeg - markingCategory: Legs + markingCategory: LeftLeg speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -591,7 +591,7 @@ - type: marking id: MothRLegFirewatch bodyPart: RLeg - markingCategory: Legs + markingCategory: RightLeg speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -600,7 +600,7 @@ - type: marking id: MothLArmFirewatch bodyPart: LArm - markingCategory: Arms + markingCategory: LeftArm speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -609,7 +609,7 @@ - type: marking id: MothRArmFirewatch bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -637,7 +637,7 @@ - type: marking id: MothLLegGothic bodyPart: LLeg - markingCategory: Legs + markingCategory: LeftLeg speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -646,7 +646,7 @@ - type: marking id: MothRLegGothic bodyPart: RLeg - markingCategory: Legs + markingCategory: RightLeg speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -655,7 +655,7 @@ - type: marking id: MothLArmGothic bodyPart: LArm - markingCategory: Arms + markingCategory: LeftArm speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -664,7 +664,7 @@ - type: marking id: MothRArmGothic bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -692,7 +692,7 @@ - type: marking id: MothLLegJungle bodyPart: LLeg - markingCategory: Legs + markingCategory: LeftLeg speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -701,7 +701,7 @@ - type: marking id: MothRLegJungle bodyPart: RLeg - markingCategory: Legs + markingCategory: RightLeg speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -710,7 +710,7 @@ - type: marking id: MothLArmJungle bodyPart: LArm - markingCategory: Arms + markingCategory: LeftArm speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -719,7 +719,7 @@ - type: marking id: MothRArmJungle bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -747,7 +747,7 @@ - type: marking id: MothLLegMoonfly bodyPart: LLeg - markingCategory: Legs + markingCategory: LeftLeg speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -756,7 +756,7 @@ - type: marking id: MothRLegMoonfly bodyPart: RLeg - markingCategory: Legs + markingCategory: RightLeg speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -765,7 +765,7 @@ - type: marking id: MothLArmMoonfly bodyPart: LArm - markingCategory: Arms + markingCategory: LeftArm speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -774,7 +774,7 @@ - type: marking id: MothRArmMoonfly bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -802,7 +802,7 @@ - type: marking id: MothLLegOakworm bodyPart: LLeg - markingCategory: Legs + markingCategory: LeftLeg speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -811,7 +811,7 @@ - type: marking id: MothRLegOakworm bodyPart: RLeg - markingCategory: Legs + markingCategory: RightLeg speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -820,7 +820,7 @@ - type: marking id: MothLArmOakworm bodyPart: LArm - markingCategory: Arms + markingCategory: LeftArm speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -829,7 +829,7 @@ - type: marking id: MothRArmOakworm bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -857,7 +857,7 @@ - type: marking id: MothLLegPointy bodyPart: LLeg - markingCategory: Legs + markingCategory: LeftLeg speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -866,7 +866,7 @@ - type: marking id: MothRLegPointy bodyPart: RLeg - markingCategory: Legs + markingCategory: RightLeg speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -875,7 +875,7 @@ - type: marking id: MothLArmPointy bodyPart: LArm - markingCategory: Arms + markingCategory: LeftArm speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -884,7 +884,7 @@ - type: marking id: MothRArmPointy bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -912,7 +912,7 @@ - type: marking id: MothLLegRagged bodyPart: LLeg - markingCategory: Legs + markingCategory: LeftLeg speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -921,7 +921,7 @@ - type: marking id: MothRLegRagged bodyPart: RLeg - markingCategory: Legs + markingCategory: RightLeg speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -930,7 +930,7 @@ - type: marking id: MothLArmRagged bodyPart: LArm - markingCategory: Arms + markingCategory: LeftArm speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -939,7 +939,7 @@ - type: marking id: MothRArmRagged bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -967,7 +967,7 @@ - type: marking id: MothLLegRoyal bodyPart: LLeg - markingCategory: Legs + markingCategory: LeftLeg speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -976,7 +976,7 @@ - type: marking id: MothRLegRoyal bodyPart: RLeg - markingCategory: Legs + markingCategory: RightLeg speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -985,7 +985,7 @@ - type: marking id: MothLArmRoyal bodyPart: LArm - markingCategory: Arms + markingCategory: LeftArm speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -994,7 +994,7 @@ - type: marking id: MothRArmRoyal bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -1022,7 +1022,7 @@ - type: marking id: MothLLegWhitefly bodyPart: LLeg - markingCategory: Legs + markingCategory: LeftLeg speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -1031,7 +1031,7 @@ - type: marking id: MothRLegWhitefly bodyPart: RLeg - markingCategory: Legs + markingCategory: RightLeg speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -1040,7 +1040,7 @@ - type: marking id: MothLArmWhitefly bodyPart: LArm - markingCategory: Arms + markingCategory: LeftArm speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -1049,7 +1049,7 @@ - type: marking id: MothRArmWhitefly bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -1077,7 +1077,7 @@ - type: marking id: MothLLegWitchwing bodyPart: LLeg - markingCategory: Legs + markingCategory: LeftLeg speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -1086,7 +1086,7 @@ - type: marking id: MothRLegWitchwing bodyPart: RLeg - markingCategory: Legs + markingCategory: RightLeg speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -1095,7 +1095,7 @@ - type: marking id: MothLArmWitchwing bodyPart: LArm - markingCategory: Arms + markingCategory: LeftArm speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi @@ -1104,7 +1104,7 @@ - type: marking id: MothRArmWitchwing bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm speciesRestriction: [Moth] sprites: - sprite: Mobs/Customization/Moth/moth_parts.rsi diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_feet.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_feet.yml index 0ff03df1a0d..552b6322cdf 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_feet.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_feet.yml @@ -1,7 +1,7 @@ - type: marking id: OniTwoToedFeet bodyPart: RFoot # Can't be LFoot to avoid visual glitches - markingCategory: Legs + markingCategory: RightFoot speciesRestriction: [Oni] coloring: default: diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml index d1ed51013a2..f5749121e26 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml @@ -205,7 +205,7 @@ - type: marking id: LizardLArmTiger bodyPart: LArm - markingCategory: Arms + markingCategory: LeftArm speciesRestriction: [Reptilian] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi @@ -214,7 +214,7 @@ - type: marking id: LizardLLegTiger bodyPart: LLeg - markingCategory: Legs + markingCategory: LeftLeg speciesRestriction: [Reptilian] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi @@ -223,7 +223,7 @@ - type: marking id: LizardRArmTiger bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm speciesRestriction: [Reptilian] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi @@ -232,7 +232,7 @@ - type: marking id: LizardRLegTiger bodyPart: RLeg - markingCategory: Legs + markingCategory: RightLeg speciesRestriction: [Reptilian] sprites: - sprite: Mobs/Customization/reptilian_parts.rsi diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/slime.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/slime.yml index 092ebf2fddf..57b25798e74 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/slime.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/slime.yml @@ -1,7 +1,7 @@ - type: marking id: SlimeGradientLeftArm bodyPart: LArm - markingCategory: Arms + markingCategory: LeftArm speciesRestriction: [SlimePerson] sprites: - sprite: Mobs/Customization/slime_parts.rsi @@ -10,7 +10,7 @@ - type: marking id: SlimeGradientRightArm bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm speciesRestriction: [SlimePerson] sprites: - sprite: Mobs/Customization/slime_parts.rsi @@ -19,7 +19,7 @@ - type: marking id: SlimeGradientLeftLeg bodyPart: LLeg - markingCategory: Legs + markingCategory: LeftLeg speciesRestriction: [SlimePerson] sprites: - sprite: Mobs/Customization/slime_parts.rsi @@ -28,7 +28,7 @@ - type: marking id: SlimeGradientRightLeg bodyPart: RLeg - markingCategory: Legs + markingCategory: RightLeg speciesRestriction: [SlimePerson] sprites: - sprite: Mobs/Customization/slime_parts.rsi @@ -37,7 +37,7 @@ - type: marking id: SlimeGradientLeftFoot bodyPart: LFoot - markingCategory: Legs + markingCategory: LeftFoot speciesRestriction: [SlimePerson] sprites: - sprite: Mobs/Customization/slime_parts.rsi @@ -46,7 +46,7 @@ - type: marking id: SlimeGradientRightFoot bodyPart: RFoot - markingCategory: Legs + markingCategory: RightFoot speciesRestriction: [SlimePerson] sprites: - sprite: Mobs/Customization/slime_parts.rsi @@ -55,7 +55,7 @@ - type: marking id: SlimeGradientLeftHand bodyPart: LHand - markingCategory: Arms + markingCategory: LeftHand speciesRestriction: [SlimePerson] sprites: - sprite: Mobs/Customization/slime_parts.rsi @@ -64,7 +64,7 @@ - type: marking id: SlimeGradientRightHand bodyPart: RHand - markingCategory: Arms + markingCategory: RightHand speciesRestriction: [SlimePerson] sprites: - sprite: Mobs/Customization/slime_parts.rsi diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml index b9ffd9ba0d6..88307085397 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml @@ -29,7 +29,7 @@ - type: marking id: TattooSilverburghLeftLeg bodyPart: LLeg - markingCategory: Legs + markingCategory: LeftLeg speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni coloring: default: @@ -43,7 +43,7 @@ - type: marking id: TattooSilverburghRightLeg bodyPart: RLeg - markingCategory: Legs + markingCategory: RightLeg speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni coloring: default: @@ -57,7 +57,7 @@ - type: marking id: TattooCampbellLeftArm bodyPart: LArm - markingCategory: Arms + markingCategory: LeftArm speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni coloring: default: @@ -71,7 +71,7 @@ - type: marking id: TattooCampbellRightArm bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni coloring: default: @@ -85,7 +85,7 @@ - type: marking id: TattooCampbellLeftLeg bodyPart: LLeg - markingCategory: Legs + markingCategory: LeftLeg speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni coloring: default: @@ -99,7 +99,7 @@ - type: marking id: TattooCampbellRightLeg bodyPart: RLeg - markingCategory: Legs + markingCategory: RightLeg speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni coloring: default: diff --git a/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/bishop.yml b/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/bishop.yml index d2355316b19..cdbb4ecfed2 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/bishop.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/bishop.yml @@ -2,7 +2,7 @@ id: CyberLimbsMarkingBishopHead bodyPart: Head markingCategory: Head - speciesRestriction: [IPC] + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/bishop/bishop_monitor.rsi state: head @@ -13,7 +13,7 @@ id: CyberLimbsMarkingBishopHeadAlt bodyPart: Head markingCategory: Head - speciesRestriction: [IPC] + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi state: head @@ -22,7 +22,7 @@ id: CyberLimbsMarkingBishopHeadAlt1 bodyPart: Head markingCategory: Head - speciesRestriction: [IPC] + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/bishop/bishop_alt1.rsi state: head @@ -31,7 +31,7 @@ id: CyberLimbsMarkingBishopChest bodyPart: Chest markingCategory: Chest - speciesRestriction: [IPC] + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi state: torso-primary @@ -41,8 +41,8 @@ - type: marking id: CyberLimbsMarkingBishopLArm bodyPart: LArm - markingCategory: Arms - speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] + markingCategory: LeftArm + speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] sprites: - sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi state: l_arm-primary @@ -54,8 +54,8 @@ - type: marking id: CyberLimbsMarkingBishopLHand bodyPart: LHand - markingCategory: Arms - speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] + markingCategory: LeftHand + speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] sprites: - sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi state: l_hand @@ -63,8 +63,8 @@ - type: marking id: CyberLimbsMarkingBishopLLeg bodyPart: LLeg - markingCategory: Legs - speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] + markingCategory: LeftLeg + speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] sprites: - sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi state: l_leg-primary @@ -75,8 +75,8 @@ - type: marking id: CyberLimbsMarkingBishopLFoot bodyPart: LFoot - markingCategory: Legs - speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] + markingCategory: LeftFoot + speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] sprites: - sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi state: l_foot @@ -86,8 +86,8 @@ - type: marking id: CyberLimbsMarkingBishopRArm bodyPart: RArm - markingCategory: Arms - speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] + markingCategory: RightArm + speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] sprites: - sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi state: r_arm-primary @@ -100,8 +100,8 @@ - type: marking id: CyberLimbsMarkingBishopRHand bodyPart: RHand - markingCategory: Arms - speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] + markingCategory: RightHand + speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] sprites: - sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi state: r_hand @@ -109,8 +109,8 @@ - type: marking id: CyberLimbsMarkingBishopRLeg bodyPart: RLeg - markingCategory: Legs - speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] + markingCategory: RightLeg + speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] sprites: - sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi state: r_leg-primary @@ -121,8 +121,8 @@ - type: marking id: CyberLimbsMarkingBishopRFoot bodyPart: RFoot - markingCategory: Legs - speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] + markingCategory: RightFoot + speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] sprites: - sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi state: r_foot \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/hesphiastos.yml b/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/hesphiastos.yml index bd5dab14704..1c14d7df0c3 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/hesphiastos.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/hesphiastos.yml @@ -2,7 +2,7 @@ id: CyberLimbsMarkingHesphiastosHead bodyPart: Head markingCategory: Head - speciesRestriction: [IPC] + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_monitor.rsi state: head-1 @@ -13,7 +13,7 @@ id: CyberLimbsMarkingHesphiastosHeadAlt bodyPart: Head markingCategory: Head - speciesRestriction: [IPC] + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_alt1.rsi state: head-1 @@ -26,7 +26,7 @@ id: CyberLimbsMarkingHesphiastosChest bodyPart: Chest markingCategory: Chest - speciesRestriction: [IPC] + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi state: torso-1 @@ -36,8 +36,8 @@ - type: marking id: CyberLimbsMarkingHesphiastosLArm bodyPart: LArm - markingCategory: Arms - speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] + markingCategory: LeftArm + speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] sprites: - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi state: l_arm-1 @@ -47,8 +47,8 @@ - type: marking id: CyberLimbsMarkingHesphiastosLHand bodyPart: LHand - markingCategory: Arms - speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] + markingCategory: LeftHand + speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] sprites: - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi state: l_hand-1 @@ -58,8 +58,8 @@ - type: marking id: CyberLimbsMarkingHesphiastosLLeg bodyPart: LLeg - markingCategory: Legs - speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] + markingCategory: LeftLeg + speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] sprites: - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi state: l_leg-1 @@ -70,8 +70,8 @@ - type: marking id: CyberLimbsMarkingHesphiastosLFoot bodyPart: LFoot - markingCategory: Legs - speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] + markingCategory: LeftFoot + speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] sprites: - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi state: l_foot-1 @@ -83,8 +83,8 @@ - type: marking id: CyberLimbsMarkingHesphiastosRArm bodyPart: RArm - markingCategory: Arms - speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] + markingCategory: RightArm + speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] sprites: - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi state: r_arm-1 @@ -95,20 +95,20 @@ - type: marking id: CyberLimbsMarkingHesphiastosRHand bodyPart: RHand - markingCategory: Arms - speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] + markingCategory: RightArm + speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] sprites: - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi state: r_hand-1 - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi state: r_hand-2 - + - type: marking id: CyberLimbsMarkingHesphiastosRLeg bodyPart: RLeg - markingCategory: Legs - speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] + markingCategory: RightHand + speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] sprites: - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi state: r_leg-1 @@ -119,8 +119,8 @@ - type: marking id: CyberLimbsMarkingHesphiastosRFoot bodyPart: RFoot - markingCategory: Legs - speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] + markingCategory: RightFoot + speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] sprites: - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi state: r_foot-1 diff --git a/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/morpheus.yml b/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/morpheus.yml index 2c57751ee18..4456c288df8 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/morpheus.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/morpheus.yml @@ -2,7 +2,7 @@ id: CyberLimbsMarkingMorpheusHead bodyPart: Head markingCategory: Head - speciesRestriction: [IPC] + speciesRestriction: [IPC] coloring: default: type: @@ -16,7 +16,7 @@ id: CyberLimbsMarkingMorpheusHeadAlt bodyPart: Head markingCategory: Head - speciesRestriction: [IPC] + speciesRestriction: [IPC] coloring: default: type: @@ -30,7 +30,7 @@ id: CyberLimbsMarkingMorpheusChest bodyPart: Chest markingCategory: Chest - speciesRestriction: [IPC] + speciesRestriction: [IPC] coloring: default: type: @@ -43,8 +43,8 @@ - type: marking id: CyberLimbsMarkingMorpheusLArm bodyPart: LArm - markingCategory: Arms - speciesRestriction: [IPC] + markingCategory: LeftArm + speciesRestriction: [IPC] coloring: default: type: @@ -57,8 +57,8 @@ - type: marking id: CyberLimbsMarkingMorpheusLHand bodyPart: LHand - markingCategory: Arms - speciesRestriction: [IPC] + markingCategory: LeftHand + speciesRestriction: [IPC] coloring: default: type: @@ -71,8 +71,8 @@ - type: marking id: CyberLimbsMarkingMorpheusLLeg bodyPart: LLeg - markingCategory: Legs - speciesRestriction: [IPC] + markingCategory: LeftLeg + speciesRestriction: [IPC] coloring: default: type: @@ -86,8 +86,8 @@ - type: marking id: CyberLimbsMarkingMorpheusLFoot bodyPart: LFoot - markingCategory: Legs - speciesRestriction: [IPC] + markingCategory: LeftFoot + speciesRestriction: [IPC] coloring: default: type: @@ -102,8 +102,8 @@ - type: marking id: CyberLimbsMarkingMorpheusRArm bodyPart: RArm - markingCategory: Arms - speciesRestriction: [IPC] + markingCategory: RightArm + speciesRestriction: [IPC] coloring: default: type: @@ -117,8 +117,8 @@ - type: marking id: CyberLimbsMarkingMorpheusRHand bodyPart: RHand - markingCategory: Arms - speciesRestriction: [IPC] + markingCategory: RightHand + speciesRestriction: [IPC] coloring: default: type: @@ -131,8 +131,8 @@ - type: marking id: CyberLimbsMarkingMorpheusRLeg bodyPart: RLeg - markingCategory: Legs - speciesRestriction: [IPC] + markingCategory: RightLeg + speciesRestriction: [IPC] coloring: default: type: @@ -146,8 +146,8 @@ - type: marking id: CyberLimbsMarkingMorpheusRFoot bodyPart: RFoot - markingCategory: Legs - speciesRestriction: [IPC] + markingCategory: RightFoot + speciesRestriction: [IPC] coloring: default: type: diff --git a/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/shellguard.yml b/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/shellguard.yml index d060b990061..81f4396d06e 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/shellguard.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/shellguard.yml @@ -2,7 +2,7 @@ id: CyberLimbsMarkingShellguardHead bodyPart: Head markingCategory: Head - speciesRestriction: [IPC] + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/shellguard/shellguard_monitor.rsi state: head-1 @@ -13,7 +13,7 @@ id: CyberLimbsMarkingShellguardHeadAlt bodyPart: Head markingCategory: Head - speciesRestriction: [IPC] + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/shellguard/shellguard_alt1.rsi state: head-1 @@ -24,7 +24,7 @@ id: CyberLimbsMarkingShellguardChest bodyPart: Chest markingCategory: Chest - speciesRestriction: [IPC] + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi state: torso-1 @@ -34,8 +34,8 @@ - type: marking id: CyberLimbsMarkingShellguardLArm bodyPart: LArm - markingCategory: Arms - speciesRestriction: [IPC] + markingCategory: LeftArm + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi state: l_arm-1 @@ -45,8 +45,8 @@ - type: marking id: CyberLimbsMarkingShellguardLHand bodyPart: LHand - markingCategory: Arms - speciesRestriction: [IPC] + markingCategory: LeftHand + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi state: l_hand-1 @@ -56,8 +56,8 @@ - type: marking id: CyberLimbsMarkingShellguardLLeg bodyPart: LLeg - markingCategory: Legs - speciesRestriction: [IPC] + markingCategory: LeftLeg + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi state: l_leg-1 @@ -68,8 +68,8 @@ - type: marking id: CyberLimbsMarkingShellguardLFoot bodyPart: LFoot - markingCategory: Legs - speciesRestriction: [IPC] + markingCategory: LeftFoot + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi state: l_foot-1 @@ -81,8 +81,8 @@ - type: marking id: CyberLimbsMarkingShellguardRArm bodyPart: RArm - markingCategory: Arms - speciesRestriction: [IPC] + markingCategory: RightArm + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi state: r_arm-1 @@ -93,8 +93,8 @@ - type: marking id: CyberLimbsMarkingShellguardRHand bodyPart: RHand - markingCategory: Arms - speciesRestriction: [IPC] + markingCategory: RightHand + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi state: r_hand-1 @@ -104,8 +104,8 @@ - type: marking id: CyberLimbsMarkingShellguardRLeg bodyPart: RLeg - markingCategory: Legs - speciesRestriction: [IPC] + markingCategory: RightLeg + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi state: r_leg-1 @@ -116,8 +116,8 @@ - type: marking id: CyberLimbsMarkingShellguardRFoot bodyPart: RFoot - markingCategory: Legs - speciesRestriction: [IPC] + markingCategory: RightFoot + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi state: r_foot-1 diff --git a/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/wardtakahashi.yml b/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/wardtakahashi.yml index 84070f86c56..f331309ca94 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/wardtakahashi.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/wardtakahashi.yml @@ -2,7 +2,7 @@ id: CyberLimbsMarkingWardtakahashiHead bodyPart: Head markingCategory: Head - speciesRestriction: [IPC] + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_monitor.rsi state: head @@ -11,7 +11,7 @@ id: CyberLimbsMarkingWardtakahashiHeadAlt bodyPart: Head markingCategory: Head - speciesRestriction: [IPC] + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_main.rsi state: head @@ -20,7 +20,7 @@ id: CyberLimbsMarkingWardtakahashiHeadAlt1 bodyPart: Head markingCategory: Head - speciesRestriction: [IPC] + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_alt1.rsi state: head @@ -29,7 +29,7 @@ id: CyberLimbsMarkingWardtakahashiChest bodyPart: Chest markingCategory: Chest - speciesRestriction: [IPC] + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_main.rsi state: torso @@ -37,8 +37,8 @@ - type: marking id: CyberLimbsMarkingWardtakahashiLArm bodyPart: LArm - markingCategory: Arms - speciesRestriction: [IPC] + markingCategory: LeftArm + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_main.rsi state: l_arm @@ -46,8 +46,8 @@ - type: marking id: CyberLimbsMarkingWardtakahashiLHand bodyPart: LHand - markingCategory: Arms - speciesRestriction: [IPC] + markingCategory: LeftHand + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_main.rsi state: l_hand @@ -55,8 +55,8 @@ - type: marking id: CyberLimbsMarkingWardtakahashiLLeg bodyPart: LLeg - markingCategory: Legs - speciesRestriction: [IPC] + markingCategory: LeftLeg + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_main.rsi state: l_leg @@ -65,8 +65,8 @@ - type: marking id: CyberLimbsMarkingWardtakahashiLFoot bodyPart: LFoot - markingCategory: Legs - speciesRestriction: [IPC] + markingCategory: LeftFoot + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_main.rsi state: l_foot @@ -76,8 +76,8 @@ - type: marking id: CyberLimbsMarkingWardtakahashiRArm bodyPart: RArm - markingCategory: Arms - speciesRestriction: [IPC] + markingCategory: RightArm + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_main.rsi state: r_arm @@ -86,8 +86,8 @@ - type: marking id: CyberLimbsMarkingWardtakahashiRHand bodyPart: RHand - markingCategory: Arms - speciesRestriction: [IPC] + markingCategory: RightHand + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_main.rsi state: r_hand @@ -95,8 +95,8 @@ - type: marking id: CyberLimbsMarkingWardtakahashiRLeg bodyPart: RLeg - markingCategory: Legs - speciesRestriction: [IPC] + markingCategory: RightLeg + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_main.rsi state: r_leg @@ -105,8 +105,8 @@ - type: marking id: CyberLimbsMarkingWardtakahashiRFoot bodyPart: RFoot - markingCategory: Legs - speciesRestriction: [IPC] + markingCategory: RightFoot + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_main.rsi state: r_foot \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/xion.yml b/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/xion.yml index a290c94d65f..b5254df5f5b 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/xion.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/xion.yml @@ -2,7 +2,7 @@ id: CyberLimbsMarkingXionHead bodyPart: Head markingCategory: Head - speciesRestriction: [IPC] + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/xion/xion_monitor.rsi state: head-1 @@ -13,7 +13,7 @@ id: CyberLimbsMarkingXionHeadAlt bodyPart: Head markingCategory: Head - speciesRestriction: [IPC] + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/xion/xion_alt1.rsi state: head-1 @@ -24,7 +24,7 @@ id: CyberLimbsMarkingXionChest bodyPart: Chest markingCategory: Chest - speciesRestriction: [IPC] + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/xion/xion_main.rsi state: torso-1 @@ -34,8 +34,8 @@ - type: marking id: CyberLimbsMarkingXionLArm bodyPart: LArm - markingCategory: Arms - speciesRestriction: [IPC] + markingCategory: LeftArm + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/xion/xion_main.rsi state: l_arm-1 @@ -45,8 +45,8 @@ - type: marking id: CyberLimbsMarkingXionLHand bodyPart: LHand - markingCategory: Arms - speciesRestriction: [IPC] + markingCategory: LeftHand + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/xion/xion_main.rsi state: l_hand-1 @@ -56,8 +56,8 @@ - type: marking id: CyberLimbsMarkingXionLLeg bodyPart: LLeg - markingCategory: Legs - speciesRestriction: [IPC] + markingCategory: LeftLeg + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/xion/xion_main.rsi state: l_leg-1 @@ -68,8 +68,8 @@ - type: marking id: CyberLimbsMarkingXionLFoot bodyPart: LFoot - markingCategory: Legs - speciesRestriction: [IPC] + markingCategory: RightFoot + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/xion/xion_main.rsi state: l_foot-1 @@ -81,8 +81,8 @@ - type: marking id: CyberLimbsMarkingXionRArm bodyPart: RArm - markingCategory: Arms - speciesRestriction: [IPC] + markingCategory: RightArm + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/xion/xion_main.rsi state: r_arm-1 @@ -94,8 +94,8 @@ - type: marking id: CyberLimbsMarkingXionRHand bodyPart: RHand - markingCategory: Arms - speciesRestriction: [IPC] + markingCategory: RightHand + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/xion/xion_main.rsi state: r_hand-1 @@ -105,8 +105,8 @@ - type: marking id: CyberLimbsMarkingXionRLeg bodyPart: RLeg - markingCategory: Legs - speciesRestriction: [IPC] + markingCategory: RightLeg + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/xion/xion_main.rsi state: r_leg-1 @@ -117,8 +117,8 @@ - type: marking id: CyberLimbsMarkingXionRFoot bodyPart: RFoot - markingCategory: Legs - speciesRestriction: [IPC] + markingCategory: RightFoot + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/xion/xion_main.rsi state: r_foot-1 diff --git a/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/zenghu.yml b/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/zenghu.yml index e46ffc70629..9b6811b084f 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/zenghu.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/zenghu.yml @@ -2,7 +2,7 @@ id: CyberLimbsMarkingZenghuHead bodyPart: Head markingCategory: Head - speciesRestriction: [IPC] + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi state: head-1 @@ -13,7 +13,7 @@ id: CyberLimbsMarkingZenghuChest bodyPart: Chest markingCategory: Chest - speciesRestriction: [IPC] + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi state: torso-1 @@ -23,8 +23,8 @@ - type: marking id: CyberLimbsMarkingZenghuLArm bodyPart: LArm - markingCategory: Arms - speciesRestriction: [IPC] + markingCategory: LeftArm + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi state: l_arm-1 @@ -34,8 +34,8 @@ - type: marking id: CyberLimbsMarkingZenghuLHand bodyPart: LHand - markingCategory: Arms - speciesRestriction: [IPC] + markingCategory: LeftHand + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi state: l_hand-1 @@ -45,8 +45,8 @@ - type: marking id: CyberLimbsMarkingZenghuLLeg bodyPart: LLeg - markingCategory: Legs - speciesRestriction: [IPC] + markingCategory: LeftLeg + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi state: l_leg-1 @@ -57,8 +57,8 @@ - type: marking id: CyberLimbsMarkingZenghuLFoot bodyPart: LFoot - markingCategory: Legs - speciesRestriction: [IPC] + markingCategory: LeftFoot + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi state: l_foot-1 @@ -70,8 +70,8 @@ - type: marking id: CyberLimbsMarkingZenghuRArm bodyPart: RArm - markingCategory: Arms - speciesRestriction: [IPC] + markingCategory: RightArm + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi state: r_arm-1 @@ -83,8 +83,8 @@ - type: marking id: CyberLimbsMarkingZenghuRHand bodyPart: RHand - markingCategory: Arms - speciesRestriction: [IPC] + markingCategory: RightHand + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi state: r_hand-1 @@ -94,8 +94,8 @@ - type: marking id: CyberLimbsMarkingZenghuRLeg bodyPart: RLeg - markingCategory: Legs - speciesRestriction: [IPC] + markingCategory: RightLeg + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi state: r_leg-1 @@ -106,8 +106,8 @@ - type: marking id: CyberLimbsMarkingZenghuRFoot bodyPart: RFoot - markingCategory: Legs - speciesRestriction: [IPC] + markingCategory: RightFoot + speciesRestriction: [IPC] sprites: - sprite: Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi state: r_foot-1 diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/moth.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/moth.yml index 0bed0b02b44..6e21b92c6d0 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/moth.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/moth.yml @@ -740,7 +740,7 @@ - type: marking id: MothLArmClassicDeathshead bodyPart: LArm - markingCategory: Arms + markingCategory: LeftArm forcedColoring: true speciesRestriction: [Moth] coloring: @@ -755,7 +755,7 @@ - type: marking id: MothRArmClassicDeathshead bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm forcedColoring: true speciesRestriction: [Moth] coloring: @@ -770,7 +770,7 @@ - type: marking id: MothLLegClassicDeathshead bodyPart: LLeg - markingCategory: Legs + markingCategory: LeftLeg forcedColoring: true speciesRestriction: [Moth] coloring: @@ -785,7 +785,7 @@ - type: marking id: MothRLegClassicDeathshead bodyPart: RLeg - markingCategory: Legs + markingCategory: RightLeg forcedColoring: true speciesRestriction: [Moth] coloring: @@ -832,7 +832,7 @@ - type: marking id: MothLArmClassicFirewatch bodyPart: LArm - markingCategory: Arms + markingCategory: LeftArm forcedColoring: true speciesRestriction: [Moth] coloring: @@ -847,7 +847,7 @@ - type: marking id: MothRArmClassicFirewatch bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm forcedColoring: true speciesRestriction: [Moth] coloring: @@ -862,7 +862,7 @@ - type: marking id: MothLLegClassicFirewatch bodyPart: LLeg - markingCategory: Legs + markingCategory: LeftLeg forcedColoring: true speciesRestriction: [Moth] coloring: @@ -877,7 +877,7 @@ - type: marking id: MothRLegClassicFirewatch bodyPart: RLeg - markingCategory: Legs + markingCategory: RightLeg forcedColoring: true speciesRestriction: [Moth] coloring: @@ -923,7 +923,7 @@ - type: marking id: MothLArmClassicGothic bodyPart: LArm - markingCategory: Arms + markingCategory: LeftArm forcedColoring: true speciesRestriction: [Moth] coloring: @@ -938,7 +938,7 @@ - type: marking id: MothRArmClassicGothic bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm forcedColoring: true speciesRestriction: [Moth] coloring: @@ -953,7 +953,7 @@ - type: marking id: MothLLegClassicGothicL bodyPart: LLeg - markingCategory: Legs + markingCategory: LeftLeg forcedColoring: true speciesRestriction: [Moth] coloring: @@ -968,7 +968,7 @@ - type: marking id: MothRLegClassicGothic bodyPart: RLeg - markingCategory: Legs + markingCategory: RightLeg forcedColoring: true speciesRestriction: [Moth] coloring: @@ -1014,7 +1014,7 @@ - type: marking id: MothLArmClassicJungle bodyPart: LArm - markingCategory: Arms + markingCategory: LeftArm forcedColoring: true speciesRestriction: [Moth] coloring: @@ -1029,7 +1029,7 @@ - type: marking id: MothRArmClassicJungle bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm forcedColoring: true speciesRestriction: [Moth] coloring: @@ -1044,7 +1044,7 @@ - type: marking id: MothLLegClassicJungle bodyPart: LLeg - markingCategory: Legs + markingCategory: LeftLeg forcedColoring: true speciesRestriction: [Moth] coloring: @@ -1059,7 +1059,7 @@ - type: marking id: MothRLegClassicJungle bodyPart: RLeg - markingCategory: Legs + markingCategory: RightLeg forcedColoring: true speciesRestriction: [Moth] coloring: @@ -1105,7 +1105,7 @@ - type: marking id: MothLArmClassicLovers bodyPart: LArm - markingCategory: Arms + markingCategory: LeftArm forcedColoring: true speciesRestriction: [Moth] coloring: @@ -1120,7 +1120,7 @@ - type: marking id: MothRArmClassicLovers bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm forcedColoring: true speciesRestriction: [Moth] coloring: @@ -1135,7 +1135,7 @@ - type: marking id: MothLLegClassicLovers bodyPart: LLeg - markingCategory: Legs + markingCategory: LeftLeg forcedColoring: true speciesRestriction: [Moth] coloring: @@ -1150,7 +1150,7 @@ - type: marking id: MothRLegClassicLovers bodyPart: RLeg - markingCategory: Legs + markingCategory: RightLeg forcedColoring: true speciesRestriction: [Moth] coloring: @@ -1196,7 +1196,7 @@ - type: marking id: MothLArmClassicMoonfly bodyPart: LArm - markingCategory: Arms + markingCategory: LeftArm forcedColoring: true speciesRestriction: [Moth] coloring: @@ -1211,7 +1211,7 @@ - type: marking id: MothRArmClassicMoonfly bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm forcedColoring: true speciesRestriction: [Moth] coloring: @@ -1226,7 +1226,7 @@ - type: marking id: MothLLegClassicMoonfly bodyPart: LLeg - markingCategory: Legs + markingCategory: LeftLeg forcedColoring: true speciesRestriction: [Moth] coloring: @@ -1241,7 +1241,7 @@ - type: marking id: MothRLegClassicMoonfly bodyPart: RLeg - markingCategory: Legs + markingCategory: RightLeg forcedColoring: true speciesRestriction: [Moth] coloring: @@ -1287,7 +1287,7 @@ - type: marking id: MothLArmClassicOakworm bodyPart: LArm - markingCategory: Arms + markingCategory: LeftArm forcedColoring: true speciesRestriction: [Moth] coloring: @@ -1302,7 +1302,7 @@ - type: marking id: MothRArmClassicOakworm bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm forcedColoring: true speciesRestriction: [Moth] coloring: @@ -1317,7 +1317,7 @@ - type: marking id: MothLLegClassicOakworm bodyPart: LLeg - markingCategory: Legs + markingCategory: LeftLeg forcedColoring: true speciesRestriction: [Moth] coloring: @@ -1332,7 +1332,7 @@ - type: marking id: MothRLegClassicOakworm bodyPart: RLeg - markingCategory: Legs + markingCategory: RightLeg forcedColoring: true speciesRestriction: [Moth] coloring: @@ -1378,7 +1378,7 @@ - type: marking id: MothLArmClassicPoison bodyPart: LArm - markingCategory: Arms + markingCategory: LeftArm forcedColoring: true speciesRestriction: [Moth] coloring: @@ -1393,7 +1393,7 @@ - type: marking id: MothRArmClassicPoison bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm forcedColoring: true speciesRestriction: [Moth] coloring: @@ -1408,7 +1408,7 @@ - type: marking id: MothLLegClassicPoison bodyPart: LLeg - markingCategory: Legs + markingCategory: LeftLeg forcedColoring: true speciesRestriction: [Moth] coloring: @@ -1423,7 +1423,7 @@ - type: marking id: MothRLegClassicPoison bodyPart: RLeg - markingCategory: Legs + markingCategory: RightLeg forcedColoring: true speciesRestriction: [Moth] coloring: @@ -1469,7 +1469,7 @@ - type: marking id: MothLArmClassicRagged bodyPart: LArm - markingCategory: Arms + markingCategory: LeftArm forcedColoring: true speciesRestriction: [Moth] coloring: @@ -1484,7 +1484,7 @@ - type: marking id: MothRArmClassicRagged bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm forcedColoring: true speciesRestriction: [Moth] coloring: @@ -1499,7 +1499,7 @@ - type: marking id: MothLLegClassicRagged bodyPart: LLeg - markingCategory: Legs + markingCategory: LeftLeg forcedColoring: true speciesRestriction: [Moth] coloring: @@ -1514,7 +1514,7 @@ - type: marking id: MothRLegClassicRagged bodyPart: RLeg - markingCategory: Legs + markingCategory: RightLeg forcedColoring: true speciesRestriction: [Moth] coloring: @@ -1560,7 +1560,7 @@ - type: marking id: MothLArmClassicReddish bodyPart: LArm - markingCategory: Arms + markingCategory: LeftArm forcedColoring: true speciesRestriction: [Moth] coloring: @@ -1575,7 +1575,7 @@ - type: marking id: MothRArmClassicReddish bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm forcedColoring: true speciesRestriction: [Moth] coloring: @@ -1590,7 +1590,7 @@ - type: marking id: MothLLegClassicReddish bodyPart: LLeg - markingCategory: Legs + markingCategory: LeftLeg forcedColoring: true speciesRestriction: [Moth] coloring: @@ -1605,7 +1605,7 @@ - type: marking id: MothRLegClassicReddish bodyPart: RLeg - markingCategory: Legs + markingCategory: RightLeg forcedColoring: true speciesRestriction: [Moth] coloring: @@ -1651,7 +1651,7 @@ - type: marking id: MothLArmClassicRoyal bodyPart: LArm - markingCategory: Arms + markingCategory: LeftArm forcedColoring: true speciesRestriction: [Moth] coloring: @@ -1666,7 +1666,7 @@ - type: marking id: MothRArmClassicRoyal bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm forcedColoring: true speciesRestriction: [Moth] coloring: @@ -1681,7 +1681,7 @@ - type: marking id: MothLLegClassicRoyal bodyPart: LLeg - markingCategory: Legs + markingCategory: LeftLeg forcedColoring: true speciesRestriction: [Moth] coloring: @@ -1696,7 +1696,7 @@ - type: marking id: MothRLegClassicRoyal bodyPart: RLeg - markingCategory: Legs + markingCategory: RightLeg forcedColoring: true speciesRestriction: [Moth] coloring: @@ -1742,7 +1742,7 @@ - type: marking id: MothLArmClassicWhitefly bodyPart: LArm - markingCategory: Arms + markingCategory: LeftArm forcedColoring: true speciesRestriction: [Moth] coloring: @@ -1757,7 +1757,7 @@ - type: marking id: MothRArmClassicWhitefly bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm forcedColoring: true speciesRestriction: [Moth] coloring: @@ -1772,7 +1772,7 @@ - type: marking id: MothLLegClassicWhitefly bodyPart: LLeg - markingCategory: Legs + markingCategory: LeftLeg forcedColoring: true speciesRestriction: [Moth] coloring: @@ -1787,7 +1787,7 @@ - type: marking id: MothRLegClassicWhitefly bodyPart: RLeg - markingCategory: Legs + markingCategory: RightLeg forcedColoring: true speciesRestriction: [Moth] coloring: @@ -1833,7 +1833,7 @@ - type: marking id: MothLArmClassicWitchking bodyPart: LArm - markingCategory: Arms + markingCategory: LeftArm forcedColoring: true speciesRestriction: [Moth] coloring: @@ -1848,7 +1848,7 @@ - type: marking id: MothRArmClassicWitchking bodyPart: RArm - markingCategory: Arms + markingCategory: RightArm forcedColoring: true speciesRestriction: [Moth] coloring: @@ -1863,7 +1863,7 @@ - type: marking id: MothLLegClassicWitchking bodyPart: LLeg - markingCategory: Legs + markingCategory: LeftLeg forcedColoring: true speciesRestriction: [Moth] coloring: @@ -1878,7 +1878,7 @@ - type: marking id: MothRLegClassicWitchking bodyPart: RLeg - markingCategory: Legs + markingCategory: RightLeg forcedColoring: true speciesRestriction: [Moth] coloring: diff --git a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml index ba5e5661f9f..4a306a7ce7f 100644 --- a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml +++ b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml @@ -41,9 +41,27 @@ Chest: points: 1 required: false - Legs: - points: 6 + RightLeg: + points: 2 + required: false + RightFoot: + points: 2 + required: false + LeftLeg: + points: 2 + required: false + LeftFoot: + points: 2 required: false - Arms: - points: 6 + RightArm: + points: 2 + required: false + RightHand: + points: 2 + required: false + LeftArm: + points: 2 + required: false + LeftHand: + points: 2 required: false diff --git a/Resources/Prototypes/Nyanotrasen/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Species/felinid.yml index 5eb26edd518..a0f8d2ad65c 100644 --- a/Resources/Prototypes/Nyanotrasen/Species/felinid.yml +++ b/Resources/Prototypes/Nyanotrasen/Species/felinid.yml @@ -34,9 +34,27 @@ Chest: points: 1 required: false - Legs: - points: 6 + RightLeg: + points: 2 required: false - Arms: - points: 6 + RightFoot: + points: 2 + required: false + LeftLeg: + points: 2 + required: false + LeftFoot: + points: 2 + required: false + RightArm: + points: 2 + required: false + RightHand: + points: 2 + required: false + LeftArm: + points: 2 + required: false + LeftHand: + points: 2 required: false diff --git a/Resources/Prototypes/Species/arachne.yml b/Resources/Prototypes/Species/arachne.yml index ed494c37cc8..583fc442e7b 100644 --- a/Resources/Prototypes/Species/arachne.yml +++ b/Resources/Prototypes/Species/arachne.yml @@ -26,7 +26,16 @@ Chest: points: 1 required: false - Arms: + RightArm: + points: 2 + required: false + RightHand: + points: 2 + required: false + LeftArm: + points: 2 + required: false + LeftHand: points: 2 required: false diff --git a/Resources/Prototypes/Species/arachnid.yml b/Resources/Prototypes/Species/arachnid.yml index 5dedba1b447..a2d941028da 100644 --- a/Resources/Prototypes/Species/arachnid.yml +++ b/Resources/Prototypes/Species/arachnid.yml @@ -63,11 +63,29 @@ Chest: points: 1 required: false - Legs: - points: 6 + RightLeg: + points: 2 required: false - Arms: - points: 6 + RightFoot: + points: 2 + required: false + LeftLeg: + points: 2 + required: false + LeftFoot: + points: 2 + required: false + RightArm: + points: 2 + required: false + RightHand: + points: 2 + required: false + LeftArm: + points: 2 + required: false + LeftHand: + points: 2 required: false - type: humanoidBaseSprite diff --git a/Resources/Prototypes/Species/diona.yml b/Resources/Prototypes/Species/diona.yml index 19fafaa3e1b..9b7f6e2ee64 100644 --- a/Resources/Prototypes/Species/diona.yml +++ b/Resources/Prototypes/Species/diona.yml @@ -46,10 +46,28 @@ Chest: points: 1 required: false - Legs: + RightLeg: points: 2 required: false - Arms: + RightFoot: + points: 2 + required: false + LeftLeg: + points: 2 + required: false + LeftFoot: + points: 2 + required: false + RightArm: + points: 2 + required: false + RightHand: + points: 2 + required: false + LeftArm: + points: 2 + required: false + LeftHand: points: 2 required: false Overlay: diff --git a/Resources/Prototypes/Species/harpy.yml b/Resources/Prototypes/Species/harpy.yml index 43d28daab06..cf9e044eee9 100644 --- a/Resources/Prototypes/Species/harpy.yml +++ b/Resources/Prototypes/Species/harpy.yml @@ -57,13 +57,31 @@ points: 1 required: true defaultMarkings: [ HarpyChestDefault ] - Legs: + RightLeg: points: 2 required: false - Arms: + RightFoot: + points: 2 + required: false + LeftLeg: + points: 2 + required: false + LeftFoot: + points: 2 + required: false + RightArm: points: 1 required: false defaultMarkings: [ HarpyWingDefaultHuescale ] + RightHand: + points: 2 + required: false + LeftArm: + points: 2 + required: false + LeftHand: + points: 2 + required: false - type: humanoidBaseSprite id: MobHarpyHead diff --git a/Resources/Prototypes/Species/human.yml b/Resources/Prototypes/Species/human.yml index 99ec35da2e1..a4008d318a2 100644 --- a/Resources/Prototypes/Species/human.yml +++ b/Resources/Prototypes/Species/human.yml @@ -56,11 +56,29 @@ Chest: points: 1 required: false - Legs: - points: 6 + RightLeg: + points: 2 required: false - Arms: - points: 6 + RightFoot: + points: 2 + required: false + LeftLeg: + points: 2 + required: false + LeftFoot: + points: 2 + required: false + RightArm: + points: 2 + required: false + RightHand: + points: 2 + required: false + LeftArm: + points: 2 + required: false + LeftHand: + points: 2 required: false - type: humanoidBaseSprite diff --git a/Resources/Prototypes/Species/ipc.yml b/Resources/Prototypes/Species/ipc.yml index 069429ee37d..766e217b017 100644 --- a/Resources/Prototypes/Species/ipc.yml +++ b/Resources/Prototypes/Species/ipc.yml @@ -53,17 +53,41 @@ points: 1 required: true defaultMarkings: [ MobIPCTorsoDefault ] - Legs: - points: 4 - required: true - defaultMarkings: [ MobIPCLLegDefault, MobIPCLFootDefault, MobIPCRLegDefault, MobIPCRFootDefault ] - Arms: - points: 4 - required: true - defaultMarkings: [ MobIPCLArmDefault, MobIPCLHandDefault, MobIPCRArmDefault, MobIPCRHandDefault ] - HeadSide: + HeadSide: points: 1 required: false + RightLeg: + points: 2 + required: false + defaultMarkings: [ MobIPCRLegDefault ] + RightFoot: + points: 2 + required: false + defaultMarkings: [ MobIPCRFootDefault ] + LeftLeg: + points: 2 + required: false + defaultMarkings: [ MobIPCLLegDefault ] + LeftFoot: + points: 2 + required: false + defaultMarkings: [ MobIPCLFootDefault ] + RightArm: + points: 2 + required: false + defaultMarkings: [ MobIPCRArmDefault ] + RightHand: + points: 2 + required: false + defaultMarkings: [ MobIPCRHandDefault ] + LeftArm: + points: 2 + required: false + defaultMarkings: [ MobIPCLArmDefault ] + LeftHand: + points: 2 + required: false + defaultMarkings: [ MobIPCLHandDefault ] - type: humanoidBaseSprite id: MobIPCMarkingFollowSkin @@ -88,7 +112,7 @@ id: MobIPCHeadDefault bodyPart: Head markingCategory: Head - speciesRestriction: [IPC] + speciesRestriction: [IPC] sprites: - sprite: Mobs/Species/IPC/parts.rsi state: head_m @@ -108,7 +132,7 @@ id: MobIPCTorsoDefault bodyPart: Chest markingCategory: Chest - speciesRestriction: [IPC] + speciesRestriction: [IPC] sprites: - sprite: Mobs/Species/IPC/parts.rsi state: torso_m @@ -117,7 +141,7 @@ id: MobIPCTorsoFemaleDefault bodyPart: Chest markingCategory: Chest - speciesRestriction: [IPC] + speciesRestriction: [IPC] sprites: - sprite: Mobs/Species/IPC/parts.rsi state: torso_f @@ -130,8 +154,8 @@ - type: marking id: MobIPCLLegDefault bodyPart: LLeg - markingCategory: Legs - speciesRestriction: [IPC] + markingCategory: RightLeg + speciesRestriction: [IPC] sprites: - sprite: Mobs/Species/IPC/parts.rsi state: l_leg @@ -144,8 +168,8 @@ - type: marking id: MobIPCLArmDefault bodyPart: LArm - markingCategory: Arms - speciesRestriction: [IPC] + markingCategory: RightArm + speciesRestriction: [IPC] sprites: - sprite: Mobs/Species/IPC/parts.rsi state: l_arm @@ -158,8 +182,8 @@ - type: marking id: MobIPCLHandDefault bodyPart: LHand - markingCategory: Arms - speciesRestriction: [IPC] + markingCategory: RightArm + speciesRestriction: [IPC] sprites: - sprite: Mobs/Species/IPC/parts.rsi state: l_hand @@ -172,8 +196,8 @@ - type: marking id: MobIPCLFootDefault bodyPart: LFoot - markingCategory: Legs - speciesRestriction: [IPC] + markingCategory: RightLeg + speciesRestriction: [IPC] sprites: - sprite: Mobs/Species/IPC/parts.rsi state: l_foot @@ -186,8 +210,8 @@ - type: marking id: MobIPCRLegDefault bodyPart: RLeg - markingCategory: Legs - speciesRestriction: [IPC] + markingCategory: RightLeg + speciesRestriction: [IPC] sprites: - sprite: Mobs/Species/IPC/parts.rsi state: r_leg @@ -200,8 +224,8 @@ - type: marking id: MobIPCRArmDefault bodyPart: RArm - markingCategory: Arms - speciesRestriction: [IPC] + markingCategory: RightArm + speciesRestriction: [IPC] sprites: - sprite: Mobs/Species/IPC/parts.rsi state: r_arm @@ -214,8 +238,8 @@ - type: marking id: MobIPCRHandDefault bodyPart: RHand - markingCategory: Arms - speciesRestriction: [IPC] + markingCategory: RightArm + speciesRestriction: [IPC] sprites: - sprite: Mobs/Species/IPC/parts.rsi state: r_hand @@ -224,12 +248,12 @@ - type: humanoidBaseSprite id: MobIPCRFoot - + - type: marking id: MobIPCRFootDefault bodyPart: RFoot - markingCategory: Legs - speciesRestriction: [IPC] + markingCategory: RightLeg + speciesRestriction: [IPC] sprites: - sprite: Mobs/Species/IPC/parts.rsi state: r_foot diff --git a/Resources/Prototypes/Species/moth.yml b/Resources/Prototypes/Species/moth.yml index 2623865b046..511f22394e0 100644 --- a/Resources/Prototypes/Species/moth.yml +++ b/Resources/Prototypes/Species/moth.yml @@ -67,11 +67,29 @@ Chest: points: 1 required: false - Legs: - points: 6 + RightLeg: + points: 2 required: false - Arms: - points: 6 + RightFoot: + points: 2 + required: false + LeftLeg: + points: 2 + required: false + LeftFoot: + points: 2 + required: false + RightArm: + points: 2 + required: false + RightHand: + points: 2 + required: false + LeftArm: + points: 2 + required: false + LeftHand: + points: 2 required: false - type: humanoidBaseSprite diff --git a/Resources/Prototypes/Species/reptilian.yml b/Resources/Prototypes/Species/reptilian.yml index dc5a56534b4..ec800b943d7 100644 --- a/Resources/Prototypes/Species/reptilian.yml +++ b/Resources/Prototypes/Species/reptilian.yml @@ -64,11 +64,29 @@ Chest: points: 1 required: false - Legs: - points: 6 + RightLeg: + points: 2 + required: false + RightFoot: + points: 2 + required: false + LeftLeg: + points: 2 + required: false + LeftFoot: + points: 2 required: false - Arms: - points: 6 + RightArm: + points: 2 + required: false + RightHand: + points: 2 + required: false + LeftArm: + points: 2 + required: false + LeftHand: + points: 2 required: false - type: humanoidBaseSprite diff --git a/Resources/Prototypes/Species/slime.yml b/Resources/Prototypes/Species/slime.yml index ef49e9b7cf6..72fe8534989 100644 --- a/Resources/Prototypes/Species/slime.yml +++ b/Resources/Prototypes/Species/slime.yml @@ -38,11 +38,29 @@ Chest: points: 1 required: false - Legs: - points: 4 + RightLeg: + points: 2 required: false - Arms: - points: 4 + RightFoot: + points: 2 + required: false + LeftLeg: + points: 2 + required: false + LeftFoot: + points: 2 + required: false + RightArm: + points: 2 + required: false + RightHand: + points: 2 + required: false + LeftArm: + points: 2 + required: false + LeftHand: + points: 2 required: false - type: humanoidBaseSprite diff --git a/Resources/Prototypes/Species/vox.yml b/Resources/Prototypes/Species/vox.yml index 605087a687b..5d9724826d6 100644 --- a/Resources/Prototypes/Species/vox.yml +++ b/Resources/Prototypes/Species/vox.yml @@ -44,10 +44,28 @@ Chest: points: 1 required: false - Legs: + RightLeg: points: 2 required: false - Arms: + RightFoot: + points: 2 + required: false + LeftLeg: + points: 2 + required: false + LeftFoot: + points: 2 + required: false + RightArm: + points: 2 + required: false + RightHand: + points: 2 + required: false + LeftArm: + points: 2 + required: false + LeftHand: points: 2 required: false From ab309ab7c567d48ff53f3374b203c4539106001f Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Fri, 6 Sep 2024 17:45:29 -0400 Subject: [PATCH 2/2] Update ipc.yml --- Resources/Prototypes/Species/ipc.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Prototypes/Species/ipc.yml b/Resources/Prototypes/Species/ipc.yml index 766e217b017..6d1a6485239 100644 --- a/Resources/Prototypes/Species/ipc.yml +++ b/Resources/Prototypes/Species/ipc.yml @@ -57,35 +57,35 @@ points: 1 required: false RightLeg: - points: 2 + points: 1 required: false defaultMarkings: [ MobIPCRLegDefault ] RightFoot: - points: 2 + points: 1 required: false defaultMarkings: [ MobIPCRFootDefault ] LeftLeg: - points: 2 + points: 1 required: false defaultMarkings: [ MobIPCLLegDefault ] LeftFoot: - points: 2 + points: 1 required: false defaultMarkings: [ MobIPCLFootDefault ] RightArm: - points: 2 + points: 1 required: false defaultMarkings: [ MobIPCRArmDefault ] RightHand: - points: 2 + points: 1 required: false defaultMarkings: [ MobIPCRHandDefault ] LeftArm: - points: 2 + points: 1 required: false defaultMarkings: [ MobIPCLArmDefault ] LeftHand: - points: 2 + points: 1 required: false defaultMarkings: [ MobIPCLHandDefault ]