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 -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