Merge pull request #8856 from Citadel-Station-13/magrifles_again

Security Gun Rebalancing Electric Boogaloo - overhauls magrifles/magpistols, burst fire autorifles, nerfs laser carbines, resprites energy guns

code/modules/projectiles/guns/ballistic.dm

@@ -26,7 +26,6 @@
 	else
 		icon_state = "[initial(icon_state)][suppressed ? "-suppressed" : ""][sawn_off ? "-sawn" : ""]"
 
-
 /obj/item/gun/ballistic/process_chamber(empty_chamber = 1)
 	var/obj/item/ammo_casing/AC = chambered //Find chambered round
 	if(istype(AC)) //there's a chambered round

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

@@ -2,6 +2,7 @@
 	w_class = WEIGHT_CLASS_NORMAL
 	var/alarmed = 0
 	var/select = 1
+	var/automatic_burst_overlay = TRUE
 	can_suppress = TRUE
 	burst_size = 3
 	fire_delay = 2
@@ -19,10 +20,11 @@
 
 /obj/item/gun/ballistic/automatic/update_icon()
 	..()
-	if(!select)
-		add_overlay("[initial(icon_state)]semi")
-	if(select == 1)
-		add_overlay("[initial(icon_state)]burst")
+	if(automatic_burst_overlay)
+		if(!select)
+			add_overlay("[initial(icon_state)]semi")
+		if(select == 1)
+			add_overlay("[initial(icon_state)]burst")
 	icon_state = "[initial(icon_state)][magazine ? "-[magazine.max_ammo]" : ""][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]"
 
 /obj/item/gun/ballistic/automatic/attackby(obj/item/A, mob/user, params)
@@ -61,12 +63,10 @@
 	var/mob/living/carbon/human/user = usr
 	select = !select
 	if(!select)
-		burst_size = 1
-		fire_delay = 0
+		disable_burst()
 		to_chat(user, "<span class='notice'>You switch to semi-automatic.</span>")
 	else
-		burst_size = initial(burst_size)
-		fire_delay = initial(fire_delay)
+		enable_burst()
 		to_chat(user, "<span class='notice'>You switch to [burst_size]-rnd burst.</span>")
 
 	playsound(user, 'sound/weapons/empty.ogg', 100, 1)
@@ -75,6 +75,14 @@
 		var/datum/action/A = X
 		A.UpdateButtonIcon()
 
+/obj/item/gun/ballistic/automatic/proc/enable_burst()
+	burst_size = initial(burst_size)
+	fire_delay = initial(fire_delay)
+
+/obj/item/gun/ballistic/automatic/proc/disable_burst()
+	burst_size = 1
+	fire_delay = 0
+
 /obj/item/gun/ballistic/automatic/can_shoot()
 	return get_ammo()
 
@@ -109,7 +117,6 @@
 /obj/item/gun/ballistic/automatic/c20r/afterattack()
 	. = ..()
 	empty_alarm()
-	return
 
 /obj/item/gun/ballistic/automatic/c20r/update_icon()
 	..()
@@ -121,17 +128,25 @@
 	icon_state = "wt550"
 	item_state = "arg"
 	mag_type = /obj/item/ammo_box/magazine/wt550m9
-	fire_delay = 2
 	can_suppress = FALSE
-	burst_size = 0
-	actions_types = list()
+	burst_size = 2
+	fire_delay = 1
 	can_bayonet = TRUE
 	knife_x_offset = 25
 	knife_y_offset = 12
+	automatic_burst_overlay = FALSE
+
+/obj/item/gun/ballistic/automatic/wt550/enable_burst()
+	. = ..()
+	spread = 15
+
+/obj/item/gun/ballistic/automatic/wt550/disable_burst()
+	. = ..()
+	spread = 0
 
 /obj/item/gun/ballistic/automatic/wt550/update_icon()
 	..()
-	icon_state = "wt550[magazine ? "-[CEILING(get_ammo(0)/4, 1)*4]" : ""]"
+	icon_state = "wt550[magazine ? "-[CEILING((	(get_ammo(FALSE) / magazine.max_ammo) * 20) /4, 1)*4]" : "-0"]"	//Sprites only support up to 20.
 
 /obj/item/gun/ballistic/automatic/mini_uzi
 	name = "\improper Type U3 Uzi"