Fixes slipping + lube

This commit is contained in:
Yoshax
2017-01-25 20:33:11 +00:00
parent bc0d507999
commit 8a5b09c539
3 changed files with 4 additions and 4 deletions
+2 -2
View File
@@ -147,8 +147,8 @@
slip_stun = 4
slip_dist = 2
if(M.slip("the [floor_type] floor",slip_stun))
for(var/i = 0;i<slip_dist;i++)
if(M.slip("the [floor_type] floor", slip_stun))
for(var/i = 1 to slip_dist)
step(M, M.dir)
sleep(1)
else
-1
View File
@@ -437,7 +437,6 @@
stop_pulling()
src << "<span class='warning'>You slipped on [slipped_on]!</span>"
playsound(src.loc, 'sound/misc/slip.ogg', 50, 1, -3)
Stun(stun_duration)
Weaken(Floor(stun_duration/2))
return 1
@@ -1315,7 +1315,8 @@
/mob/living/carbon/human/slip(var/slipped_on, stun_duration=8)
if((species.flags & NO_SLIP) || (shoes && (shoes.item_flags & NOSLIP)))
return 0
..(slipped_on,stun_duration)
if(..(slipped_on,stun_duration))
return 1
/mob/living/carbon/human/proc/undislocate()
set category = "Object"