cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1328 from Miniature/master

Browse Source 
Made capwhatever not do damage to soghun
This commit is contained in:
SkyMarshal
2012-06-21 02:05:09 -07:00
parent 33bfd09f09 cfb758228f
commit 94cd09fe4c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/chemical/Chemistry-Reagents.dm
View File

@@ -1931,7 +1931,8 @@ datum
if(!M) M = holder.my_atom
M:bodytemperature += 5
if(prob(40) && !istype(M, /mob/living/carbon/metroid))
M.apply_damage(1, BURN, pick("head", "chest"))
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))
M:bodytemperature += rand(5,20)