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

2026-08-25 04:57:12 +01:00 · 2014-06-02 13:45:13 -04:00
parent 7e1ba654e3 d95c29a867
commit 9d0f4680fc
2 changed files with 2 additions and 1 deletions
@@ -396,5 +396,6 @@ var/list/beam_master = list()
 	name = "stun beam"
 	icon_state = "stun"
 	nodamage = 1
+	damage = 0
 	agony = 40
 	damage_type = HALLOSS