Inhands for pistols, beakers, reworked melee weapons and laser gun (#3887)

* new pull

* beakers

* melee

* ffs

* hope this works

* ffffff

* Update meta.json

Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
Co-authored-by: Swept <sweptwastaken@protonmail.com>

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

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

Resources/Prototypes/Entities/Objects/Weapons/Melee/captain_sabre.yml

@@ -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

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

Resources/Prototypes/Entities/Objects/Weapons/Melee/katana.yml

@@ -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

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

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

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"
         },

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"
+        }
+    ]
+}

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"
+        }
+    ]
+}

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
+        }
+    ]
+}