More markings! (#7964)

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

Resources/Locale/en-US/markings/reptilian.ftl

@@ -39,3 +39,16 @@ marking-LizardSnoutRound = Lizard Snout (Round)
 
 marking-LizardSnoutSharp-snout_sharp = Lizard Snout (Sharp)
 marking-LizardSnoutSharp = Lizard Snout (Sharp)
+
+marking-LizardChestTiger-chest_tiger = Lizard Chest (Tiger)
+marking-LizardChestTiger = Lizard Chest (Tiger)
+
+marking-LizardFrillsDivinity-frills_divinity = Lizard Frills (Divinity)
+marking-LizardFrillsDivinity = Lizard Frills (Divinity)
+
+marking-LizardFrillsBig-frills_big = Lizard Frills (Big)
+marking-LizardFrillsBig = Lizard Frills (Big)
+
+marking-LizardHornsDouble-horns_double = Lizard Horns (Double)
+marking-LizardHornsDouble = Lizard Horns (Double)
+

Resources/Locale/en-US/markings/slimeperson.ftl

@@ -0,0 +1,17 @@
+marking-SlimeGradientLeftArm-gradient_left_arm = Slime Left Arm (Gradient)
+marking-SlimeGradientLeftArm = Slime Left Arm (Gradient)
+
+marking-SlimeGradientRightArm-gradient_right_arm = Slime Right Arm (Gradient)
+marking-SlimeGradientRightArm = Slime Right Arm (Gradient)
+
+marking-SlimeGradientLeftLeg-gradient_left_leg = Slime Left Leg (Gradient)
+marking-SlimeGradientLeftLeg = Slime Left Leg (Gradient)
+
+marking-SlimeGradientRightLeg-gradient_right_leg = Slime Right Leg (Gradient)
+marking-SlimeGradientRightLeg = Slime Right Leg (Gradient)
+
+marking-SlimeGradientLeftHand-gradient_left_hand = Slime Left Hand (Gradient)
+marking-SlimeGradientLeftHand = Slime Left Hand (Gradient)
+
+marking-SlimeGradientRightHand-gradient_Right_hand = Slime Right Hand (Gradient)
+marking-SlimeGradientRightHand = Slime Right Hand (Gradient)

Resources/Locale/en-US/markings/tattoos.ftl

@@ -0,0 +1,25 @@
+marking-TattooHiveChest-hivechest = Back Tattoo (Hive)
+marking-TattooHiveChest = Back Tattoo (Hive)
+
+marking-TattooNightlingChest-nightlingchest = Chest Tattoo (nightling)
+marking-TattooNightlingChest = Chest Tattoo (Nightling)
+
+marking-TattooSilverburghLeftLeg-silverburghleftleg = Left Leg Tattoo (Silverburg)
+marking-TattooSilverburghLeftLeg = Left Leg Tattoo (Silverburg)
+
+marking-TattooSilverburghRightLeg-silverburghRightleg = Right Leg Tattoo (Silverburg)
+marking-TattooSilverburghRightLeg = Right Leg Tattoo (Silverburg)
+
+marking-TattooCampbellLeftArm-campbelleleftArm = Left Arm Tattoo (Campbelle)
+marking-TattooCampbellLeftArm = Left Arm Tattoo (Campbelle)
+
+marking-TattooCampbellRightArm-campbellrightarm = Right Arm Tattoo (Campbelle)
+marking-TattooCampbellRightArm = Right Arm Tattoo (Campbelle)
+
+marking-TattooCampbellLeftLeg-campbellleftleg = Left Leg Tattoo (Campbelle)
+marking-TattooCampbellLeftLeg = Left Leg Tattoo (Campbelle)
+
+marking-TattooCampbellRightLeg-campbellrightleg = Right Leg Tattoo (Campbelle)
+marking-TattooCampbellRightLeg = Right Leg Tattoo (Campbelle)
+
+

Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml

@@ -4,7 +4,7 @@
   markingCategory: HeadSide
   speciesRestriction: [Reptilian]
   sprites:
-  - sprite: Mobs/Customization/reptilian_parts.rsi/
+  - sprite: Mobs/Customization/reptilian_parts.rsi
     state: frills_aquatic
 
 - type: marking
@@ -13,7 +13,7 @@
   markingCategory: HeadSide
   speciesRestriction: [Reptilian]
   sprites:
-  - sprite: Mobs/Customization/reptilian_parts.rsi/
+  - sprite: Mobs/Customization/reptilian_parts.rsi
     state: frills_short
 
 - type: marking
@@ -22,16 +22,34 @@
   markingCategory: HeadSide
   speciesRestriction: [Reptilian]
   sprites:
-  - sprite: Mobs/Customization/reptilian_parts.rsi/
+  - sprite: Mobs/Customization/reptilian_parts.rsi
     state: frills_simple
 
+- type: marking
+  id: LizardFrillsDivinity
+  bodyPart: HeadSide
+  markingCategory: HeadSide
+  speciesRestriction: [Reptilian]
+  sprites:
+  - sprite: Mobs/Customization/reptilian_parts.rsi
+    state: frills_divinity
+
+- type: marking
+  id: LizardFrillsBig
+  bodyPart: HeadSide
+  markingCategory: HeadSide
+  speciesRestriction: [Reptilian]
+  sprites:
+  - sprite: Mobs/Customization/reptilian_parts.rsi
+    state: frills_big
+
 - type: marking
   id: LizardHornsAngler
   bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Reptilian]
   sprites:
-  - sprite: Mobs/Customization/reptilian_parts.rsi/
+  - sprite: Mobs/Customization/reptilian_parts.rsi
     state: horns_angler
 
 - type: marking
@@ -40,7 +58,7 @@
   markingCategory: HeadTop
   speciesRestriction: [Reptilian]
   sprites:
-  - sprite: Mobs/Customization/reptilian_parts.rsi/
+  - sprite: Mobs/Customization/reptilian_parts.rsi
     state: horns_curled
 
 - type: marking
@@ -49,7 +67,7 @@
   markingCategory: HeadTop
   speciesRestriction: [Reptilian]
   sprites:
-  - sprite: Mobs/Customization/reptilian_parts.rsi/
+  - sprite: Mobs/Customization/reptilian_parts.rsi
     state: horns_ram
 
 - type: marking
@@ -58,7 +76,7 @@
   markingCategory: HeadTop
   speciesRestriction: [Reptilian]
   sprites:
-  - sprite: Mobs/Customization/reptilian_parts.rsi/
+  - sprite: Mobs/Customization/reptilian_parts.rsi
     state: horns_short
 
 - type: marking
@@ -67,16 +85,25 @@
   markingCategory: HeadTop
   speciesRestriction: [Reptilian]
   sprites:
-  - sprite: Mobs/Customization/reptilian_parts.rsi/
+  - sprite: Mobs/Customization/reptilian_parts.rsi
     state: horns_simple
 
+- type: marking
+  id: LizardHornsDouble
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [Reptilian]
+  sprites:
+  - sprite: Mobs/Customization/reptilian_parts.rsi
+    state: horns_double
+
 - type: marking
   id: LizardTailSmooth
   bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Reptilian]
   sprites:
-  - sprite: Mobs/Customization/reptilian_parts.rsi/
+  - sprite: Mobs/Customization/reptilian_parts.rsi
     state: tail_smooth
 
 - type: marking
@@ -85,7 +112,7 @@
   markingCategory: Tail
   speciesRestriction: [Reptilian]
   sprites:
-  - sprite: Mobs/Customization/reptilian_parts.rsi/
+  - sprite: Mobs/Customization/reptilian_parts.rsi
     state: tail_spikes
 
 - type: marking
@@ -94,7 +121,7 @@
   markingCategory: Tail
   speciesRestriction: [Reptilian]
   sprites:
-  - sprite: Mobs/Customization/reptilian_parts.rsi/
+  - sprite: Mobs/Customization/reptilian_parts.rsi
     state: tail_ltiger
 
 - type: marking
@@ -103,7 +130,7 @@
   markingCategory: Tail
   speciesRestriction: [Reptilian]
   sprites:
-  - sprite: Mobs/Customization/reptilian_parts.rsi/
+  - sprite: Mobs/Customization/reptilian_parts.rsi
     state: tail_dtiger
 
 - type: marking
@@ -113,7 +140,7 @@
   followSkinColor: true
   speciesRestriction: [Reptilian]
   sprites:
-  - sprite: Mobs/Customization/reptilian_parts.rsi/
+  - sprite: Mobs/Customization/reptilian_parts.rsi
     state: snout_round
 
 - type: marking
@@ -123,8 +150,15 @@
   followSkinColor: true
   speciesRestriction: [Reptilian]
   sprites:
-  - sprite: Mobs/Customization/reptilian_parts.rsi/
+  - sprite: Mobs/Customization/reptilian_parts.rsi
     state: snout_sharp
 
-
+- type: marking
-
+  id: LizardChestTiger
+  bodyPart: Chest
+  markingCategory: Chest
+  followSkinColor: false
+  speciesRestriction: [Reptilian]
+  sprites:
+  - sprite: Mobs/Customization/reptilian_parts.rsi
+    state: body_tiger

Resources/Prototypes/Entities/Mobs/Customization/Markings/slime.yml

@@ -0,0 +1,53 @@
+- type: marking
+  id: SlimeGradientLeftArm
+  bodyPart: LArm
+  markingCategory: Arms
+  speciesRestriction: [SlimePerson]
+  sprites:
+  - sprite: Mobs/Customization/slime_parts.rsi
+    state: gradient_l_arm
+
+- type: marking
+  id: SlimeGradientRightArm
+  bodyPart: RArm
+  markingCategory: Arms
+  speciesRestriction: [SlimePerson]
+  sprites:
+  - sprite: Mobs/Customization/slime_parts.rsi
+    state: gradient_r_arm
+
+- type: marking
+  id: SlimeGradientLeftLeg
+  bodyPart: LFoot
+  markingCategory: Legs
+  speciesRestriction: [SlimePerson]
+  sprites:
+  - sprite: Mobs/Customization/slime_parts.rsi
+    state: gradient_l_leg
+
+- type: marking
+  id: SlimeGradientRightLeg
+  bodyPart: RFoot
+  markingCategory: Legs
+  speciesRestriction: [SlimePerson]
+  sprites:
+  - sprite: Mobs/Customization/slime_parts.rsi
+    state: gradient_r_leg
+
+- type: marking
+  id: SlimeGradientLeftHand
+  bodyPart: LHand
+  markingCategory: Arms
+  speciesRestriction: [SlimePerson]
+  sprites:
+  - sprite: Mobs/Customization/slime_parts.rsi
+    state: gradient_l_hand
+
+- type: marking
+  id: SlimeGradientRightHand
+  bodyPart: RHand
+  markingCategory: Arms
+  speciesRestriction: [SlimePerson]
+  sprites:
+  - sprite: Mobs/Customization/slime_parts.rsi
+    state: gradient_r_hand

Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml

@@ -0,0 +1,71 @@
+- type: marking
+  id: TattooHiveChest
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Human]
+  sprites:
+  - sprite: Mobs/Customization/tattoos.rsi
+    state: tattoo_hive_chest
+
+- type: marking
+  id: TattooNightlingChest
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Human]
+  sprites:
+  - sprite: Mobs/Customization/tattoos.rsi
+    state: tattoo_nightling
+
+- type: marking
+  id: TattooSilverburghLeftLeg
+  bodyPart: LLeg
+  markingCategory: Legs
+  speciesRestriction: [Human]
+  sprites:
+  - sprite: Mobs/Customization/tattoos.rsi
+    state: tattoo_silverburgh_l_leg
+
+- type: marking
+  id: TattooSilverburghRightLeg
+  bodyPart: RLeg
+  markingCategory: Legs
+  speciesRestriction: [Human]
+  sprites:
+  - sprite: Mobs/Customization/tattoos.rsi
+    state: tattoo_silverburgh_r_leg
+
+- type: marking
+  id: TattooCampbellLeftArm
+  bodyPart: LArm
+  markingCategory: Arms
+  speciesRestriction: [Human]
+  sprites:
+  - sprite: Mobs/Customization/tattoos.rsi
+    state: tattoo_campbell_l_arm
+
+- type: marking
+  id: TattooCampbellRightArm
+  bodyPart: RArm
+  markingCategory: Arms
+  speciesRestriction: [Human]
+  sprites:
+  - sprite: Mobs/Customization/tattoos.rsi
+    state: tattoo_campbell_r_arm
+
+- type: marking
+  id: TattooCampbellLeftLeg
+  bodyPart: LLeg
+  markingCategory: Legs
+  speciesRestriction: [Human]
+  sprites:
+  - sprite: Mobs/Customization/tattoos.rsi
+    state: tattoo_campbell_l_leg
+
+- type: marking
+  id: TattooCampbellRightLeg
+  bodyPart: RLeg
+  markingCategory: Legs
+  speciesRestriction: [Human]
+  sprites:
+  - sprite: Mobs/Customization/tattoos.rsi
+    state: tattoo_campbell_r_leg

Resources/Prototypes/Entities/Mobs/Species/human.yml

@@ -170,6 +170,16 @@
       HeadTop:
         points: 0
         required: false
+      Chest:
+        points: 1
+        required: false
+      Legs:
+        points: 2
+        required: false
+      Arms:
+        points: 2
+        required: false
+             
   - type: Physics
     bodyType: KinematicController
   - type: Fixtures

Resources/Prototypes/Entities/Mobs/Species/slime.yml

@@ -90,6 +90,14 @@
         - map: [ "head" ]
         - map: [ "pocket1" ]
         - map: [ "pocket2" ]
+    - type: Markings
+      layerPoints:
+       Legs:
+        points: 2
+        required: false
+       Arms:
+        points: 4
+        required: false
     - type: Body
       template: HumanoidTemplate
       preset: SlimePreset

Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json

@@ -1,107 +1,123 @@
 {
-    "version": 1,
+  "version": 1,
-    "license": "CC-BY-SA-3.0",
+  "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/tgstation/tgstation/blob/165be097d54c19f2e3de9fd6d95f545bcf356768/icons/mob/mutant_bodyparts.dmi",
+  "copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297",
-    "size": {
+  "size": {
-        "x": 32,
+    "x": 32,
-        "y": 32
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "tail_smooth_front",
+      "directions": 4
     },
-    "states": [
+    {
-        {
+      "name": "tail_spikes_front",
-            "name": "tail_smooth_front",
+      "directions": 4
-            "directions": 4
+    },
-        },
+    {
-        {
+      "name": "tail_dtiger_front",
-            "name": "tail_spikes_front",
+      "directions": 4
-            "directions": 4
+    },
-        },
+    {
-        {
+      "name": "tail_ltiger_front",
-            "name": "tail_dtiger_front",
+      "directions": 4
-            "directions": 4
+    },
-        },
+    {
-        {
+      "name": "tail_smooth_behind",
-            "name": "tail_ltiger_front",
+      "directions": 4
-            "directions": 4
+    },
-        },
+    {
-        {
+      "name": "tail_spikes_behind",
-            "name": "tail_smooth_behind",
+      "directions": 4
-            "directions": 4
+    },
-        },
+    {
-        {
+      "name": "tail_dtiger_behind",
-            "name": "tail_spikes_behind",
+      "directions": 4
-            "directions": 4
+    },
-        },
+    {
-        {
+      "name": "tail_ltiger_behind",
-            "name": "tail_dtiger_behind",
+      "directions": 4
-            "directions": 4
+    },
-        },
+    {
-        {
+      "name": "tail_smooth",
-            "name": "tail_ltiger_behind",
+      "directions": 4
-            "directions": 4
+    },
-        },
+    {
-	{
+      "name": "tail_spikes",
-	    "name": "tail_smooth",
+      "directions": 4
-	    "directions": 4
+    },
-	},
+    {
-	{
+      "name": "tail_dtiger",
-	    "name": "tail_spikes",
+      "directions": 4
-	    "directions": 4
+    },
-	},
+    {
-	{
+      "name": "tail_ltiger",
-	    "name": "tail_dtiger",
+      "directions": 4
-	    "directions": 4
+    },
-	},
+    {
-	{
+      "name": "snout_round",
-	    "name": "tail_ltiger",
+      "directions": 4
-	    "directions": 4
+    },
-	},
+    {
-        {
+      "name": "snout_roundlight",
-            "name": "snout_round",
+      "directions": 4
-            "directions": 4
+    },
-        },
+    {
-        {
+      "name": "snout_sharp",
-            "name": "snout_roundlight",
+      "directions": 4
-            "directions": 4
+    },
-        },
+    {
-        {
+      "name": "snout_sharplight",
-            "name": "snout_sharp",
+      "directions": 4
-            "directions": 4
+    },
-        },
+    {
-        {
+      "name": "horns_simple",
-            "name": "snout_sharplight",
+      "directions": 4
-            "directions": 4
+    },
-        },
+    {
-        {
+      "name": "horns_short",
-            "name": "horns_simple",
+      "directions": 4
-            "directions": 4
+    },
-        },
+    {
-        {
+      "name": "horns_curled",
-            "name": "horns_short",
+      "directions": 4
-            "directions": 4
+    },
-        },
+    {
-        {
+      "name": "horns_ram",
-            "name": "horns_curled",
+      "directions": 4
-            "directions": 4
+    },
-        },
+    {
-        {
+      "name": "horns_angler",
-            "name": "horns_ram",
+      "directions": 4
-            "directions": 4
+    },
-        },
+    {
-        {
+      "name": "frills_simple",
-            "name": "horns_angler",
+      "directions": 4
-            "directions": 4
+    },
-        },
+    {
-        {
+      "name": "frills_short",
-            "name": "frills_simple",
+      "directions": 4
-            "directions": 4
+    },
-        },
+    {
-        {
+      "name": "frills_aquatic",
-            "name": "frills_short",
+      "directions": 4
-            "directions": 4
+    },
-        },
+    {
-        {
+      "name": "frills_divinity",
-            "name": "frills_aquatic",
+      "directions": 4
-            "directions": 4
+    },
-        }
+    {
-    ]
+      "name": "horns_double",
+      "directions": 4
+    },
+    {
+      "name": "frills_big",
+      "directions": 4
+    },
+    {
+      "name": "body_tiger",
+      "directions": 4
+    }
+  ]
 }

Resources/Textures/Mobs/Customization/slime_parts.rsi/meta.json

@@ -0,0 +1,35 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297/modular_skyrat/master_files/icons/mob/body_markings/secondary_markings.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "gradient_r_arm",
+      "directions": 4
+    },
+    {
+      "name": "gradient_l_arm",
+      "directions": 4
+    },
+    {
+      "name": "gradient_r_hand",
+      "directions": 4
+    },
+    {
+      "name": "gradient_l_hand",
+      "directions": 4
+    },
+    {
+      "name": "gradient_r_leg",
+      "directions": 4
+    },
+    {
+      "name": "gradient_l_leg",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Mobs/Customization/tattoos.rsi/meta.json

@@ -0,0 +1,43 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297/modular_skyrat/master_files/icons/mob/body_markings/tattoo_markings.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "tattoo_hive_chest",
+      "directions": 4
+    },
+    {
+      "name": "tattoo_nightling",
+      "directions": 4
+    },
+    {
+      "name": "tattoo_campbell_r_arm",
+      "directions": 4
+    },
+    {
+      "name": "tattoo_campbell_l_arm",
+      "directions": 4
+    },
+    {
+      "name": "tattoo_campbell_r_leg",
+      "directions": 4
+    },
+    {
+      "name": "tattoo_campbell_l_leg",
+      "directions": 4
+    },
+    {
+      "name": "tattoo_silverburgh_r_leg",
+      "directions": 4
+    },
+    {
+      "name": "tattoo_silverburgh_l_leg",
+      "directions": 4
+    }
+  ]
+}