From 59c09088c09c830f3e8439c1e34fbfe330c4da89 Mon Sep 17 00:00:00 2001 From: "vageyenaman@gmail.com" Date: Tue, 5 Jul 2011 22:30:59 +0000 Subject: [PATCH] Viruses: Oh god, ALL viruses spread through blood contact! This is not good because robot nanites and alien embryo are "SPECIAL" contagions but are still VIRUSES, so they're spread through blood. This is not okay! Metroids: Quick edit - they don't attack metroid men (this is a mutant race) anymore. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1778 316c924e-a436-60f5-8080-3fe189b3f50e --- code/datums/disease.dm | 2 +- code/modules/mob/living/carbon/metroid/life.dm | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/code/datums/disease.dm b/code/datums/disease.dm index a7c59cc3de..af7746eede 100644 --- a/code/datums/disease.dm +++ b/code/datums/disease.dm @@ -287,7 +287,7 @@ to null does not delete the object itself. Thank you. var/check_range = AIRBORNE//defaults to airborne - range 4 - if(spread_type != AIRBORNE) + if(spread_type != AIRBORNE && spread_type != SPECIAL) check_range = 0 // everything else, like infect-on-contact things, only infect things on top of it for(var/mob/living/carbon/M in oviewers(check_range, source)) diff --git a/code/modules/mob/living/carbon/metroid/life.dm b/code/modules/mob/living/carbon/metroid/life.dm index 9560b8b070..e2f3470fd5 100644 --- a/code/modules/mob/living/carbon/metroid/life.dm +++ b/code/modules/mob/living/carbon/metroid/life.dm @@ -86,19 +86,23 @@ if(!istype(C, /mob/living/carbon/metroid)) // does not eat his bros! BROSBROSBROSBROS if(C.stat != 2 && C.health > 0) // chooses only healthy targets var/notarget = 0 + if(istype(C, /mob/living/carbon/human)) + var/mob/living/carbon/human/H = C + if(H.mutantrace == "metroid") + notarget = 1 // don't hurt metroidmen! + if(!C.canmove) for(var/mob/living/carbon/metroid/M in view(1,C)) if(M.Victim == C) notarget = 1 break // They don't go for prey already being eaten - - if(!notarget) targets += C + if((hungry || starving) && targets.len > 0) if(!istype(src, /mob/living/carbon/metroid/adult)) if(!starving)