cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-07-12 23:52:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev

Browse Source 
Conflicts:
	baystation12.dme
	code/modules/projectiles/ammunition/bullets.dm
This commit is contained in:
Erthilo
2013-09-02 23:32:33 +01:00
parent 33e17c6925 4cb945d921
commit 3b61ba850f
146 changed files with 287 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/disease.dm
+11 -7
View File
@@ -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