diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tiefling.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tiefling.yml index ea728d5de1..7b0ce520a1 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tiefling.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tiefling.yml @@ -1,8 +1,8 @@ - type: marking - id: TieflingTail + id: CPTieflingTail bodyPart: Tail markingCategory: Tail - speciesRestriction: [Tiefling] + speciesRestriction: [CPTiefling] sprites: - sprite: Mobs/Customization/cat_parts.rsi state: tail_cat diff --git a/Resources/Prototypes/_CP14/Body/Prototypes/tiefling.yml b/Resources/Prototypes/_CP14/Body/Prototypes/tiefling.yml new file mode 100644 index 0000000000..169521eeaa --- /dev/null +++ b/Resources/Prototypes/_CP14/Body/Prototypes/tiefling.yml @@ -0,0 +1,49 @@ +- type: body + id: CPTiefling + name: tiefling + root: torso + slots: + head: + part: CPHeadHuman + connections: + - torso + organs: + brain: OrganHumanBrain + eyes: OrganHumanEyes + torso: + part: TorsoHuman + connections: + - right_arm + - left_arm + - right_leg + - left_leg + organs: + heart: OrganHumanHeart + lungs: OrganHumanLungs + stomach: OrganHumanStomach + liver: OrganHumanLiver + kidneys: OrganHumanKidneys + right_arm: + part: CPRightArmHuman + connections: + - right_hand + left_arm: + part: CPLeftArmHuman + connections: + - left_hand + right_hand: + part: CPRightHandHuman + left_hand: + part: CPLeftHandHuman + right_leg: + part: CPRightLegHuman + connections: + - right_foot + left_leg: + part: CPLeftLegHuman + connections: + - left_foot + right_foot: + part: CPRightFootHuman + left_foot: + part: CPLeftFootHuman diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling.yml new file mode 100644 index 0000000000..c16df27f9c --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling.yml @@ -0,0 +1,10 @@ +- type: marking + id: CPTieflingTail + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ CPTiefling ] + sprites: + - sprite: Mobs/Customization/reptilian_parts.rsi + state: tail_smooth_primary + - sprite: Mobs/Customization/reptilian_parts.rsi + state: tail_smooth_secondary diff --git a/Resources/Prototypes/Entities/Mobs/Player/tiefling.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Player/tiefling.yml similarity index 51% rename from Resources/Prototypes/Entities/Mobs/Player/tiefling.yml rename to Resources/Prototypes/_CP14/Entities/Mobs/Player/tiefling.yml index 6fb9fc36c7..5b36f836a1 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/tiefling.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Player/tiefling.yml @@ -1,5 +1,5 @@ - type: entity - parent: BaseMobTiefling - id: MobTiefling + parent: CPBaseMobTiefling + id: CPMobTiefling name: Mr. Tiefling save: false diff --git a/Resources/Prototypes/Entities/Mobs/Species/tiefling.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml similarity index 51% rename from Resources/Prototypes/Entities/Mobs/Species/tiefling.yml rename to Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml index 0fc74fb205..80caf96b62 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/tiefling.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml @@ -1,19 +1,24 @@ - type: entity parent: BaseMobSpeciesOrganic - id: BaseMobTiefling + id: CPBaseMobTiefling name: Mr. Tiefling abstract: true components: + - type: HumanoidAppearance + species: CPTiefling + - type: Body + prototype: CPTiefling + requiredLegs: 2 - type: Hunger - type: Icon - sprite: Mobs/Species/Tiefling/parts.rsi + sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: full - type: Thirst - type: entity parent: BaseSpeciesDummy - id: MobTieflingDummy + id: CPMobTieflingDummy noSpawn: true components: - type: HumanoidAppearance - species: Tiefling + species: CPTiefling diff --git a/Resources/Prototypes/_CP14/Species/human.yml b/Resources/Prototypes/_CP14/Species/human.yml index dee0257d23..40174fad3f 100644 --- a/Resources/Prototypes/_CP14/Species/human.yml +++ b/Resources/Prototypes/_CP14/Species/human.yml @@ -26,8 +26,6 @@ LFoot: CPMobHumanLFoot RFoot: CPMobHumanRFoot - - - type: humanoidBaseSprite id: CPMobHumanoidEyes baseSprite: diff --git a/Resources/Prototypes/Species/tiefling.yml b/Resources/Prototypes/_CP14/Species/tiefling.yml similarity index 70% rename from Resources/Prototypes/Species/tiefling.yml rename to Resources/Prototypes/_CP14/Species/tiefling.yml index d672e55a00..b5c2a2942b 100644 --- a/Resources/Prototypes/Species/tiefling.yml +++ b/Resources/Prototypes/_CP14/Species/tiefling.yml @@ -1,11 +1,11 @@ - type: species - id: Tiefling + id: CPTiefling name: species-name-tiefling roundStart: true - prototype: MobTiefling - sprites: MobTieflingSprites - markingLimits: MobTieflingMarkingLimits - dollPrototype: MobTieflingDummy + prototype: CPMobTiefling + sprites: CPMobTieflingSprites + markingLimits: CPMobTieflingMarkingLimits + dollPrototype: CPMobTieflingDummy skinColoration: Hues # The lack of a layer means that @@ -15,7 +15,7 @@ # in either the mob's starting marking prototype, # or it has to be added in C#. - type: speciesBaseSprites - id: MobTieflingSprites + id: CPMobTieflingSprites sprites: Head: MobTieflingHead Hair: MobTieflingAnyMarking @@ -33,7 +33,8 @@ RFoot: MobTieflingRFoot - type: markingPoints - id: MobTieflingMarkingLimits + id: CPMobTieflingMarkingLimits + onlyWhitelisted: true points: Hair: points: 1 @@ -47,9 +48,9 @@ Tail: points: 1 required: true - defaultMarkings: [TieflingTail] + defaultMarkings: [ CPTieflingTail ] HeadTop: - points: 0 + points: 1 required: false Chest: points: 1 @@ -77,83 +78,83 @@ - type: humanoidBaseSprite id: MobTieflingHead baseSprite: - sprite: Mobs/Species/Tiefling/parts.rsi + sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: head_m - type: humanoidBaseSprite id: MobTieflingHeadMale baseSprite: - sprite: Mobs/Species/Tiefling/parts.rsi + sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: head_m - type: humanoidBaseSprite id: MobTieflingHeadFemale baseSprite: - sprite: Mobs/Species/Tiefling/parts.rsi + sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: head_f - type: humanoidBaseSprite id: MobTieflingTorso baseSprite: - sprite: Mobs/Species/Tiefling/parts.rsi + sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: torso_m - type: humanoidBaseSprite id: MobTieflingTorsoMale baseSprite: - sprite: Mobs/Species/Tiefling/parts.rsi + sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: torso_m - type: humanoidBaseSprite id: MobTieflingTorsoFemale baseSprite: - sprite: Mobs/Species/Tiefling/parts.rsi + sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: torso_f - type: humanoidBaseSprite id: MobTieflingLLeg baseSprite: - sprite: Mobs/Species/Tiefling/parts.rsi + sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: l_leg - type: humanoidBaseSprite id: MobTieflingLArm baseSprite: - sprite: Mobs/Species/Tiefling/parts.rsi + sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: l_arm - type: humanoidBaseSprite id: MobTieflingLHand baseSprite: - sprite: Mobs/Species/Tiefling/parts.rsi + sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: l_hand - type: humanoidBaseSprite id: MobTieflingLFoot baseSprite: - sprite: Mobs/Species/Tiefling/parts.rsi + sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: l_foot - type: humanoidBaseSprite id: MobTieflingRLeg baseSprite: - sprite: Mobs/Species/Tiefling/parts.rsi + sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: r_leg - type: humanoidBaseSprite id: MobTieflingRArm baseSprite: - sprite: Mobs/Species/Tiefling/parts.rsi + sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: r_arm - type: humanoidBaseSprite id: MobTieflingRHand baseSprite: - sprite: Mobs/Species/Tiefling/parts.rsi + sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: r_hand - type: humanoidBaseSprite id: MobTieflingRFoot baseSprite: - sprite: Mobs/Species/Tiefling/parts.rsi + sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: r_foot diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/full.png b/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/full.png new file mode 100644 index 0000000000..a0e572d045 Binary files /dev/null and b/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/full.png differ diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/head_f.png b/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/head_f.png new file mode 100644 index 0000000000..2a8798ce1b Binary files /dev/null and b/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/head_f.png differ diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/head_m.png b/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/head_m.png new file mode 100644 index 0000000000..a577a1b925 Binary files /dev/null and b/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/head_m.png differ diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/l_arm.png b/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/l_arm.png new file mode 100644 index 0000000000..3e367da72b Binary files /dev/null and b/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/l_arm.png differ diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/l_foot.png b/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/l_foot.png new file mode 100644 index 0000000000..de5511c6a4 Binary files /dev/null and b/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/l_foot.png differ diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/l_hand.png b/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/l_hand.png new file mode 100644 index 0000000000..1c015eaba7 Binary files /dev/null and b/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/l_hand.png differ diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/l_leg.png b/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/l_leg.png new file mode 100644 index 0000000000..7e045922af Binary files /dev/null and b/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/l_leg.png differ diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/meta.json b/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/meta.json similarity index 83% rename from Resources/Textures/Mobs/Species/Tiefling/parts.rsi/meta.json rename to Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/meta.json index ce03292c8a..63fffd5f56 100644 --- a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/meta.json +++ b/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by DrSmugleaf", + "copyright": "Created by TheShuEd (Github) for CrystallPunk14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/r_arm.png b/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/r_arm.png new file mode 100644 index 0000000000..2d853ca9d1 Binary files /dev/null and b/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/r_arm.png differ diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/r_foot.png b/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/r_foot.png new file mode 100644 index 0000000000..947a8d91f8 Binary files /dev/null and b/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/r_foot.png differ diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/r_hand.png b/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/r_hand.png new file mode 100644 index 0000000000..192a4b09e5 Binary files /dev/null and b/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/r_hand.png differ diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/r_leg.png b/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/r_leg.png new file mode 100644 index 0000000000..1414e70d15 Binary files /dev/null and b/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/r_leg.png differ diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/torso_f.png b/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/torso_f.png new file mode 100644 index 0000000000..d252de33c8 Binary files /dev/null and b/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/torso_f.png differ diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/torso_m.png b/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/torso_m.png new file mode 100644 index 0000000000..da01756126 Binary files /dev/null and b/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/torso_m.png differ diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/full.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/full.png deleted file mode 100644 index 39d9a69915..0000000000 Binary files a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/full.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/head_f.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/head_f.png deleted file mode 100644 index b705d2d50e..0000000000 Binary files a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/head_f.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/head_m.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/head_m.png deleted file mode 100644 index e555d030be..0000000000 Binary files a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/head_m.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_arm.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_arm.png deleted file mode 100644 index cf3997a120..0000000000 Binary files a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_arm.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_foot.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_foot.png deleted file mode 100644 index c448837af2..0000000000 Binary files a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_foot.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_hand.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_hand.png deleted file mode 100644 index 7bf47c949a..0000000000 Binary files a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_hand.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_leg.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_leg.png deleted file mode 100644 index b3ce27ba86..0000000000 Binary files a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/l_leg.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_arm.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_arm.png deleted file mode 100644 index 8887c30fa2..0000000000 Binary files a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_arm.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_foot.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_foot.png deleted file mode 100644 index 8d51a591a4..0000000000 Binary files a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_foot.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_hand.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_hand.png deleted file mode 100644 index a481028126..0000000000 Binary files a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_hand.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_leg.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_leg.png deleted file mode 100644 index 67917397a1..0000000000 Binary files a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/r_leg.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/torso_f.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/torso_f.png deleted file mode 100644 index cf7d2e72b5..0000000000 Binary files a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/torso_f.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/torso_m.png b/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/torso_m.png deleted file mode 100644 index 3097763a95..0000000000 Binary files a/Resources/Textures/Mobs/Species/Tiefling/parts.rsi/torso_m.png and /dev/null differ