]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Add hair pulato (#34117)
author~DreamlyJack~ <148849095+DreamlyJack@users.noreply.github.com>
Tue, 31 Dec 2024 10:29:39 +0000 (15:29 +0500)
committerGitHub <noreply@github.com>
Tue, 31 Dec 2024 10:29:39 +0000 (11:29 +0100)
* add sprite pulato

* update

* add pulato hair

* add pulato hair

* add pulato hair

* update meta "pulato"

Resources/Locale/en-US/accessories/human-hair.ftl
Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
Resources/Textures/Mobs/Customization/human_hair.rsi/pulato.png [new file with mode: 0644]

index 58314f9bb2e3b1cfa16805e9648f70d57a3dd4ff..af80aaef5c7c35905f99a137a134acd5ebb75fb4 100644 (file)
@@ -146,6 +146,7 @@ marking-HumanHairSidetail3 = Ponytail (Side) 3
 marking-HumanHairSidetail4 = Ponytail (Side) 4
 marking-HumanHairSpikyponytail = Ponytail (Spiky)
 marking-HumanHairPoofy = Poofy
+marking-HumanHairPulato = Pulato
 marking-HumanHairQuiff = Quiff
 marking-HumanHairRonin = Ronin
 marking-HumanHairShaped = Shaped
index 578c6837c0ee9b6de0a3755af2d36cdc4ff7b83a..af0674eb76688273aaf235255429a165ab634292 100644 (file)
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: bedheadv3
+- type: marking
+  id: HumanHairPulato
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: pulato
 - type: marking
   id: HumanHairLongBedhead
   bodyPart: Hair
index ff556dbc78061ab3695399bf242f0276452121c7..1540862d2ac1ff0c239908c5a3bc41e35eec99c0 100644 (file)
@@ -4,7 +4,7 @@
       "x": 32,
       "y": 32
     },
-    "copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi ,resprited by Alekshhh, a modified by potato1234x, uneven and tailed is drawn by Ubaser, doublebun_long by Emisse, longbundled and bob5 sprited by github:DreamlyJack(624946166152298517)",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi ,resprited by Alekshhh, a modified by potato1234x, uneven and tailed is drawn by Ubaser, doublebun_long by Emisse, longbundled and bob5 sprited by github:DreamlyJack(624946166152298517), pulato.png made by DreamlyJack for SS14",
     "license": "CC-BY-SA-3.0",
     "states": [
       {
         "name": "protagonist",
         "directions": 4
       },
+      {
+        "name": "pulato",
+        "directions": 4
+      },
       {
         "name": "quiff",
         "directions": 4
diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/pulato.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/pulato.png
new file mode 100644 (file)
index 0000000..7fd3055
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/human_hair.rsi/pulato.png differ