Added Three-Sword Style

DeltaV-Station · Dec 21, 2023 · 872ad20 · 872ad20
1 parent 6ecfa78
commit 872ad20
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 3 deletions.
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
@@ -51,7 +51,11 @@
   - type: Item
     size: 15
     sprite: DeltaV/Objects/Weapons/Melee/katana.rsi #DeltaV
-  - type: DisarmMalus
+  - type: Clothing #DeltaV
+    sprite: DeltaV/Objects/Weapons/Melee/katana.rsi #DeltaV
+    slots:
+    - mask
+  - type: DisarmMalus #DeltaV
 
 - type: entity
   name: energy katana

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/dulled.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/dulled.yml
@@ -19,6 +19,11 @@
   - type: Item
     size: 15
     sprite: Objects/Weapons/Melee/katana.rsi
+  - type: Clothing #DeltaV
+    sprite: Objects/Weapons/Melee/katana.rsi
+    slots:
+    - mask
+  - type: DisarmMalus #DeltaV
 
 - type: entity
   name: claymore

diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/equipped-MASK.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/equipped-MASK.png
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken and modified by Taral from tgstation at https://github.com/tgstation/tgstation/pull/20520/commits/47d235721d658027a9effd37177cc8104844e0bf. Further modified by TJohnson.",
+  "copyright": "Taken and modified by Taral from tgstation at https://github.com/tgstation/tgstation/pull/20520/commits/47d235721d658027a9effd37177cc8104844e0bf. Further modified by TJohnson. Mask-equip sprite made by ps3moira",
   "size": {
     "x": 32,
     "y": 32
@@ -17,6 +17,10 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-MASK",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Melee/katana.rsi/equipped-MASK.png b/Resources/Textures/Objects/Weapons/Melee/katana.rsi/equipped-MASK.png
diff --git a/Resources/Textures/Objects/Weapons/Melee/katana.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/katana.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken and modified by Taral from tgstation at https://github.com/tgstation/tgstation/pull/20520/commits/47d235721d658027a9effd37177cc8104844e0bf",
+  "copyright": "Taken and modified by Taral from tgstation at https://github.com/tgstation/tgstation/pull/20520/commits/47d235721d658027a9effd37177cc8104844e0bf. Mask-equip sprite made by ps3moira",
   "size": {
     "x": 32,
     "y": 32
@@ -17,6 +17,10 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-MASK",
+      "directions": 4
     }
   ]
 }