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

Merge pull request #6894 from VOREStation/upstream-merge-6825

Browse Source 
[MIRROR] Shock modification
This commit is contained in:
Novacat
2020-03-17 00:50:00 -04:00
committed by GitHub
parent 8d8c25dbbd c6e5099115
commit 6ff1e6231b
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/mob/living/carbon/carbon.dm
View File

@@ -105,7 +105,11 @@
if (shock_damage<1) if (shock_damage<1)
return 0 return 0
src.apply_damage(shock_damage, BURN, def_zone, used_weapon="Electrocution") src.apply_damage(0.2 * shock_damage, BURN, def_zone, used_weapon="Electrocution") //shock the target organ
src.apply_damage(0.4 * shock_damage, BURN, BP_TORSO, used_weapon="Electrocution") //shock the torso more
src.apply_damage(0.2 * shock_damage, BURN, null, used_weapon="Electrocution") //shock a random part!
src.apply_damage(0.2 * shock_damage, BURN, null, used_weapon="Electrocution") //shock a random part!
playsound(loc, "sparks", 50, 1, -1) playsound(loc, "sparks", 50, 1, -1)
if (shock_damage > 15) if (shock_damage > 15)
src.visible_message( src.visible_message(