Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

2026-08-26 05:27:01 +01:00 · 2013-06-01 08:26:43 +04:00
parent 4749d6016d 08fb4d69f3
commit b2aeed8fba
30 changed files with 1413 additions and 1549 deletions
@@ -9,10 +9,15 @@
 /obj/item/projectile/energy/electrode
 	name = "electrode"
 	icon_state = "spark"
-	nodamage = 1
+	/* - Old taser bit
+	nodamage = 0
 	stun = 10
 	weaken = 10
 	stutter = 10
+	*/
+	damage = 40
+	damage_type = HALLOSS
+


 /obj/item/projectile/energy/declone