Merge pull request #11769 from phil235/FixMutations

Some dna fixes
This commit is contained in:
Razharas
2015-09-15 22:31:59 +03:00
31 changed files with 968 additions and 961 deletions
-2
View File
@@ -333,7 +333,6 @@
"<span class='danger'>You hit the light, and it smashes!</span>", \
"<span class='italics'>You hear a tinkle of breaking glass.</span>")
if(on && (W.flags & CONDUCT))
//if(!user.mutations & COLD_RESISTANCE)
if (prob(12))
electrocute_mob(user, get_area(src), src, 0.3)
broken()
@@ -369,7 +368,6 @@
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(3, 1, src)
s.start()
//if(!user.mutations & COLD_RESISTANCE)
if (prob(75))
electrocute_mob(user, get_area(src), src, rand(0.7,1.0))