Merge pull request #1328 from Miniature/master

Made capwhatever not do damage to soghun
This commit is contained in:
SkyMarshal
2012-06-21 02:05:09 -07:00

View File

@@ -1931,6 +1931,7 @@ datum
if(!M) M = holder.my_atom
M:bodytemperature += 5
if(prob(40) && !istype(M, /mob/living/carbon/metroid))
if( !( istype( M, /mob/living/carbon/human ) && M:mutantrace == "lizard" ) ) //because sbiten are now a soghun drink, and sometimes there is some of this left over in the drink
M.apply_damage(1, BURN, pick("head", "chest"))
if(istype(M, /mob/living/carbon/metroid))