Merge branch 'master' into spike-loot-differentces

code/modules/projectiles/ammunition/_ammunition.dm

@@ -16,7 +16,8 @@
 	var/variance = 0							//Variance for inaccuracy fundamental to the casing
 	var/randomspread = 0						//Randomspread for automatics
 	var/delay = 0								//Delay for energy weapons
-	var/click_cooldown_override = 0				//Override this to make your gun have a faster fire rate, in tenths of a second. 4 is the default gun cooldown.
+	/// Override this to make the gun check for a different cooldown rather than CLICK_CD_RANGE, which is 4 deciseconds.
+	var/click_cooldown_override
 	var/firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect	//the visual effect appearing when the ammo is fired.
 	var/heavy_metal = TRUE
 	var/harmful = TRUE //pacifism check for boolet, set to FALSE if bullet is non-lethal

code/modules/projectiles/ammunition/_firing.dm

@@ -1,21 +1,22 @@
 /obj/item/ammo_casing/proc/fire_casing(atom/target, mob/living/user, params, distro, quiet, zone_override, spread, atom/fired_from)
 	distro += variance
-	for (var/i = max(1, pellets), i > 0, i--)
-		var/targloc = get_turf(target)
-		ready_proj(target, user, quiet, zone_override, fired_from)
+	var/targloc = get_turf(target)
+	ready_proj(target, user, quiet, zone_override, fired_from)
+	if(pellets == 1)
 		if(distro) //We have to spread a pixel-precision bullet. throw_proj was called before so angles should exist by now...
 			if(randomspread)
 				spread = round((rand() - 0.5) * distro)
 			else //Smart spread
-				spread = round((i / pellets - 0.5) * distro)
+				spread = round(1 - 0.5) * distro
 		if(!throw_proj(target, targloc, user, params, spread))
-			return 0
-		if(i > 1)
-			newshot()
-	if(click_cooldown_override)
-		user.changeNext_move(click_cooldown_override)
+			return FALSE
 	else
-		user.changeNext_move(CLICK_CD_RANGE)
+		if(isnull(BB))
+			return FALSE
+		AddComponent(/datum/component/pellet_cloud, projectile_type, pellets)
+		SEND_SIGNAL(src, COMSIG_PELLET_CLOUD_INIT, target, user, fired_from, randomspread, spread, zone_override, params, distro)
+
+	user.DelayNextAction(considered_action = TRUE, immediate = FALSE)
 	user.newtonian_move(get_dir(target, user))
 	update_icon()
 	return 1
@@ -31,7 +32,7 @@
 	else
 		BB.def_zone = user.zone_selected
 	BB.suppressed = quiet
-	
+
 	if(isgun(fired_from))
 		var/obj/item/gun/G = fired_from
 		BB.damage *= G.projectile_damage_multiplier

code/modules/projectiles/ammunition/ballistic/lmg.dm

@@ -21,3 +21,16 @@
 	name = "1.95x129mm incendiary bullet casing"
 	desc = "A 1.95x129mm bullet casing designed with a chemical-filled capsule on the tip that when bursted, reacts with the atmosphere to produce a fireball, engulfing the target in flames."
 	projectile_type = /obj/item/projectile/bullet/incendiary/mm195x129
+
+/obj/item/ammo_casing/mm712x82/match
+	name = "7.12x82mm match bullet casing"
+	desc = "A 7.12x82mm bullet casing manufactured to unfailingly high standards, you could pull off some cool trickshots with this."
+	projectile_type = /obj/item/projectile/bullet/mm712x82_match
+
+/obj/item/projectile/bullet/mm712x82_match
+	name = "7.12x82mm match bullet"
+	damage = 40
+	ricochets_max = 2
+	ricochet_chance = 60
+	ricochet_auto_aim_range = 4
+	ricochet_incidence_leeway = 35

code/modules/projectiles/ammunition/ballistic/pistol.dm

@@ -51,17 +51,3 @@
 	desc = "A .50AE bullet casing."
 	caliber = ".50"
 	projectile_type = /obj/item/projectile/bullet/a50AE
-
-// .32 ACP (Improvised Pistol)
-
-/obj/item/ammo_casing/c32acp
-	name = ".32 bullet casing"
-	desc = "A .32 bullet casing."
-	caliber = "c32acp"
-	projectile_type = /obj/item/projectile/bullet/c32acp
-
-/obj/item/ammo_casing/r32acp
-	name = ".32 rubber bullet casing"
-	desc = "A .32 rubber bullet casing."
-	caliber = "c32acp"
-	projectile_type = /obj/item/projectile/bullet/r32acp

code/modules/projectiles/ammunition/ballistic/revolver.dm

@@ -11,6 +11,12 @@
 	desc = "A .357 armor-piercing bullet casing."
 	projectile_type = /obj/item/projectile/bullet/a357/ap
 
+/obj/item/ammo_casing/a357/match
+	name = ".357 match bullet casing"
+	desc = "A .357 bullet casing, manufactured to exceedingly high standards."
+	caliber = "357"
+	projectile_type = /obj/item/projectile/bullet/a357/match
+
 // 7.62x38mmR (Nagant Revolver)
 
 /obj/item/ammo_casing/n762
@@ -47,4 +53,19 @@
 	name = ".38 Iceblox bullet casing"
 	desc = "A .38 Iceblox bullet casing."
 	caliber = "38"
-	projectile_type = /obj/item/projectile/bullet/c38/iceblox
+	projectile_type = /obj/item/projectile/bullet/c38/iceblox
+
+/obj/item/ammo_casing/c38/match
+	name = ".38 Match bullet casing"
+	desc = "A .38 bullet casing, manufactured to exceedingly high standards."
+	projectile_type = /obj/item/projectile/bullet/c38/match
+
+/obj/item/ammo_casing/c38/match/bouncy
+	name = ".38 Rubber bullet casing"
+	desc = "A .38 rubber bullet casing, manufactured to exceedingly high standards."
+	projectile_type = /obj/item/projectile/bullet/c38/match/bouncy
+
+/obj/item/ammo_casing/c38/dumdum
+	name = ".38 DumDum bullet casing"
+	desc = "A .38 DumDum bullet casing."
+	projectile_type = /obj/item/projectile/bullet/c38/dumdum

code/modules/projectiles/ammunition/ballistic/shotgun.dm

@@ -8,6 +8,18 @@
 	projectile_type = /obj/item/projectile/bullet/shotgun_slug
 	custom_materials = list(/datum/material/iron=4000)
 
+obj/item/ammo_casing/shotgun/executioner
+	name = "executioner slug"
+	desc = "A 12 gauge lead slug purpose built to annihilate flesh on impact."
+	icon_state = "stunshell"
+	projectile_type = /obj/item/projectile/bullet/shotgun_slug/executioner
+
+/obj/item/ammo_casing/shotgun/pulverizer
+	name = "pulverizer slug"
+	desc = "A 12 gauge lead slug purpose built to annihilate bones on impact."
+	icon_state = "stunshell"
+	projectile_type = /obj/item/projectile/bullet/shotgun_slug/pulverizer
+
 /obj/item/ammo_casing/shotgun/beanbag
 	name = "beanbag slug"
 	desc = "A weak beanbag slug for riot control."
@@ -143,3 +155,12 @@
 	reagents.add_reagent(/datum/reagent/toxin/acid/fluacid, 5) //this and the acid equal about 25ish burn, not counting the minute toxin damage dealt by their metabolism, this makes each dart about as lethal as a stechkin shot in upfront damage
 	reagents.add_reagent(/datum/reagent/toxin/acid, 5)
 	reagents.add_reagent(/datum/reagent/consumable/frostoil, 10) //tempgun slowdown goes both ways and adds to the burn
+
+/obj/item/ammo_casing/shotgun/incapacitate
+	name = "custom incapacitating shot"
+	desc = "A shotgun casing filled with... something. used to incapacitate targets."
+	icon_state = "bountyshell"
+	projectile_type = /obj/item/projectile/bullet/pellet/shotgun_incapacitate
+	pellets = 12//double the pellets, but half the stun power of each, which makes this best for just dumping right in someone's face.
+	variance = 25
+	custom_materials = list(/datum/material/iron=4000)

code/modules/projectiles/ammunition/energy/laser.dm

@@ -12,15 +12,6 @@
 	e_cost = 200
 	select_name = "kill"
 
-/obj/item/ammo_casing/energy/lasergun/improvised
-	projectile_type = /obj/item/projectile/beam/weak/improvised
-	e_cost = 200
-	select_name = "kill"
-
-/obj/item/ammo_casing/energy/lasergun/improvised/upgraded
-	projectile_type = /obj/item/projectile/beam/weak
-	e_cost = 100
-
 /obj/item/ammo_casing/energy/laser/hos
 	e_cost = 100
 
@@ -46,6 +37,11 @@
 	select_name = "anti-vehicle"
 	fire_sound = 'sound/weapons/lasercannonfire.ogg'
 
+/obj/item/ammo_casing/energy/laser/hellfire
+	projectile_type = /obj/item/projectile/beam/laser/hellfire
+	e_cost = 130
+	select_name = "maim"
+
 /obj/item/ammo_casing/energy/laser/pulse
 	projectile_type = /obj/item/projectile/beam/pulse
 	e_cost = 200

code/modules/projectiles/ammunition/energy/special.dm

@@ -75,4 +75,9 @@
 /obj/item/ammo_casing/energy/shrink
 	projectile_type = /obj/item/projectile/beam/shrink
 	select_name = "shrink ray"
-	e_cost = 200
+	e_cost = 200
+
+/obj/item/ammo_casing/energy/pickle //ammo for an adminspawn gun
+	projectile_type = /obj/item/projectile/energy/pickle
+	select_name = "pickle ray"
+	e_cost = 0