diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/captain_sabre.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/captain_sabre.yml new file mode 100644 index 0000000000..590dfafd2d --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/captain_sabre.yml @@ -0,0 +1,15 @@ +- type: entity + name: captain's sabre + parent: BaseItem + id: CaptainSabre + description: A ceremonial weapon given to the captain of the station. + components: + - type: Sprite + sprite: Objects/Weapons/Melee/captain_sabre.rsi + state: icon + - type: MeleeWeapon + damage: 20 + - type: Item + size: 15 + sprite: Objects/Weapons/Melee/captain_sabre.rsi + prefix: inhand diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/katana.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/katana.yml new file mode 100644 index 0000000000..441281db21 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/katana.yml @@ -0,0 +1,15 @@ +- type: entity + name: katana + parent: BaseItem + id: Katana + description: Ancient craftwork made with not so ancient plasteel. + components: + - type: Sprite + sprite: Objects/Weapons/Melee/katana.rsi + state: icon + - type: MeleeWeapon + damage: 30 + - type: Item + size: 15 + sprite: Objects/Weapons/Melee/katana.rsi + prefix: inhand diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/olivaw_civil.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/olivaw_civil.rsi/inhand-left.png index 7bbc73d7d7..75134ce7dc 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/olivaw_civil.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/olivaw_civil.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/olivaw_civil.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/olivaw_civil.rsi/inhand-right.png index 2d20b938a4..43a099e21a 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/olivaw_civil.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/olivaw_civil.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/inhand-left.png index 7bbc73d7d7..7aae1442fa 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/inhand-right.png index 2d20b938a4..cbd5194862 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/icon.png new file mode 100644 index 0000000000..0874186095 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/inhand-left.png new file mode 100644 index 0000000000..474a6def70 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/inhand-right.png new file mode 100644 index 0000000000..3f5faacb2b Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/meta.json new file mode 100644 index 0000000000..27606fd79e --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/pull/31615/commits/8795484578b33a9919b7801667287c0f28afe642", + "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 3818a145f3..efecdbb404 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/fireaxe.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-left.png index 803a0e1bdb..ce78cfc276 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-left.png 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 index 6f4c0b4c51..910dda1a14 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/inhand-right.png 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 index 68964bceb9..73f187c296 100644 --- a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-3.0", - "copyright": "Taken from goonstation at commit https://github.com/goonstation/goonstation/pull/2816/commits/b99c5dff45a6527bbf698bc00f7d24b8ca75a806", + "copyright": "Taken/modified from goonstation at commit https://github.com/goonstation/goonstation/pull/2816/commits/b99c5dff45a6527bbf698bc00f7d24b8ca75a806", "size": { "x": 32, "y": 32 @@ -9,11 +9,11 @@ "states": [ { "name": "inhand-left", - "directions": 4, + "directions": 4 }, { "name": "inhand-right", - "directions": 4, + "directions": 4 }, { "name": "icon" diff --git a/Resources/Textures/Objects/Weapons/Melee/katana.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/katana.rsi/icon.png new file mode 100644 index 0000000000..4a1b7d82cd Binary files /dev/null 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 new file mode 100644 index 0000000000..bcaee4ac97 Binary files /dev/null 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 new file mode 100644 index 0000000000..8fd468ac64 Binary files /dev/null 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 new file mode 100644 index 0000000000..0b41dd4a49 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/katana.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/20520/commits/47d235721d658027a9effd37177cc8104844e0bf", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}