From 8a5b09c5399db4c2a2d5bb2fc95fb1aed5eb2b19 Mon Sep 17 00:00:00 2001
From: Yoshax <yoshax23@gmail.com>
Date: Wed, 25 Jan 2017 20:33:11 +0000
Subject: [PATCH] Fixes slipping + lube

---
 code/game/turfs/simulated.dm                  | 4 ++--
 code/modules/mob/living/carbon/carbon.dm      | 1 -
 code/modules/mob/living/carbon/human/human.dm | 3 ++-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm
index 4172457b1f..0b2da66927 100644
--- a/code/game/turfs/simulated.dm
+++ b/code/game/turfs/simulated.dm
@@ -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
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index b0110137f1..204730a8e8 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -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
 
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 30725ee8a1..5625d341b7 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -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"