diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml index ed628e9801..5cb81d3571 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml @@ -45,3 +45,19 @@ size: 15 sprite: Objects/Weapons/Melee/machete.rsi prefix: inhand + +- type: entity + name: claymore + parent: BaseItem + id: Claymore + description: An ancient war blade. + components: + - type: Sprite + sprite: Objects/Weapons/Melee/claymore.rsi + state: icon + - type: MeleeWeapon + damage: 25 + - type: Item + size: 15 + sprite: Objects/Weapons/Melee/claymore.rsi + prefix: inhand diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/base.png index fc8b984624..43d8242338 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/icon.png index e47463f52b..ff7a8709f8 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/icon.png new file mode 100644 index 0000000000..4e6d444716 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/inhand-left.png new file mode 100644 index 0000000000..c559a40741 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/inhand-right.png new file mode 100644 index 0000000000..183178c671 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/meta.json new file mode 100644 index 0000000000..53bc38346c --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/claymore.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation and modified by Taral at https://github.com/tgstation/tgstation/pull/18086/commits/aea72a79fd34990dc7affd5cdf8dc13bd5b6431a", + "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/combat_knife.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/icon.png index efecdbb404..956f7f7659 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/machete.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/icon.png index 25ad0a8bf7..64612928df 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/machete.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/icon.png differ