commit for grenade launcher moving

code/modules/projectiles/ammunition.dm

@@ -100,7 +100,7 @@
 			AC.loc = src
 			num_loaded++
 	if(num_loaded)
-		if (!silent)
+		if(!silent)
 			user << "<span class='notice'>You load [num_loaded] shell\s into \the [src]!</span>"
 		A.update_icon()
 		update_icon()

code/modules/projectiles/ammunition/magazines.dm

@@ -80,7 +80,10 @@
 	ammo_type = /obj/item/ammo_casing/a40mm
 	caliber = "a40mm"
 	max_ammo = 1
-	multiload = 0
+
+/obj/item/ammo_box/magazine/internal/cylinder/grenadelauncher/multi
+	ammo_type = /obj/item/ammo_casing/a40mm
+	max_ammo = 6
 
 ///////////EXTERNAL MAGAZINES////////////////
 /obj/item/ammo_box/magazine/m9mm

code/modules/projectiles/guns/projectile/automatic.dm

@@ -169,9 +169,12 @@
 	return new /obj/item/weapon/gun/projectile/revolver/grenadelauncher(src)
 
 /obj/item/weapon/gun/projectile/automatic/c90gl/afterattack()
-	..()
-	empty_alarm()
-	return
+	if(select)
+		..()
+		empty_alarm()
+		return
+	else
+		underbarrel.afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, flag, params)
 
 /obj/item/weapon/gun/projectile/automatic/c90gl/update_icon()
 	..()

code/modules/projectiles/guns/projectile/revolver.dm

@@ -224,10 +224,3 @@
 					user.visible_message("<span class='danger'>*click*</span>", "<span class='danger'>*click*</span>")
 					return
 	..()
-
-/obj/item/weapon/gun/projectile/revolver/grenadelauncher //this is only used for underbarrel grenade launchers at the moment, but admins can still spawn it if they feel like being assholes
-	desc = "A break-operated grenade launcher."
-	name = "grenade launcher"
-	icon_state = "dshotgun-sawn"
-	mag_type = /obj/item/ammo_box/magazine/internal/cylinder/grenadelauncher
-

code/modules/projectiles/guns/projectile/shotgun.dm

@@ -150,4 +150,4 @@
 			update_icon()
 		else
 			user << "<span class='warning'>You need at least ten lengths of cable if you want to make a sling.</span>"
-			return
+			return

code/modules/projectiles/projectile/special.dm

@@ -31,7 +31,7 @@
 	flag = "bullet"
 
 /obj/item/projectile/bullet/a40mm/on_hit(atom/target, blocked = 0)
-	explosion(target, -1, 0, 4)
+	explosion(target, -1, 0, 2)
 	return 1
 
 /obj/item/projectile/temp

tgstation.dme

@@ -1233,6 +1233,7 @@
 #include "code\modules\projectiles\guns\magic\staff.dm"
 #include "code\modules\projectiles\guns\magic\wand.dm"
 #include "code\modules\projectiles\guns\projectile\automatic.dm"
+#include "code\modules\projectiles\guns\projectile\launchers.dm"
 #include "code\modules\projectiles\guns\projectile\pistol.dm"
 #include "code\modules\projectiles\guns\projectile\revolver.dm"
 #include "code\modules\projectiles\guns\projectile\shotgun.dm"