diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm index 07d70bfc4b7..89bdd405b93 100644 --- a/code/game/turfs/open.dm +++ b/code/game/turfs/open.dm @@ -119,8 +119,10 @@ step(C, olddir) C.spin(1,1) else if(lube&SLIDE_ICE) + C.slipping = TRUE spawn(1) step(C, olddir) + 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 diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 2ac3753795c..31136f8ab02 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -666,8 +666,8 @@ if (AM.density && AM.anchored) pressure_resistance_prob_delta -= 20 break - - ..(pressure_difference, direction, pressure_resistance_prob_delta) + if(!slipping) + ..(pressure_difference, direction, pressure_resistance_prob_delta) /mob/living/verb/resist() set name = "Resist" diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm index 83103ebf337..71fecbb33a2 100644 --- a/code/modules/mob/living/living_defines.dm +++ b/code/modules/mob/living/living_defines.dm @@ -71,3 +71,5 @@ 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