cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-07-12 23:52:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/Baystation12/Baystation12

Browse Source
This commit is contained in:
Ren Erthilo
2012-03-28 22:25:07 +01:00
parent 276fc39010 3c3231d061
commit da7244abda
6 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/item.dm
+1 -1
View File
@@ -274,7 +274,7 @@ mob/proc/flash_weak_pain()
spawn
unmoved = do_after(user, 4)
sleep(4)
if( (!unmoved && !prob(70)) || get_dist(user, M) != 1)
if( (!unmoved && !prob(70)) || (get_dist(user, M) != 1 && user != M))
user.visible_message("\red [user.name] misses with \the [src]!")
return