Adds siemens_coefficient handling to stun batons

This commit is contained in:
mwerezak
2014-07-31 15:38:56 -04:00
parent 9bfb4642a2
commit c8cccb64f6
2 changed files with 28 additions and 6 deletions
+14 -6
View File
@@ -108,12 +108,14 @@
return
var/agony = agonyforce
var/stun = stunforce
var/mob/living/L = M
var/contact = 1
if(user.a_intent == "harm")
contact = ..()
agony *= 0.5 //whacking someone causes a much poorer contact than prodding them.
stun *= 0.5
else
//copied from human_defense.dm
if (ishuman(L))
@@ -145,14 +147,20 @@
if (contact)
msg_admin_attack("[key_name(user)] attempted to stun [key_name(L)] with the [src].")
if (stunforce)
L.Stun(stunforce)
L.Weaken(stunforce)
L.apply_effect(STUTTER, stunforce)
if (ishuman(L))
var/mob/living/carbon/human/H = L
var/datum/organ/external/affected = get_organ(def_zone)
var/siemens_coeff = H.get_siemens_coefficient_organ(affected)
stun *= siemens_coeff
agony *= siemens_coeff
if (stun)
L.Stun(stun)
L.Weaken(stun)
L.apply_effect(STUTTER, stun)
if (agony)
//Siemens coefficient?
//TODO: Merge this with taser effects
//perhaps this could be merged with taser effects?
L.apply_effect(agony,AGONY,0)
L.apply_effect(STUTTER, agony/10)
L.apply_effect(EYE_BLUR, agony/10)