diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml index 659146faa02..6b226adeceb 100644 --- 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 index dbbe0febfdf..eb66e7e6ad5 100644 --- 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 new file mode 100644 index 00000000000..fde65c44807 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/e_cutlass.png differ 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 new file mode 100644 index 00000000000..4be18c6a3c6 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/e_cutlass_blade.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/icon.png rename to Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/inhand-left-blade.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/inhand-left-blade.png new file mode 100644 index 00000000000..b6bce6190e0 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/inhand-left-blade.png differ 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 new file mode 100644 index 00000000000..d9ca2d301ee Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/inhand-right-blade.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/inhand-right-blade.png new file mode 100644 index 00000000000..b2700e932ac Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/inhand-right-blade.png differ 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 new file mode 100644 index 00000000000..bd7d8749a1d Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/inhand-right.png differ 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 new file mode 100644 index 00000000000..d6321812ff5 --- /dev/null +++ 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 new file mode 100644 index 00000000000..b572059f735 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/icon.png differ 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 new file mode 100644 index 00000000000..5125d47e617 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/inhand-left.png differ 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 new file mode 100644 index 00000000000..b2ab7b418aa Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/meta.json new file mode 100644 index 00000000000..2934026c5eb --- /dev/null +++ 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 index fde65c44807..a80f0ad0875 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/e_cutlass.png and b/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/e_cutlass.png differ 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 index 4be18c6a3c6..35de91f6821 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/e_cutlass_blade.png and b/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/e_cutlass_blade.png differ 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 index b6bce6190e0..240fa8679aa 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/inhand-left-blade.png and b/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/inhand-left-blade.png differ 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 index d9ca2d301ee..9193c95765e 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/inhand-left.png differ 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 index b2700e932ac..8163f8a8bae 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/inhand-right-blade.png and b/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/inhand-right-blade.png differ 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 index bd7d8749a1d..e9e8892e5b0 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/meta.json index d6321812ff5..62bac1598d0 100644 --- 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 index b572059f735..4a1b7d82cd2 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/katana.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/katana.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/katana.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/katana.rsi/inhand-left.png index 5125d47e617..bcaee4ac97f 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/katana.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/katana.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/katana.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/katana.rsi/inhand-right.png index b2ab7b418aa..8fd468ac648 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/katana.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/katana.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/katana.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/katana.rsi/meta.json index 2934026c5eb..b2c66cff5b2 100644 --- 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