Fixes conflicts and commits

This commit is contained in:
Xhuis
2015-03-21 12:47:25 -04:00
parent bf91e83867
commit 7f6871c233
7 changed files with 24 additions and 1 deletions
@@ -109,6 +109,8 @@
//20% chance to actually hit the eyes
if(prob(effectchance * diode.rating) && C.flash_eyes(severity))
outmsg = "<span class='notice'>You blind [C] by shining [src] in their eyes.</span>"
if(C.weakeyes)
C.Stun(1)
else
outmsg = "<span class='notice'>You fail to blind [C] by shining [src] at their eyes.</span>"