From 497b050488385489e07026fa3a2d9f63c602ff99 Mon Sep 17 00:00:00 2001 From: ZipIce Date: Sun, 1 Sep 2013 23:42:35 -0700 Subject: [PATCH] Update disease.dm This will remove some run-time errors, allowing disease to work when the mob has no reagents (new players and simple animals). --- code/datums/disease.dm | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/code/datums/disease.dm b/code/datums/disease.dm index 68c1bf105d3..93aa14f19b3 100644 --- a/code/datums/disease.dm +++ b/code/datums/disease.dm @@ -91,10 +91,13 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease for(var/C_list in cure_list) if(istype(C_list, /list)) for(var/C_id in cure_id) - if(!affected_mob.reagents.has_reagent(C_id)) + if(affected_mob.reagents != null) result = 0 - else if(!affected_mob.reagents.has_reagent(C_list)) - result = 0 + else if(!affected_mob.reagents.has_reagent(C_id)) + result = 0 + else if(affected_mob.reagents != null) + if(!affected_mob.reagents.has_reagent(C_list)) + result = 0 return result @@ -123,10 +126,11 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease source = affected_mob else //no source and no mob affected. Rogue disease. Break return - - if(affected_mob) - if(affected_mob.reagents.has_reagent("spaceacillin")) - return // Don't spread if we have spaceacillin in our system. + + if(affected_mob.reagents != null) + if(affected_mob) + if(affected_mob.reagents.has_reagent("spaceacillin")) + return // Don't spread if we have spaceacillin in our system. var/check_range = airborne_range//defaults to airborne - range 2