Skip to content

Commit

Permalink
-Added a check to see if you're on turf before trying to spread a dis…
Browse files Browse the repository at this point in the history
…ease to someone.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5023 316c924e-a436-60f5-8080-3fe189b3f50e
  • Loading branch information
[email protected] committed Nov 7, 2012
1 parent dad9357 commit 5868952
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
8 changes: 5 additions & 3 deletions code/datums/disease.dm
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,11 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease
if(how_spread != AIRBORNE && how_spread != SPECIAL)
check_range = 1 // everything else, like infect-on-contact things, only infect things on top of it

for(var/mob/living/carbon/M in oview(check_range, source))
if(AStar(affected_mob.loc, M.loc, /turf/proc/AdjacentTurfs, /turf/proc/Distance, check_range))
M.contract_disease(src)
if(isturf(affected_mob.loc))
for(var/mob/living/carbon/M in oview(check_range, source))
if(isturf(M.loc))
if(AStar(affected_mob.loc, M.loc, /turf/proc/AdjacentTurfs, /turf/proc/Distance, check_range))
M.contract_disease(src)

return

Expand Down
2 changes: 1 addition & 1 deletion code/datums/diseases/advance/advance.dm
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ var/list/archive_diseases = list()
symptoms += S
return

// Simply removes the symptom and refreshes.
// Simply removes the symptom.
/datum/disease/advance/proc/RemoveSymptom(var/datum/symptom/S)
symptoms -= S
return
Expand Down

0 comments on commit 5868952

Please sign in to comment.