Markings (#7072)

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

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

@@ -0,0 +1,2 @@
+marking-CatEars = Cat Ears
+marking-CatTail = Cat Tail

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

@@ -0,0 +1,41 @@
+marking-LizardFrillsShort-frills_short = Lizard Frills (Short)
+marking-LizardFrillsShort = Lizard Frills (Short)
+
+marking-LizardFrillsSimple-frills_simple = Lizard Frills (Simple)
+marking-LizardFrillsSimple = Lizard Frills (Simple)
+
+marking-LizardFrillsAquatic-frills_aquatic = Lizard Frills (Aquatic)
+marking-LizardFrillsAquatic = Lizard Frills (Aquatic)
+
+marking-LizardHornsAngler-horns_angler = Lizard Horns (Angler)
+marking-LizardHornsAngler = Lizard Horns (Angler)
+
+marking-LizardHornsCurled-horns_curled = Lizard Horns (Curled)
+marking-LizardHornsCurled = Lizard Horns (Curled)
+
+marking-LizardHornsRam-horns_ram = Lizard Horns (Ram)
+marking-LizardHornsRam = Lizard Horns (Ram)
+
+marking-LizardHornsShort-horns_short = Lizard Horns (Short)
+marking-LizardHornsShort = Lizard Horns (Short)
+
+marking-LizardHornsSimple-horns_simple = Lizard Horns
+marking-LizardHornsSimple = Lizard Horns
+
+marking-LizardTailSmooth-tail_smooth = Lizard Tail (Smooth)
+marking-LizardTailSmooth = Lizard Tail (Smooth)
+
+marking-LizardTailSpikes-tail_spikes = Lizard Tail (Spiky)
+marking-LizardTailSpikes = Lizard Tail (Spiky)
+
+marking-LizardTailLTiger-tail_ltiger = Lizard Tail (Light Tiger Stripes)
+marking-LizardTailLTiger = Lizard Tail (Light Tiger Stripes)
+
+marking-LizardTailDTiger-tail_dtiger = Lizard Tail (Dark Tiger Stripes)
+marking-LizardTailDTiger = Lizard Tail (Dark Tiger Stripes)
+
+marking-LizardSnoutRound-snout_round = Lizard Snout (Round)
+marking-LizardSnoutRound = Lizard Snout (Round)
+
+marking-LizardSnoutSharp-snout_sharp = Lizard Snout (Sharp)
+marking-LizardSnoutSharp = Lizard Snout (Sharp)

Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl

@@ -35,3 +35,4 @@ humanoid-profile-editor-job-priority-medium-button = Medium
 humanoid-profile-editor-job-priority-low-button = Low
 humanoid-profile-editor-job-priority-never-button = Never
 humanoid-profile-editor-naming-rules-warning = Warning: Offensive or LRP IC names will lead to admin intervention on this server. Read our \[Rules\] for more.
+humanoid-profile-editor-markings-tab = Markings

Resources/Locale/en-US/preferences/ui/markings-picker.ftl

@@ -0,0 +1,20 @@
+markings-used = Used Markings
+markings-unused = Unused Markings
+markings-add = Add Marking
+markings-remove = Remove Marking
+markings-rank-up = Up
+markings-rank-down = Down
+marking-points-remaining = Points remaining: {$points}
+marking-used = {$marking-name} ({$marking-category})
+
+# Categories
+
+markings-category-Head = Head
+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-Tail = Tail
+markings-category-Overlay = Overlay

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

@@ -0,0 +1,19 @@
+- type: marking
+  id: CatEars
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [Human]
+  sprites:
+  - sprite: Mobs/Customization/cat_parts.rsi/
+    state: ears_cat_outer
+  - sprite: Mobs/Customization/cat_parts.rsi/
+    state: ears_cat_inner
+
+- type: marking
+  id: CatTail
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Human]
+  sprites:
+  - sprite: Mobs/Customization/cat_parts.rsi/
+    state: tail_cat

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

@@ -0,0 +1,130 @@
+- type: marking
+  id: LizardFrillsAquatic
+  bodyPart: HeadSide
+  markingCategory: HeadSide
+  speciesRestriction: [Reptilian]
+  sprites:
+  - sprite: Mobs/Customization/reptilian_parts.rsi/
+    state: frills_aquatic
+
+- type: marking
+  id: LizardFrillsShort
+  bodyPart: HeadSide
+  markingCategory: HeadSide
+  speciesRestriction: [Reptilian]
+  sprites:
+  - sprite: Mobs/Customization/reptilian_parts.rsi/
+    state: frills_short
+
+- type: marking
+  id: LizardFrillsSimple
+  bodyPart: HeadSide
+  markingCategory: HeadSide
+  speciesRestriction: [Reptilian]
+  sprites:
+  - sprite: Mobs/Customization/reptilian_parts.rsi/
+    state: frills_simple
+
+- type: marking
+  id: LizardHornsAngler
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [Reptilian]
+  sprites:
+  - sprite: Mobs/Customization/reptilian_parts.rsi/
+    state: horns_angler
+
+- type: marking
+  id: LizardHornsCurled
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [Reptilian]
+  sprites:
+  - sprite: Mobs/Customization/reptilian_parts.rsi/
+    state: horns_curled
+
+- type: marking
+  id: LizardHornsRam
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [Reptilian]
+  sprites:
+  - sprite: Mobs/Customization/reptilian_parts.rsi/
+    state: horns_ram
+
+- type: marking
+  id: LizardHornsShort
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [Reptilian]
+  sprites:
+  - sprite: Mobs/Customization/reptilian_parts.rsi/
+    state: horns_short
+
+- type: marking
+  id: LizardHornsSimple
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [Reptilian]
+  sprites:
+  - sprite: Mobs/Customization/reptilian_parts.rsi/
+    state: horns_simple
+
+- type: marking
+  id: LizardTailSmooth
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Reptilian]
+  sprites:
+  - sprite: Mobs/Customization/reptilian_parts.rsi/
+    state: tail_smooth
+
+- type: marking
+  id: LizardTailSpikes
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Reptilian]
+  sprites:
+  - sprite: Mobs/Customization/reptilian_parts.rsi/
+    state: tail_spikes
+
+- type: marking
+  id: LizardTailLTiger
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Reptilian]
+  sprites:
+  - sprite: Mobs/Customization/reptilian_parts.rsi/
+    state: tail_ltiger
+
+- type: marking
+  id: LizardTailDTiger
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Reptilian]
+  sprites:
+  - sprite: Mobs/Customization/reptilian_parts.rsi/
+    state: tail_dtiger
+
+- type: marking
+  id: LizardSnoutRound
+  bodyPart: Snout
+  markingCategory: Snout
+  followSkinColor: true
+  speciesRestriction: [Reptilian]
+  sprites:
+  - sprite: Mobs/Customization/reptilian_parts.rsi/
+    state: snout_round
+
+- type: marking
+  id: LizardSnoutSharp
+  bodyPart: Snout
+  markingCategory: Snout
+  followSkinColor: true
+  speciesRestriction: [Reptilian]
+  sprites:
+  - sprite: Mobs/Customization/reptilian_parts.rsi/
+    state: snout_sharp
+
+
+

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

@@ -162,6 +162,14 @@
     - map: [ "head" ]
     - map: [ "pocket1" ]
     - map: [ "pocket2" ]
+  - type: Markings
+    layerPoints:
+      Tail:
+        points: 0
+        required: false
+      HeadTop:
+        points: 0
+        required: false
   - type: Physics
     bodyType: KinematicController
   - type: Fixtures
@@ -395,6 +403,7 @@
       - map: [ "pocket2" ]
       - map: ["hand-left"]
       - map: ["hand-right"]
+    - type: Markings 
     - type: Physics
       bodyType: Dynamic
     - type: Fixtures

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

@@ -9,16 +9,32 @@
   - type: Icon
     sprite: Mobs/Species/Reptilian/parts.rsi
     state: full
+  - type: Markings
+    layerPoints:
+      Tail:
+        points: 1
+        required: true
+        defaultMarkings: [LizardTailSmooth] 
+      Snout:
+        points: 1
+        required: true
+        defaultMarkings: [LizardSnoutRound]
+      HeadTop:
+        points: 1
+        required: false
+      HeadSide:
+        points: 1
+        required: false
   - type: Sprite
     netsync: false
     noRot: true
     drawdepth: Mobs
     scale: 1, 1
     layers:
-      - map: [ "enum.HumanoidVisualLayers.TailBehind" ]
-        color: "#34a223"
-        state: tail_smooth_behind
-        sprite: Mobs/Customization/reptilian_parts.rsi
+      - map: [ "enum.HumanoidVisualLayers.Tail" ]
+        sprite: Mobs/Customization/masking_helpers.rsi
+        state: none
+        visible: false
       - map: [ "enum.HumanoidVisualLayers.Chest" ]
         color: "#34a223"
         sprite: Mobs/Species/Reptilian/parts.rsi
@@ -28,9 +44,9 @@
         sprite: Mobs/Species/Reptilian/parts.rsi
         state: head_m
       - map: [ "enum.HumanoidVisualLayers.Snout" ]
-        color: "#34a223"
-        state: snout_round
-        sprite: Mobs/Customization/reptilian_parts.rsi
+        sprite: Mobs/Customization/masking_helpers.rsi
+        state: none
+        visible: false
       - map: [ "enum.HumanoidVisualLayers.Eyes" ]
         color: "#008800"
         sprite: Mobs/Customization/eyes.rsi
@@ -88,20 +104,17 @@
       - map: [ "ears" ]
       - map: [ "outerClothing" ]
       - map: [ "eyes" ]
-      - map: [ "enum.HumanoidVisualLayers.TailFront" ]
-        color: "#34a223"
-        state: tail_smooth_front
-        sprite: Mobs/Customization/reptilian_parts.rsi
       - map: [ "belt" ]
       - map: [ "neck" ]
       - map: [ "back" ]
-      - map: [ "enum.HumanoidVisualLayers.Frills" ]
-        state: frills_simple
-        color: "#34a223"
-        sprite: Mobs/Customization/reptilian_parts.rsi
-      - map: [ "enum.HumanoidVisualLayers.Horns" ]
-        state: horns_simple
-        sprite: Mobs/Customization/reptilian_parts.rsi
+      - map: [ "enum.HumanoidVisualLayers.HeadSide" ]
+        sprite: Mobs/Customization/masking_helpers.rsi
+        state: none
+        visible: false
+      - map: [ "enum.HumanoidVisualLayers.HeadTop" ]
+        sprite: Mobs/Customization/masking_helpers.rsi
+        state: none
+        visible: false
       - map: [ "mask" ]
       - map: [ "head" ]
       - map: [ "pocket1" ]
@@ -138,16 +151,30 @@
   noSpawn: true
   description: A dummy reptilian meant to be used in character setup.
   components:
+  - type: Markings
+    layerPoints:
+      Tail:
+        points: 1
+        required: true
+        defaultMarkings: [LizardTailSmooth] 
+      Snout:
+        points: 1
+        required: true
+        defaultMarkings: [LizardSnoutRound]
+      HeadTop:
+        points: 1
+        required: false
+      HeadSide:
+        points: 1
+        required: false
   - type: Sprite
     netsync: false
     noRot: true
     drawdepth: Mobs
     scale: 1, 1
     layers:
-      - map: [ "enum.HumanoidVisualLayers.TailBehind" ]
-        color: "#34a223"
-        state: tail_smooth_behind
-        sprite: Mobs/Customization/reptilian_parts.rsi
+      - map: [ "enum.HumanoidVisualLayers.Tail" ]
+        visible: false
       - map: [ "enum.HumanoidVisualLayers.Chest" ]
         color: "#34a223"
         sprite: Mobs/Species/Reptilian/parts.rsi
@@ -157,9 +184,7 @@
         sprite: Mobs/Species/Reptilian/parts.rsi
         state: head_m
       - map: [ "enum.HumanoidVisualLayers.Snout" ]
-        color: "#34a223"
-        state: snout_round
-        sprite: Mobs/Customization/reptilian_parts.rsi
+        visible: false
       - map: [ "enum.HumanoidVisualLayers.Eyes" ]
         color: "#008800"
         sprite: Mobs/Customization/eyes.rsi
@@ -217,19 +242,13 @@
       - map: [ "ears" ]
       - map: [ "outerClothing" ]
       - map: [ "eyes" ]
-      - map: [ "enum.HumanoidVisualLayers.TailFront" ]
-        color: "#34a223"
-        state: tail_smooth_front
-        sprite: Mobs/Customization/reptilian_parts.rsi
       - map: [ "belt" ]
       - map: [ "neck" ]
       - map: [ "back" ]
-      - map: [ "enum.HumanoidVisualLayers.Frills" ]
-        state: frills_simple
-        sprite: Mobs/Customization/reptilian_parts.rsi
-      - map: [ "enum.HumanoidVisualLayers.Horns" ]
-        state: horns_simple
-        sprite: Mobs/Customization/reptilian_parts.rsi
+      - map: [ "enum.HumanoidVisualLayers.HeadSide" ]
+        visible: false
+      - map: [ "enum.HumanoidVisualLayers.HeadTop" ]
+        visible: false
       - map: [ "mask" ]
       - map: [ "head" ]
       - map: [ "pocket1" ]

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

@@ -0,0 +1,2 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/tgstation/tgstation/blob/master/icons/mob/mutant_bodyparts.dmi", "states": [{"name":"ears_cat_inner","directions":4},{"name":"ears_cat_outer","directions":4},{"name":"tail_cat","directions":4}]}
+

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

@@ -1 +1 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "female_full", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "female_top", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
+{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "female_full", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "female_top", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "none"}]}

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

@@ -39,6 +39,22 @@
             "name": "tail_ltiger_behind",
             "directions": 4
         },
+	{
+	    "name": "tail_smooth",
+	    "directions": 4
+	},
+	{
+	    "name": "tail_spikes",
+	    "directions": 4
+	},
+	{
+	    "name": "tail_dtiger",
+	    "directions": 4
+	},
+	{
+	    "name": "tail_ltiger",
+	    "directions": 4
+	},
         {
             "name": "snout_round",
             "directions": 4