Merge pull request #361 from Fansana/wedding-essentials

Wedding Essentials
Fansana · Nov 23, 2024 · 80e0403 · 80e0403
2 parents 972c7d8 + a28b285
commit 80e0403
Show file tree

Hide file tree

Showing 11 changed files with 71 additions and 0 deletions.
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
@@ -99,6 +99,8 @@
     ClothingUniformStripedThongWhite: 1
     ClothingUniformMusicKingBlack: 2
     ClothingUniformMusicKing: 2
+    ClothingUniformWeddingDress: 2
+    ClothingHandsGoldRing: 2
   emaggedInventory:
     ClothingShoesBling: 1
     ClothingShoesBootsCowboyFancy: 1

diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Hands/miscgloves.yml b/Resources/Prototypes/Floof/Entities/Clothing/Hands/miscgloves.yml
@@ -133,3 +133,14 @@
     fiberColor: fibers-blue
   - type: FingerprintMask
 
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsGoldRing
+  name: gold ring
+  description: a band for a special bond
+  components:
+  - type: Sprite
+    sprite: Floof/Clothing/Under/Gloves/goldring.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/Under/Gloves/goldring.rsi
+
diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/weddingdress.yml b/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/weddingdress.yml
@@ -0,0 +1,14 @@
+- type: entity
+  parent: ClothingUniformBaseSwitch
+  id: ClothingUniformWeddingDress
+  name: wedding dress
+  description: a beautiful wedding dress fit for a princess
+  components:
+  - type: Sprite
+    sprite: Floof/Clothing/Uniforms/weddingdress.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/Uniforms/weddingdress.rsi
+    unequipDelay: 0
+  - type: Tag #DeltaV, needed for species with nonhuman legs/can only wear skirts
+    tags:
+    - Skirt
diff --git a/Resources/Textures/Floof/Clothing/Under/Gloves/goldring.rsi/equipped-HAND.png b/Resources/Textures/Floof/Clothing/Under/Gloves/goldring.rsi/equipped-HAND.png
diff --git a/Resources/Textures/Floof/Clothing/Under/Gloves/goldring.rsi/icon.png b/Resources/Textures/Floof/Clothing/Under/Gloves/goldring.rsi/icon.png
diff --git a/Resources/Textures/Floof/Clothing/Under/Gloves/goldring.rsi/meta.json b/Resources/Textures/Floof/Clothing/Under/Gloves/goldring.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by Dzordz - Discord 'Dzordz#8811'",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-HAND",
+            "directions": 4
+        }
+    ]
+}
diff --git a/...es/Textures/Floof/Clothing/Uniforms/weddingdress.rsi/equipped-INNERCLOTHING.png b/...es/Textures/Floof/Clothing/Uniforms/weddingdress.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Floof/Clothing/Uniforms/weddingdress.rsi/icon.png b/Resources/Textures/Floof/Clothing/Uniforms/weddingdress.rsi/icon.png
diff --git a/Resources/Textures/Floof/Clothing/Uniforms/weddingdress.rsi/inhand-left.png b/Resources/Textures/Floof/Clothing/Uniforms/weddingdress.rsi/inhand-left.png
diff --git a/Resources/Textures/Floof/Clothing/Uniforms/weddingdress.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/Uniforms/weddingdress.rsi/inhand-right.png
diff --git a/Resources/Textures/Floof/Clothing/Uniforms/weddingdress.rsi/meta.json b/Resources/Textures/Floof/Clothing/Uniforms/weddingdress.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by Dzordz - Discord 'Dzordz#8811'",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-INNERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}