diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml new file mode 100644 index 0000000000..d77663a6ad --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml @@ -0,0 +1,15 @@ +- type: entity + name: fireaxe + parent: BaseItem + id: FireAxe + description: A large, robust axe. Can pry open doors and skulls alike. + components: + - type: Sprite + sprite: Objects/Weapons/Melee/fireaxe.rsi + state: icon + - type: MeleeWeapon + damage: 30 + - type: Item + size: 24 + sprite: Objects/Weapons/Melee/fireaxe.rsi + prefix: inhand diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml index a90199dd7a..bee6ecc1c7 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml @@ -48,3 +48,20 @@ size: 10 sprite: Objects/Weapons/Melee/cleaver.rsi prefix: inhand + +- type: entity + name: combat knife + parent: BaseKnife + id: CombatKnife + description: A deadly knife intended for melee confrontations. + components: + - type: Sprite + sprite: Objects/Weapons/Melee/combat_knife.rsi + size: 2 + state: icon + - type: MeleeWeapon + damage: 20 + - type: Item + size: 10 + sprite: Objects/Weapons/Melee/combat_knife.rsi + prefix: inhand diff --git a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/icon.png new file mode 100644 index 0000000000..3818a145f3 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png new file mode 100644 index 0000000000..a7ea753940 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png new file mode 100644 index 0000000000..368c73da32 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json new file mode 100644 index 0000000000..685357b828 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from tgstation at commit https://github.com/tgstation/tgstation/pull/30680/commits/a494d500b42bc8c7275c57219e08e65b825e94f6", + "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/fireaxe.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/icon.png new file mode 100644 index 0000000000..53c6de1803 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-left.png new file mode 100644 index 0000000000..803a0e1bdb Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-right.png new file mode 100644 index 0000000000..6f4c0b4c51 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/meta.json new file mode 100644 index 0000000000..68964bceb9 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Taken from goonstation at commit https://github.com/goonstation/goonstation/pull/2816/commits/b99c5dff45a6527bbf698bc00f7d24b8ca75a806", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4, + }, + { + "name": "inhand-right", + "directions": 4, + }, + { + "name": "icon" + } + ] +}