Fix sprite references

I think
DeltaV-Station · Oct 8, 2023 · 1a5a9a7 · 1a5a9a7
1 parent 672334c
commit 1a5a9a7
Show file tree

Hide file tree

Showing 25 changed files with 107 additions and 10 deletions.
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -151,7 +151,7 @@
             Blunt: -6
     litDisarmMalus: 0.6
   - type: Sprite
-    sprite: Objects/Weapons/Melee/e_cutlass.rsi
+    sprite: DeltaV/Objects/Weapons/Melee/e_cutlass.rsi
     layers:
       - state: e_cutlass
       - state: e_cutlass_blade
@@ -168,7 +168,7 @@
         Blunt: 6
   - type: Item
     size: 5
-    sprite: Objects/Weapons/Melee/e_cutlass.rsi
+    sprite: DeltaV/Objects/Weapons/Melee/e_cutlass.rsi
 
 - type: entity
   name: Double Bladed Energy Sword

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
@@ -38,7 +38,7 @@
     tags:
     - Katana
   - type: Sprite
-    sprite: Objects/Weapons/Melee/katana.rsi
+    sprite: DeltaV/Objects/Weapons/Melee/katana.rsi
     state: icon
   - type: MeleeWeapon
     damage:
@@ -48,7 +48,7 @@
         path: /Audio/Weapons/bladeslice.ogg
   - type: Item
     size: 15
-    sprite: Objects/Weapons/Melee/katana.rsi
+    sprite: DeltaV/Objects/Weapons/Melee/katana.rsi
   - type: DisarmMalus
 
 - type: entity

diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/e_cutlass.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/e_cutlass.png
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/e_cutlass_blade.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/e_cutlass_blade.png
diff --git a/...ects/Weapons/Melee/e_cutlass.rsi/icon.png → ...ects/Weapons/Melee/e_cutlass.rsi/icon.png b/...ects/Weapons/Melee/e_cutlass.rsi/icon.png → ...ects/Weapons/Melee/e_cutlass.rsi/icon.png
diff --git a/...urces/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/inhand-left-blade.png b/...urces/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/inhand-left-blade.png
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/inhand-left.png
diff --git a/...rces/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/inhand-right-blade.png b/...rces/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/inhand-right-blade.png
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/inhand-right.png
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/meta.json
@@ -0,0 +1,78 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Original work by TJohnson.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "e_cutlass"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "e_cutlass_blade",
+      "delays": [
+        [
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-left-blade",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1
+        ],
+		[
+          0.1,
+          0.1
+        ],
+		[
+          0.1,
+          0.1
+        ],
+		[
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-right-blade",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1
+        ],
+		[
+          0.1,
+          0.1
+        ],
+		[
+          0.1,
+          0.1
+        ],
+		[
+          0.1,
+          0.1
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/icon.png
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/inhand-left.png
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/inhand-right.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
@@ -0,0 +1,22 @@
+{
+  "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.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/e_cutlass.png b/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/e_cutlass.png
diff --git a/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/e_cutlass_blade.png b/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/e_cutlass_blade.png
diff --git a/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/inhand-left-blade.png b/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/inhand-left-blade.png
diff --git a/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/inhand-left.png
diff --git a/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/inhand-right-blade.png b/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/inhand-right-blade.png
diff --git a/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/inhand-right.png
diff --git a/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/meta.json
@@ -1,15 +1,12 @@
 {
   "version": 1,
-  "license": "CC0-1.0",
-  "copyright": "Original work by TJohnson.",
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by brainfood1183 (Github) for ss14",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
-    {
-      "name": "icon"
-    },
     {
       "name": "e_cutlass"
     },

diff --git a/Resources/Textures/Objects/Weapons/Melee/katana.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/katana.rsi/icon.png
diff --git a/Resources/Textures/Objects/Weapons/Melee/katana.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/katana.rsi/inhand-left.png
diff --git a/Resources/Textures/Objects/Weapons/Melee/katana.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/katana.rsi/inhand-right.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. Further modified by TJohnson.",
+  "copyright": "Taken and modified by Taral from tgstation at https://github.com/tgstation/tgstation/pull/20520/commits/47d235721d658027a9effd37177cc8104844e0bf",
   "size": {
     "x": 32,
     "y": 32