From 13caea984f8d29facebfe782459ad16c6155f179 Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Mon, 23 Sep 2013 06:20:14 -0400 Subject: [PATCH] Lightning glove balancing --- code/game/atoms.dm | 16 ++++++++-------- code/modules/mob/living/living_defense.dm | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 20cf252ac55..5f0952c4a1e 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -1163,7 +1163,7 @@ var/using_new_click_proc = 0 //TODO ERRORAGE (This is temporary, while the DblCl src.hand_al(usr, usr.hand) else // ------- YOU ARE CLICKING ON AN OBJECT THAT'S INACCESSIBLE TO YOU AND IS NOT YOUR HUD ------- - if((istype(usr:gloves, /obj/item/clothing/gloves/yellow/power)) && usr:a_intent == "hurt" && world.time >= usr.next_move) + if(ishuman(usr) && (istype(usr:gloves, /obj/item/clothing/gloves/yellow/power)) && usr:a_intent == "hurt" && world.time >= usr.next_move) var/obj/item/clothing/gloves/yellow/power/G = usr:gloves var/time = 100 var/turf/T = get_turf(usr) @@ -1182,23 +1182,23 @@ var/using_new_click_proc = 0 //TODO ERRORAGE (This is temporary, while the DblCl var/obj/item/projectile/beam/lightning/A = new /obj/item/projectile/beam/lightning/( usr.loc ) if(PN) available = PN.avail - A.damage = PN.get_electrocute_damage() + 10 + A.damage = PN.get_electrocute_damage() if(available >= 4500000) A.damage = 205 if(A.damage >= 200) usr:apply_damage(15, BURN, (usr:hand ? "l_hand" : "r_hand")) - usr:Stun(10) - usr:Weaken(10) + usr:Stun(20) + usr:Weaken(20) if(usr:status_flags & CANSTUN) // stun is usually associated with stutter - usr:stuttering += 15 + usr:stuttering += 20 time = 200 usr << "[G] overload from the massive current shocking you in the process!" else if(A.damage >= 100) usr:apply_damage(5, BURN, (usr:hand ? "l_hand" : "r_hand")) - usr:Stun(5) - usr:Weaken(5) + usr:Stun(10) + usr:Weaken(10) if(usr:status_flags & CANSTUN) // stun is usually associated with stutter - usr:stuttering += 5 + usr:stuttering += 10 time = 150 usr << "[G] overload from the massive current shocking you in the process!" var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 939c2b9c1ec..6a1c11587ec 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -60,7 +60,7 @@ apply_damage((P.damage/(absorb+1)), P.damage_type, def_zone, absorb, 0, P) P.on_hit(src, absorb) if(istype(P, /obj/item/projectile/beam/lightning)) - if(src.health <= -100) + if(P.damage >= 200) src.dust() return absorb