Merge resolution.

This commit is contained in:
Zuhayr
2013-07-26 23:17:48 -07:00
17 changed files with 2534 additions and 2397 deletions
+1 -1
View File
@@ -998,7 +998,7 @@
sleeping = max(sleeping-1, 0)
blinded = 1
stat = UNCONSCIOUS
if( prob(10) && health && !hal_crit )
if( prob(2) && health && !hal_crit )
spawn(0)
emote("snore")
else if(resting)