Merge pull request #256 from Miniature/master

fix runtimes in disposals pipes and seed making for a plant
whoever coded this should be shot
This commit is contained in:
Miniature
2012-01-09 16:28:31 -08:00
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -685,7 +685,7 @@
M.weakened += 4
M << "\red You're gonna remember that one in the morning!"
M:UpdateDamageIcon()
M:UpdateDamage()
//M:UpdateDamage() //doesnt fucking exist if you arent a blob
else
M.bruteloss += 4
if(prob(2))
@@ -739,7 +739,7 @@
H.active = 0
H.loc = src
return
if(T.intact && istype(T,/turf/simulated/floor)) //intact floor, pop the tile
if(istype(T,/turf/simulated/floor) && T.intact) //intact floor, pop the tile
var/turf/simulated/floor/F = T
//F.health = 100
F.burnt = 1