Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode

Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/obj/gun.dmi

code/modules/projectiles/projectile/bullets.dm

@@ -16,6 +16,8 @@
 	damage = 15
 	stamina = 50
 
+/obj/item/projectile/bullet/weakbullet3
+	damage = 20
 
 /obj/item/projectile/bullet/pellet
 	name = "pellet"
@@ -28,25 +30,14 @@
 	damage = 20
 	stamina = 50
 
-
 /obj/item/projectile/bullet/midbullet2
 	damage = 25
 
-
-/obj/item/projectile/bullet/midbullet3 //Only used with the Stechkin Pistol - RobRichards
+/obj/item/projectile/bullet/midbullet3
 	damage = 30
 
-
-/obj/item/projectile/bullet/suffocationbullet//How does this even work?
-	name = "co bullet"
-	damage = 20
-	damage_type = OXY
-
-
-/obj/item/projectile/bullet/cyanideround
-	name = "poison bullet"
-	damage = 40
-	damage_type = TOX
+/obj/item/projectile/bullet/heavybullet
+	damage = 35
 
 
 /obj/item/projectile/bullet/stunshot
@@ -55,11 +46,6 @@
 	stamina = 50
 	stutter = 5
 
-
-/obj/item/projectile/bullet/a762
-	damage = 25
-
-
 /obj/item/projectile/bullet/incendiary
 
 /obj/item/projectile/bullet/incendiary/on_hit(var/atom/target, var/blocked = 0)

code/modules/projectiles/projectile/special.dm

@@ -23,6 +23,17 @@
 	explosion(target, -1, 0, 2)
 	return 1
 
+/obj/item/projectile/bullet/a40mm
+	name ="40mm grenade"
+	desc = "USE A WEEL GUN"
+	icon_state= "bolter"
+	damage = 60
+	flag = "bullet"
+
+/obj/item/projectile/bullet/a40mm/on_hit(atom/target, blocked = 0)
+	explosion(target, -1, 0, 2, 1, 0, flame_range = 3)
+	return 1
+
 /obj/item/projectile/temp
 	name = "freeze beam"
 	icon_state = "ice_2"