Merge branch 'master' of https://github.com/ZomgPonies/Paradise

code/game/objects/structures/janicart.dm

@@ -224,7 +224,7 @@
 				if(istype(Proj, /obj/item/projectile/energy))
 					unbuckle()
 			return
-		if(istype(Proj, /obj/item/projectile/energy/electrode))
+		if(istype(Proj, /obj/item/projectile/energy/electrode) || istype(Proj, /obj/item/projectile/beam/stun))
 			if(prob(25))
 				unbuckle()
 				visible_message("<span class='warning'>The [src.name] absorbs the [Proj]")

code/modules/projectiles/projectile/beams.dm

@@ -396,5 +396,6 @@ var/list/beam_master = list()
 	name = "stun beam"
 	icon_state = "stun"
 	nodamage = 1
+	damage = 0
 	agony = 40
 	damage_type = HALLOSS