From 634fd97945543b5d46355ab54974c7f6b8f15bcc Mon Sep 17 00:00:00 2001 From: Null <56081759+NullWanderer@users.noreply.github.com> Date: Sun, 2 Jun 2024 19:23:55 +0200 Subject: [PATCH] Revert "Revert Reverts New E-Sword Sprites #591 (#1264)" This reverts commit ed67ebd5a6574d357b9eacfcd6552b68e4b44d1b. --- .../Objects/Weapons/Melee/e_sword.yml | 2 +- .../Melee/e_sword.rsi/inhand-left-blade.png | Bin 0 -> 7094 bytes .../Weapons/Melee/e_sword.rsi/inhand-left.png | Bin 0 -> 314 bytes .../Melee/e_sword.rsi/inhand-right-blade.png | Bin 0 -> 7218 bytes .../Melee/e_sword.rsi/inhand-right.png | Bin 0 -> 318 bytes .../Weapons/Melee/e_sword.rsi/meta.json | 63 ++++++++++++++++++ 6 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Melee/e_sword.rsi/inhand-left-blade.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Melee/e_sword.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Melee/e_sword.rsi/inhand-right-blade.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Melee/e_sword.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Melee/e_sword.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml index 66079b88448..dcf65d03827 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml @@ -55,7 +55,7 @@ Blunt: 4.5 - type: Item size: Small - sprite: Objects/Weapons/Melee/e_sword.rsi + sprite: DeltaV/Objects/Weapons/Melee/e_sword.rsi # Delta-V - type: UseDelay delay: 1.0 - type: PointLight diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_sword.rsi/inhand-left-blade.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_sword.rsi/inhand-left-blade.png new file mode 100644 index 0000000000000000000000000000000000000000..6bc304a12fd102d0ffdfb6de7edc53452cd3c675 GIT binary patch literal 7094 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_sword.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_sword.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..6e5fe94f81443ff80212f5b89234703fe25ae307 GIT binary patch literal 314 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 AlK=n! literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_sword.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_sword.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..b82aed42c0c7f2d9a56ea40da0195e2543b8ad4f GIT binary patch literal 318 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1FAN zi(^Q|oVT~Eg_;#4Tpv!BobG)3pSZ*6x=9Nc2gwJVR%s}BNJCWo+%cj`n1fAbAok6i>t>3iUE9=$-xxr60VsWh#Fk{DQ6Guw0}2`-b|{Fjt>s a{=;zXX;JL+;$D#789ZJ6T-G@yGywo%pLyy4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_sword.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_sword.rsi/meta.json new file mode 100644 index 00000000000..ec329e4282c --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_sword.rsi/meta.json @@ -0,0 +1,63 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "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 + ] + ] + } + ] +} \ No newline at end of file