mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
readded missing file. somehow it unticked during a merge and didn't get pushed?
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
@@ -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"
|
||||
|
||||
@@ -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))
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user