Merge pull request #1233 from Fox-McCloud/stun-balance

Stun+Weaken Balancing
This commit is contained in:
ZomgPonies
2015-06-01 15:20:19 -04:00
12 changed files with 25 additions and 28 deletions
+1 -1
View File
@@ -604,7 +604,7 @@
M.drop_item()
M.eye_blurry += 10
M.Paralyse(1)
M.Weaken(4)
M.Weaken(2)
if (eyes.damage >= eyes.min_broken_damage)
if(M.stat != 2)
M << "\red You go blind!"
@@ -109,7 +109,7 @@
s.set_up(3, 1, M)
s.start()
M.Weaken(10)
M.Weaken(5)
if(master)
master.receive_signal()
@@ -50,7 +50,7 @@
M.stop_pulling()
M << "\blue You slipped on the [name]!"
playsound(src.loc, 'sound/misc/slip.ogg', 50, 1, -3)
M.Stun(3)
M.Stun(4)
M.Weaken(2)
/obj/item/weapon/soap/afterattack(atom/target, mob/user as mob, proximity)
@@ -86,7 +86,7 @@
M.take_organ_damage(2) // Was 5 -- TLE
M << "\blue You slipped on \the [name]!"
playsound(src.loc, 'sound/misc/slip.ogg', 50, 1, -3)
M.Weaken(10)
M.Weaken(7)
M.take_overall_damage(0, burned)
throw_impact(atom/hit_atom)
@@ -126,14 +126,13 @@
playsound(get_turf(src), "swing_hit", 50, 1, -1)
if (M.stuttering < 8 && (!(HULK in M.mutations)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/)
M.stuttering = 8
M.Stun(8)
M.Weaken(8)
M.Weaken(3)
for(var/mob/O in viewers(M))
if (O.client) O.show_message("\red <B>[M] has been beaten with \the [src] by [user]!</B>", 1, "\red You hear someone fall", 2)
else
playsound(src.loc, 'sound/weapons/Genhit.ogg', 50, 1, -1)
M.Stun(5)
M.Weaken(5)
M.Stun(3)
M.Weaken(3)
M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been attacked with [src.name] by [user.name] ([user.ckey])</font>")
user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to attack [M.name] ([M.ckey])</font>")
log_attack("[user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])")
@@ -68,7 +68,6 @@
m.loc = get_turf(src)
del src
var/mob/living/T = M
T.Weaken(10)
T.apply_damage(20)
T.Weaken(5)
return
..()