diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml
index bdb970e3290..23ab49e82af 100644
--- a/Resources/Changelog/ChangelogADT.yml
+++ b/Resources/Changelog/ChangelogADT.yml
@@ -1660,7 +1660,6 @@ Entries:
   id: 55730 #костыль отображения в Обновлениях
   time: '2024-04-13T08:20:00.0000000+00:00'
 
-
 - author: 1Stepka1
   changes:
   - {message: "Добавлен новый департамент синтетиков.", type: Add}
@@ -1677,3 +1676,10 @@ Entries:
   - {message: "Фикс спрайта церковной скамейки.", type: Fix}
   id: 55732 #костыль отображения в Обновлениях
   time: '2024-04-15T08:20:00.0000000+00:00'
+  
+- author: Username228
+  changes:
+  - { message: "Инженеры NanoTrasen совместно с DSW не прекращают работу, на сей раз они полностью переработали дизайн и характеристики Вархаммера.", type: Tweak}
+  - { message: "Инженеры Nanotrasen слегка модифицировали конструкцию глефы-крашера, увеличив её длину и слегка снизив её массу, делая её более лёгкой в использовании.", type: Tweak}
+  id: 55732 #костыль отображения в Обновлениях
+  time: '2024-04-15T02:17:00.0000000+00:00'
diff --git a/Resources/Locale/ru-RU/ADT/Objects/Weapons/Melee/knifess.ftl b/Resources/Locale/ru-RU/ADT/Objects/Weapons/Melee/knifess.ftl
index 829da0027e7..62f38973b52 100644
--- a/Resources/Locale/ru-RU/ADT/Objects/Weapons/Melee/knifess.ftl
+++ b/Resources/Locale/ru-RU/ADT/Objects/Weapons/Melee/knifess.ftl
@@ -1,7 +1,7 @@
 ent-ADTObjectsWeaponsMeleeFoldingKnife = Складной Нож
     .desc = Компактный ножик для самообороны и выпендрежа.
     .suffix = { "" }
-ent-ADTWeaponWarhammer = вархмамер
+ent-ADTWeaponWarhammer = вархаммер
     .desc = Легендарное оружие чемпионов древности. С вархамером в одной руке...
 
 ent-ADTUSSPCombatKnifeBarzai = "Барзай"
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/warhammer.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/warhammer.yml
index 4e14b3b63b5..a9b8992f54c 100644
--- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/warhammer.yml
+++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/warhammer.yml
@@ -12,16 +12,16 @@
   - type: AmmoCounter
   - type: UseDelayOnShoot
   - type: UseDelay
-    delay: 0.8
+    delay: 1.9
   - type: LeechOnMarker
     leech:
       groups:
-        Brute: -25
-        Burn: -25
-        Airloss: -25
+        Brute: -10
+        Burn: -10
+        Airloss: -5
   - type: Gun
     soundGunshot: /Audio/Weapons/plasma_cutter.ogg
-    fireRate: 0.5
+    fireRate: 1
     useKey: false
   - type: RechargeBasicEntityAmmo
     rechargeCooldown: 0.5
@@ -34,16 +34,15 @@
   - type: MeleeWeapon
     damage:
       types:
-        Blunt: 20
+        Blunt: 10
+        Structural: 10
   - type: Wieldable
   - type: IncreaseDamageOnWield
     damage:
       types:
-        Blunt: 20
+        Blunt: 10
+        Structural: 10
   - type: GunRequiresWield
   - type: Item
     size: Ginormous
   - type: DisarmMalus
-  - type: Tool
-    qualities:
-      - Prying
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index 686809300e7..2f42d8605ea 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -1042,10 +1042,11 @@
   - type: DamageMarkerOnCollide
     whitelist:
       components:
-        - MobState
+        - Damageable
     damage:
       types:
-        Blunt: 80
+        Blunt: 50
+        Structural: 40
   - type: Projectile
     impactEffect: BulletImpactEffectKinetic
     damage:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
index 469e0800dd9..5e20694fc6d 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
@@ -108,6 +108,7 @@
 ##ADT add end
 
 # Like a crusher... but sucks
+# Not anymore, huh
 - type: entity
   parent: WeaponCrusher
   id: WeaponCrusherGlaive
@@ -117,7 +118,7 @@
   - type: Sprite
     sprite: Objects/Weapons/Melee/crusher_glaive.rsi
   - type: UseDelay
-    delay: 1.9
+    delay: 1.7
   - type: LeechOnMarker
     leech:
       groups:
@@ -125,6 +126,7 @@
         Burn: -10
         Airloss: -5
   - type: MeleeWeapon
+    range: 2.0
   - type: Tag
     tags:
       - Pickaxe
diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/warhammer.rsi/icon-lit.png b/Resources/Textures/ADT/Objects/Weapons/Melee/warhammer.rsi/icon-lit.png
index b9ebcc78155..bdb1a197354 100644
Binary files a/Resources/Textures/ADT/Objects/Weapons/Melee/warhammer.rsi/icon-lit.png and b/Resources/Textures/ADT/Objects/Weapons/Melee/warhammer.rsi/icon-lit.png differ
diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/warhammer.rsi/icon-uncharged.png b/Resources/Textures/ADT/Objects/Weapons/Melee/warhammer.rsi/icon-uncharged.png
index f78929ced6d..6cd29abe37c 100644
Binary files a/Resources/Textures/ADT/Objects/Weapons/Melee/warhammer.rsi/icon-uncharged.png and b/Resources/Textures/ADT/Objects/Weapons/Melee/warhammer.rsi/icon-uncharged.png differ
diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/warhammer.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Melee/warhammer.rsi/icon.png
index 6fb130a6567..de634842fe7 100644
Binary files a/Resources/Textures/ADT/Objects/Weapons/Melee/warhammer.rsi/icon.png and b/Resources/Textures/ADT/Objects/Weapons/Melee/warhammer.rsi/icon.png differ
diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/warhammer.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/warhammer.rsi/inhand-left.png
index 0ae1b93d636..c8af2dd5a81 100644
Binary files a/Resources/Textures/ADT/Objects/Weapons/Melee/warhammer.rsi/inhand-left.png and b/Resources/Textures/ADT/Objects/Weapons/Melee/warhammer.rsi/inhand-left.png differ
diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/warhammer.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/warhammer.rsi/inhand-right.png
index b0b855525cc..e1ae7ef8edf 100644
Binary files a/Resources/Textures/ADT/Objects/Weapons/Melee/warhammer.rsi/inhand-right.png and b/Resources/Textures/ADT/Objects/Weapons/Melee/warhammer.rsi/inhand-right.png differ
diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/warhammer.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Melee/warhammer.rsi/meta.json
index 008aa448a0f..6dde6eb34d7 100644
--- a/Resources/Textures/ADT/Objects/Weapons/Melee/warhammer.rsi/meta.json
+++ b/Resources/Textures/ADT/Objects/Weapons/Melee/warhammer.rsi/meta.json
@@ -1,42 +1,36 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "made by nope_ingeneer",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "icon-lit"
-    },
-    {
-      "name": "icon-uncharged",
-      "delays": [
-        [
-          0.3,
-          0.3
-        ]
-      ]
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "wielded-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "wielded-inhand-right",
-      "directions": 4
-    }
-  ]
-}
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "https://github.com/BlueMoon-Labs/MOLOT-BlueMoon-Station/blob/master/icons/obj/items_and_weapons.dmi , wielded-inhand's sprits made by Username228 (#serj3428 discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon-lit"
+    },
+    {
+      "name": "icon-uncharged"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/warhammer.rsi/wielded-inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/warhammer.rsi/wielded-inhand-left.png
index 943b4f83e92..89db6a3a09b 100644
Binary files a/Resources/Textures/ADT/Objects/Weapons/Melee/warhammer.rsi/wielded-inhand-left.png and b/Resources/Textures/ADT/Objects/Weapons/Melee/warhammer.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/warhammer.rsi/wielded-inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/warhammer.rsi/wielded-inhand-right.png
index 226e2a1ed4c..4dd07137a84 100644
Binary files a/Resources/Textures/ADT/Objects/Weapons/Melee/warhammer.rsi/wielded-inhand-right.png and b/Resources/Textures/ADT/Objects/Weapons/Melee/warhammer.rsi/wielded-inhand-right.png differ