Merge pull request #20272 from Iamgoofball/patch-122

Hacky freon fixes pending the rework
This commit is contained in:
Joan Lung
2016-09-02 18:46:15 -04:00
committed by GitHub
3 changed files with 6 additions and 2 deletions
+2
View File
@@ -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
+2 -2
View File
@@ -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"
@@ -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