From 0eed06bcc9907a9b6025f08d4ae18e9039b2f965 Mon Sep 17 00:00:00 2001 From: alex-gh Date: Mon, 2 Jun 2014 09:49:58 +0200 Subject: [PATCH 1/2] Stunbeams should no longer destroy computers --- code/modules/projectiles/projectile/beams.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 24cbc49a95c..24e800fe074 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/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 From 5555974634c640ca761495ebed0d7f661f03a2a2 Mon Sep 17 00:00:00 2001 From: alex-gh Date: Mon, 2 Jun 2014 09:53:30 +0200 Subject: [PATCH 2/2] Stunbeams should be effective against janicarts again --- code/game/objects/structures/janicart.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index 31f8cae721e..ce96dc510a4 100644 --- a/code/game/objects/structures/janicart.dm +++ b/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("The [src.name] absorbs the [Proj]")