diff --git a/baystation12.dme b/baystation12.dme index 3c45545a240..1890ebb8cb5 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -167,6 +167,7 @@ #define FILE_DIR "code/WorkInProgress/animusstation" #define FILE_DIR "code/WorkInProgress/Apples" #define FILE_DIR "code/WorkInProgress/Cael_Aislinn" +#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/BirdMan" #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Rust" #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Supermatter" #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Tajara" @@ -1129,7 +1130,6 @@ #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 c85f31498dd..d4496647199 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 7ac37d7b484..8413db9295a 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)