Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate

code/modules/projectiles/ammunition.dm

@@ -201,7 +201,7 @@
 /proc/magazine_icondata_cache_add(var/obj/item/ammo_magazine/M)
 	var/list/icon_keys = list()
 	var/list/ammo_states = list()
-	var/list/states = icon_states(M.icon)
+	var/list/states = cached_icon_states(M.icon)
 	for(var/i = 0, i <= M.max_ammo, i++)
 		var/ammo_state = "[M.icon_state]-[i]"
 		if(ammo_state in states)

code/modules/projectiles/guns/energy/cell_loaded_vr/multi_cannon.dm

@@ -20,6 +20,7 @@
 	icon_override = 'icons/vore/custom_guns_vr.dmi'
 	item_state = "multicannon"
 	slot_flags = SLOT_BACK
+	recoil = FALSE
 
 /obj/item/weapon/gun/projectile/multi_cannon/update_icon()
 	. = ..()

code/modules/projectiles/guns/energy/cell_loaded_vr/multi_cannon_cells.dm

@@ -11,7 +11,7 @@
 	var/charge
 	var/max_charge = 10
 	var/ticks = 1
-	var/ticks_to_charge = 5 //10 secs per shot charged
+	var/ticks_to_charge = 15 //10 secs per shot charged
 
 /obj/item/ammo_casing/macrobattery/Initialize(mapload, ...)
 	. = ..()
@@ -77,7 +77,7 @@
 	name = "Macrobattery - LETHAL"
 	icon_state = "macrobat_ouchie"
 	bat_colour = "#cc3300"
-	projectile_type = /obj/item/projectile/beam
+	projectile_type = /obj/item/projectile/beam/heavylaser/lessheavy
 
 /obj/item/ammo_casing/macrobattery/healie
 	name = "Macrobattery - RESTORE"
@@ -97,4 +97,8 @@
 		target.adjustToxLoss(-15)
 		target.radiation = max(target.radiation - 75, 0) //worse than mlem for rad, better for tox.
 	else
-		return 1
+		return 1
+
+/obj/item/projectile/beam/heavylaser/lessheavy //all bark. no (or little) bite.
+	damage = 15
+	fire_sound = 'sound/weapons/Gunshot_cannon.ogg'