cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev-freeze' into dev

Browse Source 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/projectiles/guns/energy/stun.dm
	code/modules/projectiles/guns/projectile/pistol.dm
	code/modules/projectiles/guns/projectile/revolver.dm
This commit is contained in:
PsiOmegaDelta
2015-06-20 20:40:06 +02:00
parent 82aa88c777 af59dbab55
commit 405131a54e
26 changed files with 811 additions and 792 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/projectiles/projectile/energy.dm
View File

@@ -44,11 +44,6 @@
name = "electrode"
icon_state = "spark"
nodamage = 1
/*
stun = 10
weaken = 10
stutter = 10
*/
taser_effect = 1
agony = 40
damage_type = HALLOSS