spooky dress and hairstyle (#27333)

* first draft loooong hair

* *added the old dress item *added old dress to the theatrical performances create

* updated spooky long hair name

* fixed an oopsie made when updating item names

diff --git a/Resources/Locale/en-US/accessories/human-hair.ftl b/Resources/Locale/en-US/accessories/human-hair.ftl
index 3a507ec6cfc3228d3d014068766f361a4d0acad3..f052f232de35119fa37c355b71bb571c43941b7e 100644 (file)
--- a/Resources/Locale/en-US/accessories/human-hair.ftl
+++ b/Resources/Locale/en-US/accessories/human-hair.ftl
@@ -55,6 +55,7 @@ marking-HumanHairCornrows2 = Cornrows 2
 marking-HumanHairCornrowbun = Cornrow Bun
 marking-HumanHairCornrowbraid = Cornrow Braid
 marking-HumanHairCornrowtail = Cornrow Tail
+marking-HumanHairSpookyLong = Spooky Long
 marking-HumanHairCrewcut = Crewcut
 marking-HumanHairCrewcut2 = Crewcut 2
 marking-HumanHairCurls = Curls

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
index 141f98edab2df0cd59c51b24741a9a7e5463d87e..38cd6975eedbfb1310dabaaf90177f80a7ea4371 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
@@ -20,7 +20,7 @@
       - id: Plunger
         amount: 2
       - id: BoxCleanerGrenades
-      
+
 - type: entity
   id: CrateServiceReplacementLights
   parent: CrateGenericSteel
@@ -88,6 +88,7 @@
     - id: ClothingNeckCloakVoid
     - id: RevolverCapGun
     - id: BarberScissors
+    - id: ClothingUniformJumpskirtOldDress
 
 - type: entity
   id: CrateServiceCustomSmokable

diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
index aeebaca31cbffe5e61e8b7fd9286589323ab5e25..998d462898bb30574054bf703618b83cbfaed34a 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -766,3 +766,14 @@
       - state: equipped-INNERCLOTHING-jumpskirt
       - state: equipped-INNERCLOTHING-shirt
         color: "#b30000"
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtOldDress
+  name: old dress
+  description: A worn-looking dress from a very long time ago.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/olddress.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/olddress.rsi

diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
index 449f8aa2cd40311aea288773b504dab177f965af..c2a7ac4ebf71b362a025056b3542677f39dcdcc2 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
@@ -397,6 +397,13 @@
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: cornrowtail
+- type: marking
+  id: HumanHairSpookyLong
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: spookylong
 - type: marking
   id: HumanHairCrewcut
   bodyPart: Hair

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/equipped-INNERCLOTHING.png
new file mode 100644 (file)
index 0000000..a300332
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/equipped-INNERCLOTHING.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/icon.png
new file mode 100644 (file)
index 0000000..28b2de1
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/icon.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..a85d0a1
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..4d6da56
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/meta.json
new file mode 100644 (file)
index 0000000..d4ea50d
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "fujiwaranao",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
index 5cb41c258b865d47d33bd674ad620c0089c4b4cd..a6dc03eda834e691e9e45e1b21f278b33487d166 100644 (file)
--- a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
@@ -231,6 +231,10 @@
         "name": "country",
         "directions": 4
       },
+      {
+        "name": "spookylong",
+        "directions": 4
+      },
       {
         "name": "crewcut",
         "directions": 4

diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/spookylong.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/spookylong.png
new file mode 100644 (file)
index 0000000..4e79da2
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/human_hair.rsi/spookylong.png differ