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