cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-14 08:34:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Taser cleanup and fixes

Browse Source 
Fixes cloaking devices and deadman switches being included in taser code
somehow.

Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
This commit is contained in:
mwerezak
2014-07-31 13:40:23 -04:00
committed by ZomgPonies
parent fef301062e
commit ac0e3966d6
2 changed files with 57 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/stunbaton.dm
+1 -1
View File
@@ -186,7 +186,7 @@
H.Weaken(stunforce)
H.apply_effect(STUTTER, stunforce)
if (agony)
if (agonyforce)
//Siemens coefficient?
//TODO: Merge this with taser effects
H.apply_effect(agony,AGONY,0)