Merge fix

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

@@ -128,7 +128,7 @@
 	name = "\improper M-90gl Carbine"
 	desc = "A three-round burst 5.56 toploading carbine, designated 'M-90gl'. Has an attached underbarrel grenade launcher which can be toggled on and off."
 	icon_state = "m90"
-	item_state = "m90"
+	item_state = "m90-4"
 	origin_tech = "combat=5;materials=2;syndicate=6"
 	mag_type = /obj/item/ammo_box/magazine/m556
 	fire_sound = 'sound/weapons/Gunshot_smg.ogg'
@@ -168,6 +168,11 @@
 		if(2)
 			overlays += "[initial(icon_state)]gren"
 	icon_state = "[initial(icon_state)][magazine ? "" : "-e"]"
+	if(magazine)
+		overlays += image(icon = icon, icon_state = "m90-[Ceiling(get_ammo(0)/6)*6]")
+		item_state = "m90-[Ceiling(get_ammo(0)/7.5)]"
+	else
+		item_state = "m90-0"
 	return
 
 /obj/item/weapon/gun/projectile/automatic/m90/burst_select()

code/modules/projectiles/projectile/magic.dm

@@ -27,7 +27,11 @@
 /obj/item/projectile/magic/death/on_hit(var/mob/living/carbon/G)
 	. = ..()
 	if(isliving(G))
-		G.adjustFireLoss(3000)
+		if(G.get_species() == "Machine") //speshul snowfleks deserv speshul treetment
+			G.adjustFireLoss(6969)  //remember - slimes love fire
+		else
+			G.death()
+
 		visible_message("<span class='danger'>[G] topples backwards as the death bolt impacts them!</span>")
 
 /obj/item/projectile/magic/fireball/Range()
@@ -293,4 +297,4 @@ proc/wabbajack(mob/living/M)
 	damage_type = BURN
 	flag = "magic"
 	dismemberment = 50
-	nodamage = 0
+	nodamage = 0