diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml index d9afefcf83..3e6b96aa1d 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml @@ -44,6 +44,8 @@ - state: beakerlarge1 map: ["enum.SolutionContainerLayers.Fill"] visible: false + - type: Item + sprite: Objects/Specific/Chemistry/beaker_large.rsi - type: SolutionContainer maxVol: 100 - type: Appearance diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml new file mode 100644 index 0000000000..10e1e05e5e --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml @@ -0,0 +1,15 @@ +- type: entity + name: baseball bat + parent: BaseItem + id: BaseBallBat + description: A robust baseball bat. + components: + - type: Sprite + sprite: Objects/Weapons/Melee/baseball_bat.rsi + state: icon + - type: MeleeWeapon + damage: 20 + - type: Item + size: 24 + sprite: Objects/Weapons/Melee/baseball_bat.rsi + prefix: inhand diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/captain_sabre.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/captain_sabre.yml deleted file mode 100644 index 590dfafd2d..0000000000 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/captain_sabre.yml +++ /dev/null @@ -1,15 +0,0 @@ -- 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/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml index d77663a6ad..04f610d3b1 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml @@ -8,7 +8,7 @@ sprite: Objects/Weapons/Melee/fireaxe.rsi state: icon - type: MeleeWeapon - damage: 30 + damage: 25 - type: Item size: 24 sprite: Objects/Weapons/Melee/fireaxe.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/katana.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/katana.yml deleted file mode 100644 index 441281db21..0000000000 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/katana.yml +++ /dev/null @@ -1,15 +0,0 @@ -- 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/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml index bee6ecc1c7..f26e4bd96d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml @@ -43,7 +43,7 @@ state: butch - type: MeleeWeapon - damage: 20 + damage: 15 - type: Item size: 10 sprite: Objects/Weapons/Melee/cleaver.rsi @@ -60,7 +60,7 @@ size: 2 state: icon - type: MeleeWeapon - damage: 20 + damage: 15 - type: Item size: 10 sprite: Objects/Weapons/Melee/combat_knife.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml new file mode 100644 index 0000000000..ed628e9801 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml @@ -0,0 +1,47 @@ +- type: entity + name: captain's sabre + parent: BaseItem + id: CaptainSabre + description: A ceremonial weapon belonging to the captain of the station. + components: + - type: Sprite + sprite: Objects/Weapons/Melee/captain_sabre.rsi + state: icon + - type: MeleeWeapon + damage: 15 + - type: Item + size: 15 + sprite: Objects/Weapons/Melee/captain_sabre.rsi + prefix: inhand + +- 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: 25 + - type: Item + size: 15 + sprite: Objects/Weapons/Melee/katana.rsi + prefix: inhand + +- type: entity + name: machete + parent: BaseItem + id: Machete + description: A large, vicious looking blade. + components: + - type: Sprite + sprite: Objects/Weapons/Melee/machete.rsi + state: icon + - type: MeleeWeapon + damage: 20 + - type: Item + size: 15 + sprite: Objects/Weapons/Melee/machete.rsi + prefix: inhand diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-left.png index b79f6f97d3..7f577f668a 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-left.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-right.png index 8acf56da76..da6f5180f8 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-right.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-left.png new file mode 100644 index 0000000000..6ec4b0fc67 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-right.png new file mode 100644 index 0000000000..9c73c96809 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/meta.json index e56fe43226..6f95bc544b 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/meta.json @@ -13,6 +13,14 @@ { "name": "lid_beakerlarge" }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, { "name": "beakerlarge1" }, diff --git a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/inhand-left.png new file mode 100644 index 0000000000..566eb81f2a Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/inhand-right.png new file mode 100644 index 0000000000..5577d69e01 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/meta.json index 305333f89c..3516f6c20a 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/meta.json @@ -1 +1,169 @@ -{"version":1,"size":{"x":32,"y":32},"license":"CC-BY-SA-3.0","copyright":"Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi","states":[{"name":"bottle","directions":1,"delays":[[1]]},{"name":"bottle-1","directions":1,"delays":[[1]]},{"name":"bottle-2","directions":1,"delays":[[1]]},{"name":"bottle-3","directions":1,"delays":[[1]]},{"name":"bottle-4","directions":1,"delays":[[1]]},{"name":"bottle1","directions":1,"delays":[[1]]},{"name":"bottle10","directions":1,"delays":[[1]]},{"name":"bottle11","directions":1,"delays":[[1]]},{"name":"bottle12","directions":1,"delays":[[1]]},{"name":"bottle13","directions":1,"delays":[[1]]},{"name":"bottle14","directions":1,"delays":[[1]]},{"name":"bottle15","directions":1,"delays":[[1]]},{"name":"bottle16","directions":1,"delays":[[1]]},{"name":"bottle17","directions":1,"delays":[[1]]},{"name":"bottle18","directions":1,"delays":[[1]]},{"name":"bottle19","directions":1,"delays":[[1]]},{"name":"bottle2","directions":1,"delays":[[1]]},{"name":"bottle20","directions":1,"delays":[[1]]},{"name":"bottle3","directions":1,"delays":[[1]]},{"name":"bottle4","directions":1,"delays":[[1]]},{"name":"bottle5","directions":1,"delays":[[1]]},{"name":"bottle6","directions":1,"delays":[[1]]},{"name":"bottle7","directions":1,"delays":[[1]]},{"name":"bottle8","directions":1,"delays":[[1]]},{"name":"bottle9","directions":1,"delays":[[1]]},{"name":"lid_bottle","directions":1,"delays":[[1]]}, {"name": "bottle-1-1", "delays": [[1.0]]}, {"name": "bottle-1-2", "delays": [[1.0]]}, {"name": "bottle-1-3", "delays": [[1.0]]}, {"name": "bottle-1-4", "delays": [[1.0]]}, {"name": "bottle-1-5", "delays": [[1.0]]}, {"name": "bottle-1-6", "delays": [[1.0]]}, {"name": "bottle-2-1", "delays": [[1.0]]}, {"name": "bottle-2-2", "delays": [[1.0]]}, {"name": "bottle-2-3", "delays": [[1.0]]}, {"name": "bottle-2-4", "delays": [[1.0]]}, {"name": "bottle-2-5", "delays": [[1.0]]}, {"name": "bottle-2-6", "delays": [[1.0]]}, {"name": "bottle-3-1", "delays": [[1.0]]}, {"name": "bottle-3-2", "delays": [[1.0]]}, {"name": "bottle-3-3", "delays": [[1.0]]}, {"name": "bottle-3-4", "delays": [[1.0]]}, {"name": "bottle-3-5", "delays": [[1.0]]}, {"name": "bottle-3-6", "delays": [[1.0]]}, {"name": "bottle-4-1", "delays": [[1.0]]}, {"name": "bottle-4-2", "delays": [[1.0]]}, {"name": "bottle-4-3", "delays": [[1.0]]}, {"name": "bottle-4-4", "delays": [[1.0]]}, {"name": "bottle-4-5", "delays": [[1.0]]}, {"name": "bottle-4-6", "delays": [[1.0]]}]} +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "bottle" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "bottle-1" + }, + { + "name": "bottle-2" + }, + { + "name": "bottle-3" + }, + { + "name": "bottle-4" + }, + { + "name": "bottle1" + }, + { + "name": "bottle10" + }, + { + "name": "bottle11" + }, + { + "name": "bottle12" + }, + { + "name": "bottle13" + }, + { + "name": "bottle14" + }, + { + "name": "bottle15" + }, + { + "name": "bottle16" + }, + { + "name": "bottle17" + }, + { + "name": "bottle18" + }, + { + "name": "bottle19" + }, + { + "name": "bottle2" + }, + { + "name": "bottle20" + }, + { + "name": "bottle3" + }, + { + "name": "bottle4" + }, + { + "name": "bottle5" + }, + { + "name": "bottle6" + }, + { + "name": "bottle7" + }, + { + "name": "bottle8" + }, + { + "name": "bottle9" + }, + { + "name": "lid_bottle" + }, + { + "name": "bottle-1-1" + }, + { + "name": "bottle-1-2" + }, + { + "name": "bottle-1-3" + }, + { + "name": "bottle-1-4" + }, + { + "name": "bottle-1-5" + }, + { + "name": "bottle-1-6" + }, + { + "name": "bottle-2-1" + }, + { + "name": "bottle-2-2" + }, + { + "name": "bottle-2-3" + }, + { + "name": "bottle-2-4" + }, + { + "name": "bottle-2-5" + }, + { + "name": "bottle-2-6" + }, + { + "name": "bottle-3-1" + }, + { + "name": "bottle-3-2" + }, + { + "name": "bottle-3-3" + }, + { + "name": "bottle-3-4" + }, + { + "name": "bottle-3-5" + }, + { + "name": "bottle-3-6" + }, + { + "name": "bottle-4-1" + }, + { + "name": "bottle-4-2" + }, + { + "name": "bottle-4-3" + }, + { + "name": "bottle-4-4" + }, + { + "name": "bottle-4-5" + }, + { + "name": "bottle-4-6" + } + ] +} 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 dfb67426ea..fc8b984624 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 9a7632c76a..e47463f52b 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/Guns/Battery/laser_gun.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-1.png index 1277964047..43de02d5af 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-1.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-2.png index 6a82939cb7..3e6690995b 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-2.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-3.png index ca2db4f946..197a0cac69 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-3.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-4.png index 6779c8643d..3f7c3289dd 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-4.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/inhand-left.png index 54aa5d121f..84695c1929 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/inhand-right.png index e7c52b5bb4..f06ab93260 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/inhand-left.png index 54aa5d121f..e3c8c9bdfc 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/inhand-right.png index e7c52b5bb4..ebdaddb1e1 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/inhand-left.png index 54aa5d121f..79233fd074 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/inhand-right.png index e7c52b5bb4..e6444383e9 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-left.png index 54aa5d121f..97ca5a80ec 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-right.png index e7c52b5bb4..7efc0f30fd 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/inhand-left.png index 54aa5d121f..4de85760c5 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/inhand-right.png index e7c52b5bb4..56eaeab03e 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/icon.png new file mode 100644 index 0000000000..ea90cafb92 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/inhand-left.png new file mode 100644 index 0000000000..ff87ea8c7c Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/inhand-right.png new file mode 100644 index 0000000000..0eed1badec Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/meta.json new file mode 100644 index 0000000000..8b4ee9318b --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.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/3555/commits/b24eb6260647c0fcfe858268a26b6160bc50017a", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/machete.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/icon.png new file mode 100644 index 0000000000..25ad0a8bf7 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/machete.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/inhand-left.png new file mode 100644 index 0000000000..73635cbe03 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/machete.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/inhand-right.png new file mode 100644 index 0000000000..2bbd4b0d38 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/machete.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/meta.json new file mode 100644 index 0000000000..e78dad6e06 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Taken/modified from TerraGov-Marine-Corps at commit https://github.com/tgstation/TerraGov-Marine-Corps/commit/4c8cb6eb48dece03478b0f83542855f7c63b793e#diff-a67180777ae47f2c84f3ebf93c61442bbe34aebcad5b7cbd76feb78f177bcee1", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}