diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_horns.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_horns.yml index d0b1f04874..092bfa4c78 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_horns.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_horns.yml @@ -3,7 +3,7 @@ id: CP14TieflingHorns bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [ CPTiefling ] + speciesRestriction: [ CP14Tiefling ] sprites: - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi state: horn1 @@ -12,7 +12,7 @@ id: CP14TieflingHorns2 bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [ CPTiefling ] + speciesRestriction: [ CP14Tiefling ] sprites: - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi state: horn2 @@ -21,7 +21,7 @@ id: CP14TieflingHorns3 bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [ CPTiefling ] + speciesRestriction: [ CP14Tiefling ] followSkinColor: true forcedColoring: true sprites: @@ -32,7 +32,7 @@ id: CP14TieflingHorns3Broken bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [ CPTiefling ] + speciesRestriction: [ CP14Tiefling ] followSkinColor: true forcedColoring: true sprites: @@ -43,7 +43,7 @@ id: CP14TieflingHorns4 bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [ CPTiefling ] + speciesRestriction: [ CP14Tiefling ] followSkinColor: true forcedColoring: true sprites: @@ -54,7 +54,7 @@ id: CP14TieflingHorns5 bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [ CPTiefling ] + speciesRestriction: [ CP14Tiefling ] followSkinColor: true forcedColoring: true sprites: @@ -65,7 +65,7 @@ id: CP14TieflingHorns5Broken bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [ CPTiefling ] + speciesRestriction: [ CP14Tiefling ] followSkinColor: true forcedColoring: true sprites: @@ -76,7 +76,7 @@ id: CP14TieflingHorns6 bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [ CPTiefling ] + speciesRestriction: [ CP14Tiefling ] followSkinColor: true forcedColoring: true sprites: diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_tails.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_tails.yml index 8d57ba7f39..cce02f97bd 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_tails.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_tails.yml @@ -2,7 +2,7 @@ id: CP14TieflingTail bodyPart: Tail markingCategory: Tail - speciesRestriction: [ CPTiefling ] + speciesRestriction: [ CP14Tiefling ] followSkinColor: true forcedColoring: true sprites: @@ -13,7 +13,7 @@ id: CP14TieflingTailSpades bodyPart: Tail markingCategory: Tail - speciesRestriction: [ CPTiefling ] + speciesRestriction: [ CP14Tiefling ] followSkinColor: true forcedColoring: true sprites: diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml index 91ea407c34..d00ce10362 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml @@ -89,7 +89,7 @@ defaultRotation: 90 horizontalRotation: 90 - type: HumanoidAppearance - species: Human + species: CP14Human - type: SlowOnDamage speedModifierThresholds: 60: 0.7 @@ -304,4 +304,81 @@ types: Asphyxiation: -1.0 - type: FireVisuals - alternateState: Standing \ No newline at end of file + alternateState: Standing + +- type: entity + save: false + id: CP14BaseSpeciesDummy + abstract: true + components: + - type: Hands + - type: Inventory + templateId: CP14Human + - type: InventorySlots + - type: ContainerContainer + - type: Icon + sprite: _CP14/Mobs/Species/Human/parts.rsi + state: full + - type: Sprite + layers: + - map: [ "enum.HumanoidVisualLayers.Chest" ] + - map: [ "enum.HumanoidVisualLayers.Head" ] + - map: [ "enum.HumanoidVisualLayers.Snout" ] + - map: [ "enum.HumanoidVisualLayers.Eyes" ] + - map: [ "enum.HumanoidVisualLayers.RArm" ] + - map: [ "enum.HumanoidVisualLayers.LArm" ] + - map: [ "enum.HumanoidVisualLayers.RLeg" ] + - map: [ "enum.HumanoidVisualLayers.LLeg" ] + - shader: StencilClear + sprite: Mobs/Species/Human/parts.rsi + state: l_leg + - shader: StencilMask + map: [ "enum.HumanoidVisualLayers.StencilMask" ] + sprite: Mobs/Customization/masking_helpers.rsi + state: unisex_full + visible: false + - map: [ "jumpsuit" ] + - map: [ "pants" ] + - map: [ "shirt" ] + - map: [ "enum.HumanoidVisualLayers.LFoot" ] + - map: [ "enum.HumanoidVisualLayers.RFoot" ] + - map: [ "enum.HumanoidVisualLayers.LHand" ] + - map: [ "enum.HumanoidVisualLayers.RHand" ] + - map: [ "gloves" ] + - map: [ "shoes" ] + - map: [ "ears" ] + - map: [ "outerClothing" ] + - map: [ "eyes" ] + - map: [ "belt" ] + - map: [ "id" ] + - map: [ "neck" ] + - map: [ "cloak" ] + - map: [ "back" ] + - map: [ "enum.HumanoidVisualLayers.FacialHair" ] + - map: [ "enum.HumanoidVisualLayers.Hair" ] + - map: [ "enum.HumanoidVisualLayers.HeadSide" ] + - map: [ "enum.HumanoidVisualLayers.HeadTop" ] + - map: [ "enum.HumanoidVisualLayers.Tail" ] + - map: [ "mask" ] + - map: [ "head" ] + - map: [ "pocket1" ] + - map: [ "pocket2" ] + - map: ["enum.HumanoidVisualLayers.Handcuffs"] + color: "#ffffff" + sprite: Objects/Misc/handcuffs.rsi + state: body-overlay-2 + visible: false + - map: [ "clownedon" ] # Dynamically generated + sprite: "Effects/creampie.rsi" + state: "creampie_human" + visible: false + - type: Appearance + - type: HumanoidAppearance + species: CP14Human + - type: Body + prototype: CP14Human + requiredLegs: 2 + - type: UserInterface + interfaces: + - key: enum.HumanoidMarkingModifierKey.Key # sure, this can go here too + type: HumanoidMarkingModifierBoundUserInterface \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml index b79ed8bff2..d9e18a15e5 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml @@ -24,7 +24,7 @@ templateId: CP14Human - type: entity - parent: BaseSpeciesDummy + parent: CP14BaseSpeciesDummy id: CP14MobHumanDummy noSpawn: true components: diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml index 0460a9112e..a71c6a8039 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml @@ -19,7 +19,7 @@ templateId: CP14Human - type: entity - parent: BaseSpeciesDummy + parent: CP14BaseSpeciesDummy id: CP14MobTieflingDummy noSpawn: true components: