From 66769fec4fdae4e97b6163ae30ddd803e2547d4a Mon Sep 17 00:00:00 2001 From: caelaislinn Date: Sat, 23 Jun 2012 14:49:22 +1000 Subject: [PATCH] arty tweaks Signed-off-by: caelaislinn --- baystation12.dme | 2 +- code/modules/research/artifact_harvester.dm | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/baystation12.dme b/baystation12.dme index a05fbb8d31..737deebe26 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -206,7 +206,6 @@ #define FILE_DIR "icons/vending_icons" #define FILE_DIR "interface" #define FILE_DIR "maps" -#define FILE_DIR "maps/backup" #define FILE_DIR "maps/RandomZLevels" #define FILE_DIR "sound" #define FILE_DIR "sound/AI" @@ -357,6 +356,7 @@ #include "code\defines\procs\logging.dm" #include "code\defines\procs\religion_name.dm" #include "code\defines\procs\station_name.dm" +#include "code\defines\procs\statistics.dm" #include "code\defines\procs\syndicate_name.dm" #include "code\defines\procs\time_stamp.dm" #include "code\defines\sd_procs\base64.dm" diff --git a/code/modules/research/artifact_harvester.dm b/code/modules/research/artifact_harvester.dm index 24f861298a..595ea22f85 100644 --- a/code/modules/research/artifact_harvester.dm +++ b/code/modules/research/artifact_harvester.dm @@ -85,9 +85,20 @@ analysed = A articount++ + var/mundane = 0 + for(var/obj/O in get_turf(owned_pad)) + mundane++ + break + for(var/mob/O in get_turf(owned_pad)) + mundane++ + break + if(articount > 1) var/message = "[src] states, \"Cannot harvest. Too many artifacts on pad.\"" src.visible_message(message, message) + else if(mundane) + var/message = "[src] states, \"No noteworthy energy signatures detected.\"" + src.visible_message(message, message) else if(!articount) var/message = "[src] states, \"Cannot harvest. No artifact found.\"" src.visible_message(message, message)