From e13f8ce2fc98f7cc810a1b923a881abc9e414efa Mon Sep 17 00:00:00 2001 From: Iamgoofball Date: Thu, 1 Sep 2016 18:04:45 -0700 Subject: [PATCH 1/4] Hacky freon fixes pending the rework fixes the slip --- code/game/turfs/open.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm index 07d70bfc4b7..0b8947328ad 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 From b777e451ef130b53dc6ae0405d1abc83d737985b Mon Sep 17 00:00:00 2001 From: Iamgoofball Date: Thu, 1 Sep 2016 18:06:15 -0700 Subject: [PATCH 2/4] Update living.dm --- code/modules/mob/living/living.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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" From bd1bb7c22a04f1e5576913f5a9d56a2b7479bf09 Mon Sep 17 00:00:00 2001 From: Iamgoofball Date: Thu, 1 Sep 2016 18:06:47 -0700 Subject: [PATCH 3/4] Update living_defines.dm --- code/modules/mob/living/living_defines.dm | 2 ++ 1 file changed, 2 insertions(+) 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 From cbb73abb34474999ca2a0bc3d7d7f6ab37c409fa Mon Sep 17 00:00:00 2001 From: Iamgoofball Date: Thu, 1 Sep 2016 18:11:16 -0700 Subject: [PATCH 4/4] Update open.dm --- code/game/turfs/open.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm index 0b8947328ad..89bdd405b93 100644 --- a/code/game/turfs/open.dm +++ b/code/game/turfs/open.dm @@ -122,7 +122,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