cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-01-30 02:45:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Makes the gloves actually stun people.

Browse Source
This commit is contained in:
Useroth
2019-04-28 07:05:18 +02:00
parent df15e53cd3
commit 231da023ec
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/ninja/suit/gloves.dm
View File

@@ -37,6 +37,8 @@
var/mindrain = 200
var/maxdrain = 400
var/stunforce = 140 //same as stunbaton, adjustable
/obj/item/clothing/gloves/space_ninja/Touch(atom/A,proximity)
if(!candrain || draining)

15
code/modules/ninja/suit/ninjaDrainAct.dm
View File

@@ -262,3 +262,18 @@ They *could* go in their appropriate files, but this is supposed to be modular
playsound(src, "sparks", 50, 1)
visible_message("<span class='danger'>[H] electrocutes [src] with [H.p_their()] touch!</span>", "<span class='userdanger'>[H] electrocutes you with [H.p_their()] touch!</span>")
electrocute_act(25, H)
src.Knockdown(G.stunforce)
src.adjustStaminaLoss(G.stunforce*0.1, affected_zone = (istype(H) ? H.zone_selected : BODY_ZONE_CHEST))
src.apply_effect(EFFECT_STUTTER, G.stunforce)
SEND_SIGNAL(src, COMSIG_LIVING_MINOR_SHOCK)
src.lastattacker = H.real_name
src.lastattackerckey = H.ckey
log_combat(H, src, "stunned")
playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1)
if(ishuman(src))
var/mob/living/carbon/human/Hsrc = src
Hsrc.forcesay(GLOB.hit_appends)