diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java
index 08d328ce0..6b4b0992c 100644
--- a/src/main/java/com/hbm/blocks/ModBlocks.java
+++ b/src/main/java/com/hbm/blocks/ModBlocks.java
@@ -1758,7 +1758,7 @@ public class ModBlocks {
 		machine_gascent = new MachineGasCent(Material.iron).setBlockName("machine_gascent").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel");
 		machine_fel = new MachineFEL(Material.iron).setBlockName("machine_fel").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel");
 		machine_silex = new MachineSILEX(Material.iron).setBlockName("machine_silex").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel");
-		machine_rotary_furnace = new MachineRotaryFurnace(Material.iron).setBlockName("machine_rotary_furnace").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_firebrick");
+		machine_rotary_furnace = new MachineRotaryFurnace(Material.iron).setBlockName("machine_rotary_furnace").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":brick_fire");
 		machine_crystallizer = new MachineCrystallizer(Material.iron).setBlockName("machine_crystallizer").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_crystallizer");
 		
 		machine_uf6_tank = new MachineUF6Tank(Material.iron).setBlockName("machine_uf6_tank").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab);
diff --git a/src/main/java/com/hbm/handler/EntityEffectHandler.java b/src/main/java/com/hbm/handler/EntityEffectHandler.java
index 6f2382d20..c6597b3f5 100644
--- a/src/main/java/com/hbm/handler/EntityEffectHandler.java
+++ b/src/main/java/com/hbm/handler/EntityEffectHandler.java
@@ -578,6 +578,8 @@ public class EntityEffectHandler {
 		double y = living.posY;
 		double z = living.posZ;
 		
+		if(living.isInWater() || living.isWet()) props.fire = 0;
+		
 		if(props.fire > 0) {
 			props.fire--;
 			if((living.ticksExisted + living.getEntityId()) % 15 == 0) living.worldObj.playSoundEffect(living.posX, living.posY + living.height / 2, living.posZ, "random.fizz", 1F, 1.5F + rand.nextFloat() * 0.5F);
diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java
index dd6f08b6e..ba95331c0 100644
--- a/src/main/java/com/hbm/items/ModItems.java
+++ b/src/main/java/com/hbm/items/ModItems.java
@@ -1619,6 +1619,7 @@ public class ModItems {
 	public static Item gun_quadro;
 	public static Item gun_minigun;
 	public static Item gun_missile_launcher;
+	public static Item gun_tesla_cannon;
 	
 	public static Item ammo_standard;
 	
@@ -6965,6 +6966,7 @@ public class ModItems {
 		GameRegistry.registerItem(gun_quadro, gun_quadro.getUnlocalizedName());
 		GameRegistry.registerItem(gun_minigun, gun_minigun.getUnlocalizedName());
 		GameRegistry.registerItem(gun_missile_launcher, gun_missile_launcher.getUnlocalizedName());
+		GameRegistry.registerItem(gun_tesla_cannon, gun_tesla_cannon.getUnlocalizedName());
 		
 		GameRegistry.registerItem(ammo_standard, ammo_standard.getUnlocalizedName());
 		
diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/GunFactory.java b/src/main/java/com/hbm/items/weapon/sedna/factory/GunFactory.java
index 7950fdc69..a0eb311e0 100644
--- a/src/main/java/com/hbm/items/weapon/sedna/factory/GunFactory.java
+++ b/src/main/java/com/hbm/items/weapon/sedna/factory/GunFactory.java
@@ -27,7 +27,7 @@ public class GunFactory {
 		
 		/// AMMO ITEMS ///
 		ModItems.ammo_debug = new Item().setUnlocalizedName("ammo_debug").setTextureName(RefStrings.MODID + ":ammo_45");
-		ModItems.ammo_standard = new ItemEnumMulti(EnumAmmo.class, true, true).setUnlocalizedName("ammo_standard").setTextureName(RefStrings.MODID + ":ammo_standard");
+		ModItems.ammo_standard = new ItemEnumMulti(EnumAmmo.class, true, true).setUnlocalizedName("ammo_standard").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_standard");
 
 		/// BULLLET CFGS ///
 		ammo_debug = new BulletConfig().setItem(ModItems.ammo_debug).setSpread(0.01F).setRicochetAngle(45).setCasing(CASING44.clone().register("DEBUG0"));
@@ -58,6 +58,7 @@ public class GunFactory {
 		XFactoryRocket.init();
 		XFactory556mm.init();
 		XFactory50.init();
+		XFactoryEnergy.init();
 
 		/// PROXY BULLSHIT ///
 		MainRegistry.proxy.registerGunCfg();
diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/GunFactoryClient.java b/src/main/java/com/hbm/items/weapon/sedna/factory/GunFactoryClient.java
index bb59ffa04..8ac90fb2f 100644
--- a/src/main/java/com/hbm/items/weapon/sedna/factory/GunFactoryClient.java
+++ b/src/main/java/com/hbm/items/weapon/sedna/factory/GunFactoryClient.java
@@ -58,6 +58,7 @@ public class GunFactoryClient {
 		MinecraftForgeClient.registerItemRenderer(ModItems.gun_quadro,					new ItemRenderQuadro());
 		MinecraftForgeClient.registerItemRenderer(ModItems.gun_minigun,					new ItemRenderMinigun());
 		MinecraftForgeClient.registerItemRenderer(ModItems.gun_missile_launcher,		new ItemRenderMissileLauncher());
+		MinecraftForgeClient.registerItemRenderer(ModItems.gun_tesla_cannon,			new ItemRenderTeslaCannon());
 		//PROJECTILES
 		ammo_debug.setRenderer(LegoClient.RENDER_STANDARD_BULLET);
 		ammo_debug_buckshot.setRenderer(LegoClient.RENDER_STANDARD_BULLET);
@@ -155,6 +156,7 @@ public class GunFactoryClient {
 		((ItemGunBaseNT) ModItems.gun_quadro)					.getConfig(null, 0).hud(LegoClient.HUD_COMPONENT_DURABILITY, LegoClient.HUD_COMPONENT_AMMO);
 		((ItemGunBaseNT) ModItems.gun_minigun)					.getConfig(null, 0).hud(LegoClient.HUD_COMPONENT_DURABILITY, LegoClient.HUD_COMPONENT_AMMO);
 		((ItemGunBaseNT) ModItems.gun_missile_launcher)			.getConfig(null, 0).hud(LegoClient.HUD_COMPONENT_DURABILITY, LegoClient.HUD_COMPONENT_AMMO);
+		((ItemGunBaseNT) ModItems.gun_tesla_cannon)				.getConfig(null, 0).hud(LegoClient.HUD_COMPONENT_DURABILITY, LegoClient.HUD_COMPONENT_AMMO);
 		
 		((ItemGunBaseNT) ModItems.gun_light_revolver_dani)	.getConfig(null, 0).hud(LegoClient.HUD_COMPONENT_DURABILITY_MIRROR, LegoClient.HUD_COMPONENT_AMMO_MIRROR);
 		((ItemGunBaseNT) ModItems.gun_light_revolver_dani)	.getConfig(null, 1).hud(LegoClient.HUD_COMPONENT_DURABILITY, LegoClient.HUD_COMPONENT_AMMO);
diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/Orchestras.java b/src/main/java/com/hbm/items/weapon/sedna/factory/Orchestras.java
index 5a17fd923..692a9bf69 100644
--- a/src/main/java/com/hbm/items/weapon/sedna/factory/Orchestras.java
+++ b/src/main/java/com/hbm/items/weapon/sedna/factory/Orchestras.java
@@ -851,4 +851,27 @@ public class Orchestras {
 			if(timer == 27) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.boltClose", 1F, 0.9F);
 		}
 	};
+	
+	public static BiConsumer<ItemStack, LambdaContext> ORCHESTRA_TESLA = (stack, ctx) -> {
+		EntityLivingBase entity = ctx.entity;
+		if(entity.worldObj.isRemote) return;
+		AnimType type = ItemGunBaseNT.getLastAnim(stack, ctx.configIndex);
+		int timer = ItemGunBaseNT.getAnimTimer(stack, ctx.configIndex);
+
+		if(type == AnimType.CYCLE) {
+			if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.fire.shredderCycle", 0.25F, 1.5F);
+		}
+		if(type == AnimType.CYCLE_DRY) {
+			if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 1F);
+			if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.fire.shredderCycle", 0.25F, 1.5F);
+		}
+		if(type == AnimType.RELOAD) {
+			if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magRemove", 1F, 1F);
+			if(timer == 32) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magInsert", 1F, 1F);
+		}
+		if(type == AnimType.INSPECT) {
+			if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magRemove", 1F, 1F);
+			if(timer == 28) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magInsert", 1F, 1F);
+		}
+	};
 }
diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory40mm.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory40mm.java
index 14afbffe1..b53280475 100644
--- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory40mm.java
+++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory40mm.java
@@ -11,6 +11,7 @@ import com.hbm.explosion.vanillant.standard.BlockProcessorStandard;
 import com.hbm.explosion.vanillant.standard.EntityProcessorCrossSmooth;
 import com.hbm.explosion.vanillant.standard.ExplosionEffectWeapon;
 import com.hbm.explosion.vanillant.standard.PlayerProcessorStandard;
+import com.hbm.extprop.HbmLivingProps;
 import com.hbm.items.ModItems;
 import com.hbm.items.weapon.sedna.BulletConfig;
 import com.hbm.items.weapon.sedna.Crosshair;
@@ -30,6 +31,7 @@ import com.hbm.render.anim.BusAnimationSequence;
 import com.hbm.render.anim.BusAnimationKeyframe.IType;
 import com.hbm.render.anim.HbmAnimations.AnimType;
 
+import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.MovingObjectPosition;
@@ -43,7 +45,15 @@ public class XFactory40mm {
 	public static BulletConfig g40_heat;
 	public static BulletConfig g40_demo;
 	public static BulletConfig g40_inc;
-	
+
+	public static BiConsumer<EntityBulletBaseMK4, MovingObjectPosition> LAMBDA_STANDARD_IGNITE = (bullet, mop) -> {
+		if(mop.typeOfHit == mop.typeOfHit.ENTITY) {
+			if(mop.entityHit instanceof EntityLivingBase) {
+				HbmLivingProps props = HbmLivingProps.getData((EntityLivingBase) mop.entityHit);
+				props.fire += 200;
+			}
+		}
+	};
 	public static BiConsumer<EntityBulletBaseMK4, MovingObjectPosition> LAMBDA_STANDARD_EXPLODE = (bullet, mop) -> {
 		Lego.standardExplode(bullet, mop, 5F); bullet.setDead();
 	};
@@ -89,7 +99,7 @@ public class XFactory40mm {
 	
 	public static void init() {
 		
-		g26_flare = new BulletConfig().setItem(EnumAmmo.G26_FLARE).setLife(100).setVel(2F).setGrav(0.035D).setRenderRotations(false).setCasing(new SpentCasing(CasingType.STRAIGHT).setColor(0x9E1616).setScale(2F).register("G40Flare"));
+		g26_flare = new BulletConfig().setItem(EnumAmmo.G26_FLARE).setLife(100).setVel(2F).setGrav(0.035D).setRenderRotations(false).setOnImpact(LAMBDA_STANDARD_IGNITE).setCasing(new SpentCasing(CasingType.STRAIGHT).setColor(0x9E1616).setScale(2F).register("G40Flare"));
 		
 		BulletConfig g40_base = new BulletConfig().setLife(200).setVel(2F).setGrav(0.035D);
 		g40_he = g40_base.clone().setItem(EnumAmmo.G40_HE).setOnImpact(LAMBDA_STANDARD_EXPLODE).setCasing(new SpentCasing(CasingType.STRAIGHT).setColor(0x777777).setScale(2, 2F, 1.5F).register("g40"));
diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryBlackPowder.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryBlackPowder.java
index c32ce1092..60e3182b0 100644
--- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryBlackPowder.java
+++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryBlackPowder.java
@@ -32,6 +32,7 @@ public class XFactoryBlackPowder {
 				.rec(new Receiver(0)
 						.dmg(5F).delay(27).reload(67).jam(58).sound("hbm:weapon.fire.blackPowder", 1.0F, 1.0F)
 						.mag(new MagazineFullReload(0, 6).addConfigs(stone, flint, iron, shot))
+						.offset(0.75, -0.0625, -0.1875D)
 						.setupStandardFire().recoil(Lego.LAMBDA_STANDARD_RECOIL))
 				.setupStandardConfiguration()
 				.anim(LAMBDA_PEPPERBOX_ANIMS).orchestra(Orchestras.ORCHESTRA_PEPPERBOX)
diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryEnergy.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryEnergy.java
new file mode 100644
index 000000000..e7688b019
--- /dev/null
+++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryEnergy.java
@@ -0,0 +1,66 @@
+package com.hbm.items.weapon.sedna.factory;
+
+import java.util.function.BiFunction;
+
+import com.hbm.items.ModItems;
+import com.hbm.items.weapon.sedna.BulletConfig;
+import com.hbm.items.weapon.sedna.Crosshair;
+import com.hbm.items.weapon.sedna.GunConfig;
+import com.hbm.items.weapon.sedna.ItemGunBaseNT;
+import com.hbm.items.weapon.sedna.Receiver;
+import com.hbm.items.weapon.sedna.ItemGunBaseNT.WeaponQuality;
+import com.hbm.items.weapon.sedna.factory.GunFactory.EnumAmmo;
+import com.hbm.items.weapon.sedna.mags.MagazineBelt;
+import com.hbm.render.anim.BusAnimation;
+import com.hbm.render.anim.BusAnimationSequence;
+import com.hbm.render.anim.BusAnimationKeyframe.IType;
+import com.hbm.render.anim.HbmAnimations.AnimType;
+
+import net.minecraft.item.ItemStack;
+
+public class XFactoryEnergy {
+
+	public static BulletConfig energy_tesla;
+	
+	public static void init() {
+		
+		energy_tesla = new BulletConfig().setItem(EnumAmmo.P9_SP).setSpread(0.01F);
+
+		ModItems.gun_tesla_cannon = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig()
+				.dura(2_000).draw(10).inspect(33).reloadSequential(true).crosshair(Crosshair.L_CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE)
+				.rec(new Receiver(0)
+						.dmg(15F).delay(10).reload(44).jam(19).sound("hbm:weapon.fire.blackPowder", 1.0F, 1.0F)
+						.mag(new MagazineBelt().addConfigs(energy_tesla))
+						.offset(0.75, -0.125, -0.25)
+						.setupStandardFire().recoil(Lego.LAMBDA_STANDARD_RECOIL))
+				.setupStandardConfiguration()
+				.anim(LAMBDA_TESLA_ANIMS).orchestra(Orchestras.ORCHESTRA_TESLA)
+				).setUnlocalizedName("gun_tesla_cannon");
+	}
+
+	@SuppressWarnings("incomplete-switch") public static BiFunction<ItemStack, AnimType, BusAnimation> LAMBDA_TESLA_ANIMS = (stack, type) -> {
+		switch(type) {
+		case EQUIP: return new BusAnimation()
+				.addBus("EQUIP", new BusAnimationSequence().addPos(60, 0, 0, 0).addPos(0, 0, 0, 500, IType.SIN_DOWN));
+		case CYCLE: return new BusAnimation()
+				.addBus("RECOIL", new BusAnimationSequence().addPos(0, 0, -1, 50, IType.SIN_DOWN).addPos(0, 0, 0, 150, IType.SIN_FULL))
+				.addBus("CYCLE", new BusAnimationSequence().addPos(0, 0, 0, 150).addPos(0, 0, 18, 100));
+		case CYCLE_DRY: return new BusAnimation()
+				.addBus("CYCLE", new BusAnimationSequence().addPos(0, 0, 0, 150).addPos(0, 0, 18, 100));
+		case RELOAD: return new BusAnimation()
+				.addBus("MAG", new BusAnimationSequence().addPos(0, -8, 0, 250, IType.SIN_UP).addPos(0, -8, 0, 1000).addPos(0, 0, 0, 300))
+				.addBus("LIFT", new BusAnimationSequence().addPos(0, 0, 0, 750).addPos(-25, 0, 0, 300, IType.SIN_FULL).addPos(-25, 0, 0, 500).addPos(-27, 0, 0, 100, IType.SIN_DOWN).addPos(-25, 0, 0, 100, IType.SIN_FULL).addPos(-25, 0, 0, 150).addPos(0, 0, 0, 300, IType.SIN_FULL));
+		case JAMMED: return new BusAnimation()
+				.addBus("MAG", new BusAnimationSequence().addPos(0, 0, 0, 500).addPos(0, -2, 0, 150, IType.SIN_UP).addPos(0, 0, 0, 100))
+				.addBus("LIFT", new BusAnimationSequence().addPos(0, 0, 0, 750).addPos(-2, 0, 0, 100, IType.SIN_DOWN).addPos(0, 0, 0, 100, IType.SIN_FULL));
+		case INSPECT: return new BusAnimation()
+				.addBus("MAG", new BusAnimationSequence()
+						.addPos(0, -1, 0, 150).addPos(6, -1, 0, 150).addPos(6, 12, 0, 350, IType.SIN_DOWN).addPos(6, -2, 0, 350, IType.SIN_UP).addPos(6, -1, 0, 50)
+						.addPos(6, -1, 0, 100).addPos(0, -1, 0, 150, IType.SIN_FULL).addPos(0, 0, 0, 150, IType.SIN_UP))
+				.addBus("SPEEN", new BusAnimationSequence().addPos(0, 0, 0, 300).addPos(360, 0, 0, 700))
+				.addBus("LIFT", new BusAnimationSequence().addPos(0, 0, 0, 1450).addPos(-2, 0, 0, 100, IType.SIN_DOWN).addPos(0, 0, 0, 100, IType.SIN_FULL));
+		}
+		
+		return null;
+	};
+}
diff --git a/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderTeslaCannon.java b/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderTeslaCannon.java
new file mode 100644
index 000000000..51657c56f
--- /dev/null
+++ b/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderTeslaCannon.java
@@ -0,0 +1,26 @@
+package com.hbm.render.item.weapon.sedna;
+
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.client.IItemRenderer;
+
+public class ItemRenderTeslaCannon implements IItemRenderer {
+
+	@Override
+	public boolean handleRenderType(ItemStack item, ItemRenderType type) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
+		// TODO Auto-generated method stub
+
+	}
+
+}
diff --git a/src/main/java/com/hbm/render/util/RenderInfoSystem.java b/src/main/java/com/hbm/render/util/RenderInfoSystem.java
index 4ea75768f..4b008f85c 100644
--- a/src/main/java/com/hbm/render/util/RenderInfoSystem.java
+++ b/src/main/java/com/hbm/render/util/RenderInfoSystem.java
@@ -50,6 +50,8 @@ public class RenderInfoSystem {
 		if(event.type != ElementType.CROSSHAIRS)
 			return;
 		
+		//this.messages.put(-666, new InfoEntry("Halloween Preview", 666_666));
+		
 		if(this.messages.isEmpty()) 
 			return;
 		
@@ -167,13 +169,8 @@ public class RenderInfoSystem {
 
 		@Override
 		public int compareTo(Object o) {
-			
-			if(!(o instanceof InfoEntry)) {
-				return 0;
-			}
-			
+			if(!(o instanceof InfoEntry)) { return 0; }
 			InfoEntry other = (InfoEntry) o;
-			
 			return this.millis < other.millis ? -1 : this.millis > other.millis ? 1 : 0;
 		}
 	}
diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang
index 7bfc90e24..95432b90a 100644
--- a/src/main/resources/assets/hbm/lang/de_DE.lang
+++ b/src/main/resources/assets/hbm/lang/de_DE.lang
@@ -1156,7 +1156,10 @@ item.ammo_standard.bmg50_equestrian.name=.50 BMG Zerstörer
 item.ammo_standard.bmg50_fmj.name=.50 BMG Patrone (Vollmantelgeschoss)
 item.ammo_standard.bmg50_jhp.name=.50 BMG Patrone (Hohlspitz)
 item.ammo_standard.bmg50_sp.name=.50 BMG Patrone (Teilmantelgeschoss)
-item.ammo_standard.flame_diesel.name=Dieseltank
+item.ammo_standard.flame_balefire.name=Flammenwerferbrennstoff, Balefire
+item.ammo_standard.flame_diesel.name=Flammenwerferbrennstoff, Diesel
+item.ammo_standard.flame_gas.name=Flammenwerferbrennstoff, Gas
+item.ammo_standard.flame_napalm.name=Flammenwerferbrennstoff, Napalm
 item.ammo_standard.g12.name=Kaliber 12 Schrot
 item.ammo_standard.g12_anthrax.name=Kaliber 12 Anthrax
 item.ammo_standard.g12_bp.name=Kaliber 12 Schwarzpulver
@@ -1168,7 +1171,7 @@ item.ammo_standard.g12_flechette.name=Kaliber 12 Flechett
 item.ammo_standard.g12_magnum.name=Kaliber 12 Magnum
 item.ammo_standard.g12_phosphorus.name=Kaliber 12 Phosphor
 item.ammo_standard.g12_slug.name=Kaliber 12 Laufgeschoss
-item.ammo_standard.g23_flare.name=Signalpatrone
+item.ammo_standard.g26_flare.name=Signalpatrone
 item.ammo_standard.g40_demo.name=40mm Abrissgranate
 item.ammo_standard.g40_he.name=40mm Sprenggranate
 item.ammo_standard.g40_heat.name=40mm Hohlladungsgranate
@@ -2107,7 +2110,10 @@ item.grenade_smart.name=Smart-Granate
 item.grenade_strong.name=Verbesserte Handgranate
 item.grenade_tau.name=Taugranate
 item.grenade_zomg.name=Negativenergie-Paarvernichtungsgranate
+item.gun_am180.name=Schallgedämpfte Maschinenpistole
 item.gun_ar15.name=Josh
+item.gun_autoshotgun.name=Auto-Flinte
+item.gun_autoshotgun_sexy.name=Sexy
 item.gun_avenger.name=CZ57 Avenger-Minigun
 item.gun_b92.name=§9B92 Energiepistole§r
 item.gun_b92_ammo.name=§9B92-Energiezelle§r
@@ -2124,6 +2130,7 @@ item.gun_bolter_digamma.name=Digammagewehr
 item.gun_calamity.name=Knochensäge
 item.gun_calamity_ammo.name=.50 BMG Patrone (LEGACY)
 item.gun_calamity_dual.name=Sattelkanone
+item.gun_carbine.name=Karabiner
 item.gun_chemthrower.name=Chemowerfer
 item.gun_coilgun.name=Gaußpistole
 item.gun_cryocannon.name=Kyro-Kanone
@@ -2142,9 +2149,15 @@ item.gun_euthanasia_ammo.name=Spritze
 item.gun_fatman.name=M42 Nukleares Katapult "Fat Man"
 item.gun_fatman_ammo.name=Miniatombombe (LEGACY)
 item.gun_fireext.name=Feuerlöscher
-item.gun_flamer.name=Herr Topaz
+item.gun_flamer.name=Flammenwerfer
+item.gun_flaregun.name=Signalpistole
 item.gun_flechette.name=Flechet-Gewehr
 item.gun_folly.name=Prototyp Digamma "Irrsinn"
+item.gun_g3.name=Sturmgewehr
+item.gun_greasegun.name=Grease Gun
+item.gun_heavy_revolver.name=Schwerer Revolver
+item.gun_heavy_revolver_lilmac.name=Little Macintosh
+item.gun_henry.name=Repetiergewehr
 item.gun_hk69.name=Granatenpistole
 item.gun_hp.name=HPP Lazerjet
 item.gun_hp_ammo.name=Tintenpatrone
@@ -2158,16 +2171,24 @@ item.gun_kit_2.name=Waffenreparatursatz
 item.gun_ks23.name=Samuel die dicke Flinte
 item.gun_lacunae.name=CZ33 Abaddon
 item.gun_lacunae_ammo.name=5mm Patrone (LEGACY)
+item.gun_lag.name=Komisch lange Pistole
 item.gun_lever_action.name=Mare's Leg (Original)
 item.gun_lever_action_ammo.name=12x74 Schrotmunition (LEGACY)
 item.gun_lever_action_dark.name=Mare's Leg (Dunkel)
 item.gun_lever_action_sonata.name=Verkehrter Mare's Leg
 item.gun_lever_action_sonata_2.name=§cSonatas Mikrophon§r
+item.gun_liberator.name=Liberator
+item.gun_light_revolver.name=Kipplaufrevolver
+item.gun_light_revolver_dani.name=Tag und Nacht
 item.gun_lunatic_marksman.name=Lunatic-Scharfschützengewehr
 item.gun_m2.name=üsMG
-item.gun_minigun.name=CZ53 Persönliche Minigun
+item.gun_maresleg.name=Repetierflinte
+item.gun_maresleg_akimbo.name=Repetierflinten
+item.gun_maresleg_broken.name=Broken
+item.gun_minigun.name=Minigun
 item.gun_mirv.name=M42 Nukleares Katapult "Experimentelles MIRV"
 item.gun_mirv_ammo.name=Achtfaches MIRV (LEGACY)
+item.gun_missile_launcher.name=Raketenwerfer
 item.gun_moist_nugget.name=Mosin-Nagant
 item.gun_mp.name=Maschinengewehr des Pazifisten
 item.gun_mp40.name=Maschinenpistole
@@ -2180,7 +2201,7 @@ item.gun_osipr_ammo.name=Dunkler Energiepuls-Plug
 item.gun_osipr_ammo2.name=Combine Ball
 item.gun_panzerschreck.name=Panzerschreck
 item.gun_proto.name=M42 Nukleares Katapult "Proto MIRV"
-item.gun_quadro.name=Quattro Formaggi
+item.gun_quadro.name=Vierfachraketenwerfer
 item.gun_remington.name=バイデン ブラスト [BIDEN BLAST]
 item.gun_revolver.name=Verbesserter Revolver
 item.gun_revolver_ammo.name=Bleipatrone
@@ -2213,6 +2234,7 @@ item.gun_sauer.name=Stan Sauers Schrotflinte
 item.gun_skystinger.name=The One Sky Stinger
 item.gun_spark.name=Die Zündkerze
 item.gun_spark_ammo.name=Elektromagnetische Katusche
+item.gun_spas12.name=SPAS-12
 item.gun_stinger.name=FIM-92 Stinger
 item.gun_stinger_ammo.name=Stinger-Rakete (LEGACY)
 item.gun_super_shotgun.name=Super Shotgun
@@ -2221,7 +2243,7 @@ item.gun_thompson.name=Thompson Maschinenpistole
 item.gun_uac_pistol.name=UAC .45 Pistole
 item.gun_uboinik.name=Ubojnik
 item.gun_uboinik_ammo.name=12x70 Schrotmunition (LEGACY)
-item.gun_uzi.name=IMI Uzi
+item.gun_uzi.name=Uzi
 item.gun_uzi_ammo.name=.22 lfB Patrone (LEGACY)
 item.gun_uzi_saturnite.name=Saturnit-Uzi
 item.gun_uzi_saturnite_silencer.name=Saturnit-Uzi mit Schalldämpfer
diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang
index 98e5e209d..95c7ccc9a 100644
--- a/src/main/resources/assets/hbm/lang/en_US.lang
+++ b/src/main/resources/assets/hbm/lang/en_US.lang
@@ -1879,7 +1879,10 @@ item.ammo_standard.bmg50_equestrian.name=.50 BMG Demolisher
 item.ammo_standard.bmg50_fmj.name=.50 BMG Round (Full Metal Jacket)
 item.ammo_standard.bmg50_jhp.name=.50 BMG Round (Jacketed Hollow Point)
 item.ammo_standard.bmg50_sp.name=.50 BMG Round (Soft Point)
-item.ammo_standard.flame_diesel.name=Diesel Tank
+item.ammo_standard.flame_balefire.name=Flamer Fuel, Balefire
+item.ammo_standard.flame_diesel.name=Flamer Fuel, Diesel
+item.ammo_standard.flame_gas.name=Flamer Fuel, Gas
+item.ammo_standard.flame_napalm.name=Flamer Fuel, Napalm
 item.ammo_standard.g12.name=12 Gauge Buckshot
 item.ammo_standard.g12_anthrax.name=12 Gauge Anthrax Shell
 item.ammo_standard.g12_bp.name=12 Gauge Black Powder Buckshot
@@ -1891,7 +1894,7 @@ item.ammo_standard.g12_flechette.name=12 Gauge Flechette Shell
 item.ammo_standard.g12_magnum.name=12 Gauge Magnum Shell
 item.ammo_standard.g12_phosphorus.name=12 Gauge Phosphorus Shell
 item.ammo_standard.g12_slug.name=12 Gauge Slug
-item.ammo_standard.g23_flare.name=Signal Flare
+item.ammo_standard.g26_flare.name=Signal Flare
 item.ammo_standard.g40_demo.name=40mm Grenade, Demolition
 item.ammo_standard.g40_he.name=40mm Grenade, High-Explosive
 item.ammo_standard.g40_heat.name=40mm Grenade, Shaped Charge
@@ -2913,7 +2916,10 @@ item.grenade_tau.name=Tau Grenade
 item.grenade_zomg.name=Negative Energy Pair Annihilation Grenade
 item.glyphid_gland.name= Gland
 item.glyphid_gland_empty.name= Glyphid's Fluid Gland
+item.gun_am180.name=Silenced Submachine Gun
 item.gun_ar15.name=Josh
+item.gun_autoshotgun.name=Auto Shotgun
+item.gun_autoshotgun_sexy.name=Sexy
 item.gun_avenger.name=CZ57 Avenger Minigun
 item.gun_b92.name=§9B92 Energy Pistol§r
 item.gun_b92_ammo.name=§9B92 Energy Cell§r
@@ -2931,6 +2937,7 @@ item.gun_bolter_digamma.name=Digamma Gun
 item.gun_calamity.name=Buzzsaw
 item.gun_calamity_ammo.name=.50 BMG Round (LEGACY)
 item.gun_calamity_dual.name=Saddle Gun
+item.gun_carbine.name=Carbine
 item.gun_chemthrower.name=Chemthrower
 item.gun_coilgun.name=Coilgun
 item.gun_congolake.name=Congo Lake
@@ -2950,10 +2957,16 @@ item.gun_euthanasia_ammo.name=Syringe
 item.gun_fatman.name=M42 Nuclear Catapult "Fat Man"
 item.gun_fatman_ammo.name=Mini Nuke (LEGACY)
 item.gun_fireext.name=Fire Extinguisher
-item.gun_flamer.name=Mister Topaz
+item.gun_flamer.name=Flamethrower
+item.gun_flaregun.name=Flare Gun
 item.gun_flechette.name=Flechette Rifle
 item.gun_folly.name=Prototype Digamma "Folly"
+item.gun_g3.name=Assault Rifle
 item.gun_glass_cannon.name=The Glass Cannon
+item.gun_greasegun.name=Grease Gun
+item.gun_heavy_revolver.name=Heavy Revolver
+item.gun_heavy_revolver_lilmac.name=Little Macintosh
+item.gun_henry.name=Lever Action Rifle
 item.gun_hk69.name=Grenade Pistol
 item.gun_hp.name=HPP Lazerjet
 item.gun_hp_ammo.name=Ink Cartridge
@@ -2967,16 +2980,24 @@ item.gun_kit_2.name=Gun Repair Kit
 item.gun_ks23.name=Samuel the Big Shotgun
 item.gun_lacunae.name=CZ33 Abaddon
 item.gun_lacunae_ammo.name=5mm Round (LEGACY)
+item.gun_lag.name=Comically Long Pistol
 item.gun_lever_action.name=Mare's Leg (Original)
 item.gun_lever_action_ammo.name=12x74 Buckshot (LEGACY)
 item.gun_lever_action_dark.name=Mare's Leg (Dark)
 item.gun_lever_action_sonata.name=Flipped Mare's Leg
 item.gun_lever_action_sonata_2.name=§cSonata's Microphone§r
+item.gun_liberator.name=Liberator
+item.gun_light_revolver.name=Break-Action Revolver
+item.gun_light_revolver_dani.name=Day And Night
 item.gun_lunatic_marksman.name=Lunatic Sniper Rifle
 item.gun_m2.name=Ma Deuce
-item.gun_minigun.name=CZ53 Personal Minigun
+item.gun_maresleg.name=Lever Action Shotgun
+item.gun_maresleg_akimbo.name=Lever Action Shotguns
+item.gun_maresleg_broken.name=Broken
+item.gun_minigun.name=Minigun
 item.gun_mirv.name=M42 Nuclear Catapult "Experimental MIRV"
 item.gun_mirv_ammo.name=Eightfold MIRV (LEGACY)
+item.gun_missile_launcher.name=Missile Launcher
 item.gun_moist_nugget.name=Mosin-Nagant
 item.gun_mp.name=Pacifist's Machine Gun
 item.gun_mp40.name=Submachine Gun
@@ -2989,7 +3010,7 @@ item.gun_osipr_ammo.name=Dark Energy Pulse Plug
 item.gun_osipr_ammo2.name=Combine Ball
 item.gun_panzerschreck.name=Panzerschreck
 item.gun_proto.name=M42 Nuclear Catapult "Proto MIRV"
-item.gun_quadro.name=Quattro Formaggi
+item.gun_quadro.name=Quad Rocket Launcher
 item.gun_remington.name=バイデン ブラスト [BIDEN BLAST]
 item.gun_revolver.name=Enhanced Revolver
 item.gun_revolver_ammo.name=Lead Bullet
@@ -3022,7 +3043,7 @@ item.gun_sauer.name=Stan Sauer's Shotgun
 item.gun_skystinger.name=The One Sky Stinger
 item.gun_spark.name=Spark Plug
 item.gun_spark_ammo.name=Electromagnetic Cartridge
-item.gun_spas12.name=SPAS-12 Shotgun
+item.gun_spas12.name=SPAS-12
 item.gun_stinger.name=FIM-92 Stinger
 item.gun_stinger_ammo.name=Stinger Rocket (LEGACY)
 item.gun_super_shotgun.name=Super Shotgun
@@ -3032,7 +3053,7 @@ item.gun_thompson.name=Thompson Submachine Gun
 item.gun_uac_pistol.name=UAC .45 Pistol
 item.gun_uboinik.name=Uboinik
 item.gun_uboinik_ammo.name=12x70 Buckshot (LEGACY)
-item.gun_uzi.name=IMI Uzi
+item.gun_uzi.name=Uzi
 item.gun_uzi_ammo.name=.22 LR Round (LEGACY)
 item.gun_uzi_saturnite.name=Saturnite Uzi
 item.gun_uzi_saturnite_silencer.name=Saturnite Uzi with Silencer
diff --git a/src/main/resources/assets/hbm/textures/models/weapons/tesla_cannon.png b/src/main/resources/assets/hbm/textures/models/weapons/tesla_cannon.png
new file mode 100644
index 000000000..650db41b1
Binary files /dev/null and b/src/main/resources/assets/hbm/textures/models/weapons/tesla_cannon.png differ