cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 14:04:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for cael's derp. MAKE SURE YOU TICK YER FILES.

Browse Source
This commit is contained in:
SkyMarshal
2012-06-21 18:10:15 -07:00
parent 800c4a406a
commit dba2b81756
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
baystation12.dme
View File

@@ -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"

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

@@ -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))

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

@@ -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)