Merge branch 'master' of https://github.com/tgstation/-tg-station into goofmos

Conflicts:
	code/game/turfs/open.dm
	code/modules/mob/living/living_defines.dm

code/game/turfs/open.dm

@@ -145,7 +145,7 @@
 			C.slipping = TRUE
 			spawn(1)
 				step(C, olddir)
-			C.slipping = FALSE
+				C.slipping = FALSE
 		return 1
 
 /turf/open/proc/MakeSlippery(wet_setting = TURF_WET_WATER, min_wet_time = 0, wet_time_to_add = 0) // 1 = Water, 2 = Lube, 3 = Ice, 4 = Permafrost, 5 = Slide

code/modules/mob/living/living_defines.dm

@@ -71,5 +71,7 @@
 
 	var/blood_volume = 0 //how much blood the mob has
 	var/obj/effect/proc_holder/ranged_ability //Any ranged ability the mob has, as a click override
+	
+	var/slipping = FALSE
 
 	var/slipping = FALSE