Merge pull request #8058 from deathride58/joggingslipresistance

Makes jogging let you avoid water slips, but only if you have less than 20% staminaloss
2019-03-10 13:43:05 -07:00
parent 598dee6440 7ece5aa1c3
commit 0652c32c23
1 changed files with 4 additions and 0 deletions
@@ -245,6 +245,10 @@
 				return 0
 			if(C.m_intent == MOVE_INTENT_WALK && (lube&NO_SLIP_WHEN_WALKING))
 				return 0
+			if(ishuman(C) && (lube&NO_SLIP_WHEN_WALKING))
+				var/mob/living/carbon/human/H = C
+				if(!H.sprinting && H.getStaminaLoss() >= 20)
+					return 0
 		if(!(lube&SLIDE_ICE))
 			to_chat(C, "<span class='notice'>You slipped[ O ? " on the [O.name]" : ""]!</span>")
 			playsound(C.loc, 'sound/misc/slip.ogg', 50, 1, -3)