Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos

2021-06-21 02:19:51 -07:00
parent e65f13637d 19e44efef1
commit f77495f45d
194 changed files with 13560 additions and 2048 deletions
@@ -277,7 +277,7 @@
 		if(lube & NO_SLIP_WHEN_WALKING)
 			if(C.m_intent == MOVE_INTENT_WALK)
 				return FALSE
-			if(ishuman(C) && !(lube & SLIP_WHEN_JOGGING))
+			if(ishuman(C) && !(lube & SLIP_WHEN_JOGGING) && CONFIG_GET(flag/sprint_enabled))
 				var/mob/living/carbon/human/H = C
 				if(!(H.combat_flags & COMBAT_FLAG_SPRINT_ACTIVE) && H.getStaminaLoss() <= 20)
 					return FALSE