From c1561be2f81838c01d044d651efada898b4cd9a6 Mon Sep 17 00:00:00 2001 From: caelaislinn Date: Fri, 22 Jun 2012 14:22:13 +1000 Subject: [PATCH] readded missing file. somehow it unticked during a merge and didn't get pushed? Signed-off-by: caelaislinn --- baystation12.dme | 1 + code/modules/mining/mine_turfs.dm | 4 ++-- code/modules/mob/living/say.dm | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/baystation12.dme b/baystation12.dme index 1890ebb8cb5..065eabb9e70 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -1130,6 +1130,7 @@ #include "code\modules\recycling\disposal.dm" #include "code\modules\recycling\sortingmachinery.dm" #include "code\modules\research\artifact_analysis.dm" +#include "code\modules\research\artifact_archaeo.dm" #include "code\modules\research\artifact_misc.dm" #include "code\modules\research\artifacts.dm" #include "code\modules\research\circuitprinter.dm" diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index d4496647199..c85f31498dd 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -270,9 +270,9 @@ new /obj/item/weapon/ore/plasma(src) if (src.mineralName == "Diamond") new /obj/item/weapon/ore/diamond(src) - // if (src.mineralName == "Archaeo" && (prob(10) || delicate) ) + if (src.mineralName == "Archaeo" && (prob(10) || delicate) ) //spawn strange rocks here - // new /obj/item/weapon/ore/strangerock(src) + new /obj/item/weapon/ore/strangerock(src) if (src.mineralName == "Clown") new /obj/item/weapon/ore/clown(src) if (prob(src.artifactChance)) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 8413db9295a..7ac37d7b484 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -469,8 +469,8 @@ */ //talking crystals -// for(var/obj/item/weapon/talkingcrystal/O in view(3,src)) -// O.catchMessage(message,src) + for(var/obj/item/weapon/talkingcrystal/O in view(3,src)) + O.catchMessage(message,src) for (var/mob/M in heard_a)