]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Resprites energy sword and double energy sword (#22797)
authorRiceMar1244 <138547931+RiceMar1244@users.noreply.github.com>
Thu, 21 Dec 2023 06:32:11 +0000 (01:32 -0500)
committerGitHub <noreply@github.com>
Thu, 21 Dec 2023 06:32:11 +0000 (23:32 -0700)
commit5ee01ce90020628edfea298182cb1aabb91713cf
tree34b90e5983415ef27e21d61475d4205d961150b0
parent4c1e71e84a035685e3b9b77c12620c45ef3925cd
Resprites energy sword and double energy sword (#22797)

* Removes old inhand visuals from e_sword.rsi and its meta.json

* Adds new visuals with a longer blade for the e sword

* Makes e sword use its new sprites and modifies other energy weapons prototypes to keep using their own inhands

* Makes the toy sword use the old less scary e sword sprites (and gives it BaseItem parent because I thought I broke something when i couldnt pick it up)

* Removes old desword sprites and modifies meta.json

* Temporarily removes esword blade sprites

* Adds back esword sprites after modifying them to flash instead of shimmer

* Adds new desword inhand sprites and modifies meta.json and entity prototype to use them

* Moves desword sprites back to its own folder from inhands_64x after a supposed prefix conflict

* Removes blade inhands

* Adds back blade inhands

* Moves all inhand sprites to their own inhand folders related to the items. Removes inhands_64x folder
32 files changed:
Resources/Prototypes/Entities/Objects/Fun/toys.yml
Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
Resources/Textures/Objects/Fun/toy_sword.rsi/e_sword.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/toy_sword.rsi/e_sword_blade.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/toy_sword.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/toy_sword.rsi/inhand-left-blade.png [moved from Resources/Textures/Objects/Weapons/Melee/e_sword.rsi/inhand-left-blade.png with 100% similarity]
Resources/Textures/Objects/Fun/toy_sword.rsi/inhand-left.png [moved from Resources/Textures/Objects/Weapons/Melee/e_sword.rsi/inhand-left.png with 100% similarity]
Resources/Textures/Objects/Fun/toy_sword.rsi/inhand-right-blade.png [moved from Resources/Textures/Objects/Weapons/Melee/e_sword.rsi/inhand-right-blade.png with 100% similarity]
Resources/Textures/Objects/Fun/toy_sword.rsi/inhand-right.png [moved from Resources/Textures/Objects/Weapons/Melee/e_sword.rsi/inhand-right.png with 100% similarity]
Resources/Textures/Objects/Fun/toy_sword.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/inhand-left-blade.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/inhand-right-blade.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/e_sword.rsi/meta.json
Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-left-blade.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-right-blade.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/wielded-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/wielded-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/e_sword_double.png
Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/e_sword_double_blade.png
Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/inhand-left-blade.png [deleted file]
Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/inhand-left.png [deleted file]
Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/inhand-right-blade.png [deleted file]
Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/inhand-right.png [deleted file]
Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/meta.json
Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/wielded-inhand-left.png [deleted file]
Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/wielded-inhand-right.png [deleted file]