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

This commit is contained in:
Ccomp5950
2014-03-04 18:29:03 -06:00
31 changed files with 1562 additions and 1289 deletions
@@ -28,7 +28,7 @@
user.visible_message("\blue [user] scans [A], the air around them humming gently.")
if(istype(A,/turf/simulated/mineral))
var/turf/simulated/mineral/M = A
if(M.finds.len || M.artifact_find)
if((M.finds && M.finds.len) || M.artifact_find)
//create a new scanlog entry
var/datum/depth_scan/D = new()