diff --git a/README.md b/README.md
index 4267a3e0f088f..6abbf9ba7e3db 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,16 @@
 <!-- Change Title to 'NSS Phoenix' If Kaedwulf rules over Station -->
 # Aphelion Project
-![Travis Build Status](https://travis-ci.org/sshado/Aphelion-Code.svg)
-[![Join the chat at https://gitter.im/sshado/Aphelion-Code](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/sshado/Aphelion-Code?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+![Travis Build Status](https://travis-ci.org/DJPantheris/Aphelion-Code.svg?branch=master)
+[![Join the chat at https://gitter.im/sshado/Aphelion-Code](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/sshado/Aphelion-Code?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 [Website](hhttp://aphelion-project.xyz/) - [Code](https://github.com/sshado/Aphelion-Code)
 
 ---
 
+This is a branch of the Aphelion Project began by Sshado.
+
+---
+
 ### LICENSE
 Baystation12 is licensed under the GNU Affero General Public License version 3, which can be found in full in LICENSE-AGPL3.txt.
 
diff --git a/baystation12.dme b/baystation12.dme
index eb38432789eb3..7766b81dc7e63 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -5,6 +5,68 @@
 // END_INTERNALS
 // BEGIN_FILE_DIR
 #define FILE_DIR .
+#define FILE_DIR "html"
+#define FILE_DIR "html/images"
+#define FILE_DIR "icons"
+#define FILE_DIR "icons/48x48"
+#define FILE_DIR "icons/atmos"
+#define FILE_DIR "icons/effects"
+#define FILE_DIR "icons/mecha"
+#define FILE_DIR "icons/misc"
+#define FILE_DIR "icons/mob"
+#define FILE_DIR "icons/mob/human_races"
+#define FILE_DIR "icons/mob/human_races/cyberlimbs"
+#define FILE_DIR "icons/mob/human_races/masks"
+#define FILE_DIR "icons/mob/human_races/monkeys"
+#define FILE_DIR "icons/mob/human_races/xenos"
+#define FILE_DIR "icons/mob/items"
+#define FILE_DIR "icons/mob/species"
+#define FILE_DIR "icons/mob/species/skrell"
+#define FILE_DIR "icons/mob/species/tajaran"
+#define FILE_DIR "icons/mob/species/unathi"
+#define FILE_DIR "icons/mob/species/vox"
+#define FILE_DIR "icons/NTOS"
+#define FILE_DIR "icons/NTOS/battery_icons"
+#define FILE_DIR "icons/obj"
+#define FILE_DIR "icons/obj/assemblies"
+#define FILE_DIR "icons/obj/atmospherics"
+#define FILE_DIR "icons/obj/clothing"
+#define FILE_DIR "icons/obj/clothing/species"
+#define FILE_DIR "icons/obj/clothing/species/skrell"
+#define FILE_DIR "icons/obj/clothing/species/tajaran"
+#define FILE_DIR "icons/obj/clothing/species/unathi"
+#define FILE_DIR "icons/obj/doors"
+#define FILE_DIR "icons/obj/flora"
+#define FILE_DIR "icons/obj/machines"
+#define FILE_DIR "icons/obj/pipes"
+#define FILE_DIR "icons/pda_icons"
+#define FILE_DIR "icons/spideros_icons"
+#define FILE_DIR "icons/Testing"
+#define FILE_DIR "icons/turf"
+#define FILE_DIR "icons/vending_icons"
+#define FILE_DIR "maps"
+#define FILE_DIR "maps/overmap"
+#define FILE_DIR "maps/overmap/bearcat"
+#define FILE_DIR "nano"
+#define FILE_DIR "nano/images"
+#define FILE_DIR "sound"
+#define FILE_DIR "sound/AI"
+#define FILE_DIR "sound/ambience"
+#define FILE_DIR "sound/effects"
+#define FILE_DIR "sound/effects/turret"
+#define FILE_DIR "sound/effects/wind"
+#define FILE_DIR "sound/hallucinations"
+#define FILE_DIR "sound/items"
+#define FILE_DIR "sound/machines"
+#define FILE_DIR "sound/mecha"
+#define FILE_DIR "sound/misc"
+#define FILE_DIR "sound/music"
+#define FILE_DIR "sound/piano"
+#define FILE_DIR "sound/violin"
+#define FILE_DIR "sound/voice"
+#define FILE_DIR "sound/voice/complionator"
+#define FILE_DIR "sound/voice/Serithi"
+#define FILE_DIR "sound/weapons"
 // END_FILE_DIR
 // BEGIN_PREFERENCES
 #define DEBUG
diff --git a/code/modules/materials/material_sheets.dm b/code/modules/materials/material_sheets.dm
index 055195fc9c78e..c1b820fb1a27f 100644
--- a/code/modules/materials/material_sheets.dm
+++ b/code/modules/materials/material_sheets.dm
@@ -45,7 +45,7 @@
 /obj/item/stack/material/proc/update_strings()
 	// Update from material datum.
 	singular_name = material.sheet_singular_name
-	
+
 	if(amount>1)
 		name = "[material.use_name] [material.sheet_plural_name]"
 		desc = "A stack of [material.use_name] [material.sheet_plural_name]."
@@ -209,3 +209,9 @@
 	name = "reinforced phoron glass"
 	icon_state = "sheet-phoronrglass"
 	default_type = "rphglass"
+
+/obj/item/stack/material/turbidium
+	name = "Turbidium"
+	icon_state = "sheet-plasteel"
+	item_state = "sheet-metal"
+	default_type = "turbidium"
\ No newline at end of file
diff --git a/code/modules/materials/materials.dm b/code/modules/materials/materials.dm
index 94221cddc2273..41dc2c7c6b530 100644
--- a/code/modules/materials/materials.dm
+++ b/code/modules/materials/materials.dm
@@ -362,12 +362,12 @@ var/list/name_to_material
 	icon_reinf = "reinf_over"
 	melting_point = 3700
 	stack_origin_tech = "materials=6"
-	cut_delay = 60	
+	cut_delay = 60
 	explosion_resistance = 30
 	integrity = 600
 	hardness = 90
 	weight = 25
-	
+
 /material/glass
 	name = "glass"
 	stack_type = /obj/item/stack/material/glass
@@ -494,7 +494,7 @@ var/list/name_to_material
 /material/glass/phoron/reinforced
 	name = "rphglass"
 	display_name = "reinforced phoron glass"
-	icon_colour = "#d60db4"	
+	icon_colour = "#d60db4"
 	stack_type = /obj/item/stack/material/glass/phoronrglass
 	stack_origin_tech = "materials=4;phorontech=2"
 	composite_material = list() //todo
@@ -554,7 +554,7 @@ var/list/name_to_material
 	stack_origin_tech = "materials=2"
 	sheet_singular_name = "ingot"
 	sheet_plural_name = "ingots"
-	
+
 /material/iron
 	name = "iron"
 	stack_type = /obj/item/stack/material/iron
@@ -565,6 +565,18 @@ var/list/name_to_material
 	sheet_singular_name = "ingot"
 	sheet_plural_name = "ingots"
 
+/material/turbidium
+	name = "turbidium"
+	stack_type = /obj/item/stack/material/turbidium
+	icon_colour = "#00aaaa"
+	integrity = 3000
+	melting_point = 35000
+	weight = 20
+	hardness = 100
+	stack_per_sheet = 3500
+	sheet_singular_name = "sheet"
+	sheet_plural_name = "sheets"
+
 // Adminspawn only, do not let anyone get this.
 /material/voxalloy
 	name = "voxalloy"
diff --git a/code/modules/mining/alloys.dm b/code/modules/mining/alloys.dm
index dac05badd02df..627e815a20e85 100644
--- a/code/modules/mining/alloys.dm
+++ b/code/modules/mining/alloys.dm
@@ -24,4 +24,14 @@
 		"carbon" = 1,
 		"hematite" = 1
 		)
-	product = /obj/item/stack/material/steel
\ No newline at end of file
+	product = /obj/item/stack/material/steel
+
+/datum/alloy/turbidium
+	metaltag = "turbidium"
+	requires = list(
+		"crystarium" = 1,
+		"phoron" = 1,
+		"platinum" = 1
+		)
+	product_mod = 0.3
+	product = /obj/item/stack/material/turbidium
\ No newline at end of file
diff --git a/code/modules/mining/ore.dm b/code/modules/mining/ore.dm
index 431cfe1114734..dacc39e1bf964 100644
--- a/code/modules/mining/ore.dm
+++ b/code/modules/mining/ore.dm
@@ -69,6 +69,12 @@
 	icon_state = "ore_hydrogen"
 	material = "mhydrogen"
 
+/obj/item/weapon/ore/crystarium
+	name = "Unrefined Crystal"
+	icon_state = "ore_crystarium"
+	material = "turbidium"
+	desc = "That's a raw crystal, and it was a PAIN to get."
+
 /obj/item/weapon/ore/slag
 	name = "Slag"
 	desc = "Someone screwed up..."
diff --git a/code/modules/mining/ore_datum.dm b/code/modules/mining/ore_datum.dm
index 82a446fb0bb3d..61cb8b764517d 100644
--- a/code/modules/mining/ore_datum.dm
+++ b/code/modules/mining/ore_datum.dm
@@ -139,4 +139,13 @@ var/global/list/ore_data = list()
 	display_name = "metallic hydrogen"
 	smelts_to = "tritium"
 	compresses_to = "mhydrogen"
+	scan_icon = "mineral_rare"
+
+/ore/crystarium
+	name = "crystarium"
+	display_name = "Strange Crystal"
+	alloy = 1
+	result_amount = 3
+	spread_chance = 10
+	ore = /obj/item/weapon/ore/crystarium
 	scan_icon = "mineral_rare"
\ No newline at end of file
diff --git a/icons/obj/crystalsci.dmi b/icons/obj/crystalsci.dmi
new file mode 100644
index 0000000000000..521f1837452e0
Binary files /dev/null and b/icons/obj/crystalsci.dmi differ