shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13303 from Citadel-Station-13/silicons-patch-27

Browse Source 
combat defibs now hit for disarm + 35 stamina (old stunbaton values) instead of disarm + 75 stamina
This commit is contained in:
BlackMajor
2020-09-06 18:03:59 +12:00
committed by GitHub
parent f12a9ccefb bbb5c076c5
commit 63b1bfd45c
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/defib.dm
+1 -2
View File
@@ -445,8 +445,7 @@
if(do_after(user, isnull(defib?.disarm_shock_time)? disarm_shock_time : defib.disarm_shock_time, target = M))
M.visible_message("<span class='danger'>[user] zaps [M] with [src]!</span>", \
"<span class='userdanger'>[user] zaps [M] with [src]!</span>")
M.adjustStaminaLoss(50)
M.DefaultCombatKnockdown(100)
M.DefaultCombatKnockdown(140)
M.updatehealth() //forces health update before next life tick
playsound(src, 'sound/machines/defib_zap.ogg', 50, 1, -1)
M.emote("gasp")