Commented changes to denote DeltaV

DeltaV-Station · Sep 24, 2024 · 36fb021 · 36fb021
1 parent 2cf5174
commit 36fb021
Show file tree

Hide file tree

Showing 13 changed files with 61 additions and 33 deletions.
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml
@@ -41,23 +41,23 @@
     state: scar_top_surgery_long
 
 - type: marking
-  id: ScarChestMale
+  id: ScarChest
   bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Human, Dwarf, Felinid, Oni] #Einstein Engines - Felinid, Oni
-  sexRestriction: [Male]
+  sexRestriction: [Male] #DeltaV: Splitting the scars and tattoos
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi
-    state: scar_chest_male
+    state: scar_chest
 
 - type: marking
-  id: ScarChestFemale
+  id: ScarChestFemale #DeltaV: Splitting the scars and tattoos
   bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Human, Dwarf, Felinid, Oni] #Einstein Engines - Felinid, Oni
-  sexRestriction: [Female]
+  sexRestriction: [Female] #DeltaV: Splitting the scars and tattoos
   followSkinColor: true
   sprites:
-  - sprite: Mobs/Customization/scars.rsi
+  - sprite: DeltaV/Mobs/Customization/scars.rsi
     state: scar_chest_female
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml
@@ -1,61 +1,61 @@
 - type: marking
-  id: TattooHiveChestMale
+  id: TattooHiveChest
   bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni
-  sexRestriction: [Male]
+  sexRestriction: [Male] #DeltaV: Splitting the scars and tattoos
   coloring:
     default:
       type:
         !type:TattooColoring
       fallbackColor: "#666666"
   sprites:
   - sprite: Mobs/Customization/tattoos.rsi
-    state: tattoo_hive_chest_male
+    state: tattoo_hive_chest
 
 - type: marking
-  id: TattooHiveChestFemale
+  id: TattooHiveChestFemale #DeltaV: Splitting the scars and tattoos
   bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni
-  sexRestriction: [Female]
+  sexRestriction: [Female] #DeltaV: Splitting the scars and tattoos
   coloring:
     default:
       type:
         !type:TattooColoring
       fallbackColor: "#666666"
   sprites:
-  - sprite: Mobs/Customization/tattoos.rsi
+  - sprite: DeltaV/Mobs/Customization/tattoos.rsi
     state: tattoo_hive_chest_female
 
 - type: marking
-  id: TattooNightlingChestMale
+  id: TattooNightlingChestMale #DeltaV: Splitting the scars and tattoos
   bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni
-  sexRestriction: [Male]
+  sexRestriction: [Male] #DeltaV: Splitting the scars and tattoos
   coloring:
     default:
       type:
         !type:TattooColoring
       fallbackColor: "#666666"
   sprites:
-  - sprite: Mobs/Customization/tattoos.rsi
+  - sprite: DeltaV/Mobs/Customization/tattoos.rsi
     state: tattoo_nightling_male
 
 - type: marking
-  id: TattooNightlingChestFemale
+  id: TattooNightlingChestFemale #DeltaV: Splitting the scars and tattoos
   bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni
-  sexRestriction: [Female]
+  sexRestriction: [Female] #DeltaV: Splitting the scars and tattoos
   coloring:
     default:
       type:
         !type:TattooColoring
       fallbackColor: "#666666"
   sprites:
-  - sprite: Mobs/Customization/tattoos.rsi
+  - sprite: DeltaV/Mobs/Customization/tattoos.rsi
     state: tattoo_nightling_female
 
 - type: marking

diff --git a/Resources/Textures/DeltaV/Mobs/Customization/scars.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/scars.rsi/meta.json
@@ -0,0 +1,16 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Drawn by Ubaser, modified by Aikakakah",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+      {
+          "name": "scar_chest_female",
+          "directions": 4
+      }
+    ]
+  }
+
diff --git a/...omization/scars.rsi/scar_chest_female.png → ...omization/scars.rsi/scar_chest_female.png b/...omization/scars.rsi/scar_chest_female.png → ...omization/scars.rsi/scar_chest_female.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/meta.json
@@ -0,0 +1,24 @@
+{
+    "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, modified by Aikakakah",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+      {
+        "name": "tattoo_hive_chest_female",
+        "directions": 4
+      },
+      {
+        "name": "tattoo_nightling_male",
+        "directions": 4
+      },
+      {
+        "name": "tattoo_nightling_female",
+        "directions": 4
+      }
+    ]
+  }
+
diff --git a/.../tattoos.rsi/tattoo_hive_chest_female.png → .../tattoos.rsi/tattoo_hive_chest_female.png b/.../tattoos.rsi/tattoo_hive_chest_female.png → .../tattoos.rsi/tattoo_hive_chest_female.png
diff --git a/...n/tattoos.rsi/tattoo_nightling_female.png → ...n/tattoos.rsi/tattoo_nightling_female.png b/...n/tattoos.rsi/tattoo_nightling_female.png → ...n/tattoos.rsi/tattoo_nightling_female.png
diff --git a/...ion/tattoos.rsi/tattoo_nightling_male.png → ...ion/tattoos.rsi/tattoo_nightling_male.png b/...ion/tattoos.rsi/tattoo_nightling_male.png → ...ion/tattoos.rsi/tattoo_nightling_male.png
diff --git a/Resources/Textures/Mobs/Customization/scars.rsi/meta.json b/Resources/Textures/Mobs/Customization/scars.rsi/meta.json
@@ -24,11 +24,7 @@
         "directions": 4
     },
     {
-        "name": "scar_chest_male",
-        "directions": 4
-    },
-    {
-        "name": "scar_chest_female",
+        "name": "scar_chest",
         "directions": 4
     }
   ]

diff --git a/...stomization/scars.rsi/scar_chest_male.png → ...bs/Customization/scars.rsi/scar_chest.png b/...stomization/scars.rsi/scar_chest_male.png → ...bs/Customization/scars.rsi/scar_chest.png
diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/meta.json b/Resources/Textures/Mobs/Customization/tattoos.rsi/meta.json
@@ -8,19 +8,11 @@
   },
   "states": [
     {
-      "name": "tattoo_hive_chest_male",
+      "name": "tattoo_hive_chest",
       "directions": 4
     },
     {
-      "name": "tattoo_hive_chest_female",
-      "directions": 4
-    },
-    {
-      "name": "tattoo_nightling_male",
-      "directions": 4
-    },
-    {
-      "name": "tattoo_nightling_female",
+      "name": "tattoo_nightling",
       "directions": 4
     },
     {

diff --git a/...on/tattoos.rsi/tattoo_hive_chest_male.png → ...ization/tattoos.rsi/tattoo_hive_chest.png b/...on/tattoos.rsi/tattoo_hive_chest_male.png → ...ization/tattoos.rsi/tattoo_hive_chest.png
diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_nightling.png b/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_nightling.png