cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

readded missing file. somehow it unticked during a merge and didn't get pushed?

Browse Source 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
caelaislinn
2012-06-22 14:22:13 +10:00
parent 09d035bcca
commit c1561be2f8
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
baystation12.dme
View File

@@ -1130,6 +1130,7 @@
#include "code\modules\recycling\disposal.dm" #include "code\modules\recycling\disposal.dm"
#include "code\modules\recycling\sortingmachinery.dm" #include "code\modules\recycling\sortingmachinery.dm"
#include "code\modules\research\artifact_analysis.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\artifact_misc.dm"
#include "code\modules\research\artifacts.dm" #include "code\modules\research\artifacts.dm"
#include "code\modules\research\circuitprinter.dm" #include "code\modules\research\circuitprinter.dm"

4
code/modules/mining/mine_turfs.dm
View File

@@ -270,9 +270,9 @@
new /obj/item/weapon/ore/plasma(src) new /obj/item/weapon/ore/plasma(src)
if (src.mineralName == "Diamond") if (src.mineralName == "Diamond")
new /obj/item/weapon/ore/diamond(src) 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 //spawn strange rocks here
// new /obj/item/weapon/ore/strangerock(src) new /obj/item/weapon/ore/strangerock(src)
if (src.mineralName == "Clown") if (src.mineralName == "Clown")
new /obj/item/weapon/ore/clown(src) new /obj/item/weapon/ore/clown(src)
if (prob(src.artifactChance)) if (prob(src.artifactChance))

4
code/modules/mob/living/say.dm
View File

@@ -469,8 +469,8 @@
*/ */
//talking crystals //talking crystals
// for(var/obj/item/weapon/talkingcrystal/O in view(3,src)) for(var/obj/item/weapon/talkingcrystal/O in view(3,src))
// O.catchMessage(message,src) O.catchMessage(message,src)
for (var/mob/M in heard_a) for (var/mob/M in heard_a)