Merge pull request #35 from Merrokitsune/Marisa-hair-modifications-

Modified marisa hair sprite.
Merrokitsune · Jan 20, 2025 · 186828e · 186828e
2 parents 6190348 + 935789c
commit 186828e
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 20 deletions.
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
@@ -1349,17 +1349,3 @@
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: tailed
-- type: marking
-  id: HumanHairFluffyHair
-  bodyPart: Hair
-  markingCategory: Hair
-  sprites:
-    - sprite: Ronstation/Mobs/Customization/human_hair.rsi
-      state: fluffy
-- type: marking
-  id: HumanHairMarisaHair
-  bodyPart: Hair
-  markingCategory: Hair
-  sprites:
-    - sprite: Ronstation/Mobs/Customization/human_hair.rsi
-      state: marisa
diff --git a/Resources/Prototypes/_Ronstation/Entities/Mobs/Customization/human_hair.yml b/Resources/Prototypes/_Ronstation/Entities/Mobs/Customization/human_hair.yml
@@ -0,0 +1,21 @@
+- type: marking
+  id: HumanHairFluffy
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: Ronstation/Mobs/Customization/human_hair.rsi
+      state: fluffy
+- type: marking
+  id: HumanHairMarisa
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: _Ronstation/Mobs/Customization/human_hair.rsi
+      state: marisa
+- type: marking
+  id: HumanHairClassicMarisa
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: _Ronstation/Mobs/Customization/human_hair.rsi
+      state: classicmarisa
diff --git a/Resources/Textures/Ronstation/Mobs/Customization/human_hair.rsi/meta.json b/Resources/Textures/Ronstation/Mobs/Customization/human_hair.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "marisa taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/pull/28877/commits/e2aeb654b7fc6871a4c4ef5f03485d870e940423, fluffy made by welladooom for the Ronstation fork and licensed under CC0-1.0.",
+    "license": "CC0-1.0",
+    "copyright": "fluffy made by welladooom for the Ronstation fork.",
     "size": {
         "x": 32,
         "y": 32
@@ -10,10 +10,6 @@
         {
             "name": "fluffy",
             "directions": 4
-        },
-        {
-            "name": "marisa",
-            "directions": 4
         }
     ]
 }
diff --git a/...s/Customization/human_hair.rsi/marisa.png → ...mization/human_hair.rsi/classicmarisa.png b/...s/Customization/human_hair.rsi/marisa.png → ...mization/human_hair.rsi/classicmarisa.png
diff --git a/Resources/Textures/_Ronstation/Mobs/Customization/human_hair.rsi/marisa.png b/Resources/Textures/_Ronstation/Mobs/Customization/human_hair.rsi/marisa.png
diff --git a/Resources/Textures/_Ronstation/Mobs/Customization/human_hair.rsi/meta.json b/Resources/Textures/_Ronstation/Mobs/Customization/human_hair.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "classicmarisa taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/pull/28877/commits/e2aeb654b7fc6871a4c4ef5f03485d870e940423, and made derivative by Merrokitsune in modified form as marisa.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "classicmarisa",
+            "directions": 4
+        },
+        {
+            "name": "marisa",
+            "directions": 4
+        }
+    ]
+}