Merge remote-tracking branch 'upstream/dev-freeze' into dev

This commit is contained in:
PsiOmegaDelta
2015-06-09 12:14:35 +02:00
7 changed files with 62 additions and 38 deletions

View File

@@ -50,7 +50,7 @@
return
if(!affects_dead && M.stat == DEAD)
return
if(overdose && (location == CHEM_BLOOD))
if(overdose && (dose > overdose) && (location == CHEM_BLOOD))
overdose(M, alien)
var/removed = metabolism
if(ingest_met && (location == CHEM_INGEST))