diff --git a/baystation12.dme b/baystation12.dme
index eaa2891e59c..d766492f3a7 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -749,13 +749,13 @@
 #include "code\modules\clothing\under\jobs\security.dm"
 #include "code\modules\customitems\item_defines.dm"
 #include "code\modules\customitems\item_spawning.dm"
-#include "code\modules\destilery\main.dm"
 #include "code\modules\DetectiveWork\detective_work.dm"
 #include "code\modules\DetectiveWork\evidence.dm"
 #include "code\modules\DetectiveWork\footprints_and_rag.dm"
 #include "code\modules\DetectiveWork\scanner.dm"
 #include "code\modules\events\alien_infestation.dm"
 #include "code\modules\events\blob.dm"
+#include "code\modules\events\bluespaceanomaly.dm"
 #include "code\modules\events\brand_intelligence.dm"
 #include "code\modules\events\carp_migration.dm"
 #include "code\modules\events\comms_blackout.dm"
@@ -768,6 +768,7 @@
 #include "code\modules\events\grid_check.dm"
 #include "code\modules\events\infestation.dm"
 #include "code\modules\events\ion_storm.dm"
+#include "code\modules\events\mass_hallucination.dm"
 #include "code\modules\events\meteors.dm"
 #include "code\modules\events\money_hacker.dm"
 #include "code\modules\events\money_lotto.dm"
@@ -1247,8 +1248,6 @@
 #include "code\WorkInProgress\explosion_particles.dm"
 #include "code\WorkInProgress\periodic_news.dm"
 #include "code\WorkInProgress\Apples\artifacts.dm"
-#include "code\WorkInProgress\Cael_Aislinn\meteor_battery.dm"
-#include "code\WorkInProgress\Cael_Aislinn\sculpture.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Economy\Accounts.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Economy\Economy.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Economy\Economy_Events.dm"
@@ -1287,9 +1286,6 @@
 #include "code\WorkInProgress\Cael_Aislinn\ShieldGen\shield_capacitor.dm"
 #include "code\WorkInProgress\Cael_Aislinn\ShieldGen\shield_gen.dm"
 #include "code\WorkInProgress\Cael_Aislinn\ShieldGen\shield_gen_external.dm"
-#include "code\WorkInProgress\Cael_Aislinn\Supermatter\LaserComputer.dm"
-#include "code\WorkInProgress\Cael_Aislinn\Supermatter\SuperMatter.dm"
-#include "code\WorkInProgress\Cael_Aislinn\Supermatter\ZeroPointLaser.dm"
 #include "code\WorkInProgress\Chinsky\ashtray.dm"
 #include "code\WorkInProgress\Cib\MedicalSideEffects.dm"
 #include "code\WorkInProgress\kilakk\fax.dm"
@@ -1298,7 +1294,6 @@
 #include "code\WorkInProgress\Ported\policetape.dm"
 #include "code\WorkInProgress\SkyMarshal\officer_stuff.dm"
 #include "code\WorkInProgress\SkyMarshal\Ultralight_procs.dm"
-#include "code\WorkInProgress\Susan\susan_desert_turfs.dm"
 #include "code\WorkInProgress\ZomgPonies\karma.dm"
 #include "code\WorkInProgress\ZomgPonies\clothing\civilian.dm"
 #include "code\WorkInProgress\ZomgPonies\mobs\pony.dm"
diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm
index 2833cc922f1..a2c6e58a0b4 100644
--- a/code/game/objects/items/weapons/cards_ids.dm
+++ b/code/game/objects/items/weapons/cards_ids.dm
@@ -88,7 +88,7 @@
 		/obj/machinery/suspension_gen,
 		/obj/machinery/shield_capacitor,
 		/obj/machinery/shield_gen,
-		/obj/machinery/zero_point_emitter,
+//		/obj/machinery/zero_point_emitter,
 		/obj/machinery/clonepod,
 		/obj/machinery/deployable,
 		/obj/machinery/door_control,
diff --git a/code/modules/events/bluespaceanomaly.dm b/code/modules/events/bluespaceanomaly.dm
new file mode 100644
index 00000000000..688642a3c83
--- /dev/null
+++ b/code/modules/events/bluespaceanomaly.dm
@@ -0,0 +1,88 @@
+/datum/event/bluespace_anomaly
+	announceWhen	= 20
+
+	var/area/impact_area
+
+
+/datum/event/bluespace_anomaly/setup()
+	var/list/safe_areas = list(
+	/area/turret_protected/ai,
+	/area/turret_protected/ai_upload,
+	/area/engine,
+	/area/solar,
+	/area/holodeck,
+	/area/shuttle/arrival,
+	/area/shuttle/escape/station,
+	/area/shuttle/escape_pod1/station,
+	/area/shuttle/escape_pod2/station,
+	/area/shuttle/escape_pod3/station,
+	/area/shuttle/escape_pod5/station,
+	/area/shuttle/mining/station,
+	/area/shuttle/transport1/station,
+	/area/shuttle/specops/station)
+
+	//These are needed because /area/engine has to be removed from the list, but we still want these areas to get fucked up.
+	var/list/danger_areas = list(
+	/area/engine/break_room,
+	/area/engine/chiefs_office)
+
+
+	impact_area = locate(pick((the_station_areas - safe_areas) + danger_areas))	//need to locate() as it's just a list of paths.
+
+
+/datum/event/bluespace_anomaly/announce()
+	command_alert("Bluespace anomaly detected in the vicinity of [station_name()]. [impact_area.name] has gone missing.", "Anomaly Alert")
+
+
+/datum/event/bluespace_anomaly/start()
+	var/turf/T = pick(get_area_turfs(impact_area))
+	if(T)
+			// Calculate new position (searches through beacons in world)
+		var/obj/item/device/radio/beacon/chosen
+		var/list/possible = list()
+		for(var/obj/item/device/radio/beacon/W in world)
+			possible += W
+
+		if(possible.len > 0)
+			chosen = pick(possible)
+
+		if(chosen)
+				// Calculate previous position for transition
+
+			var/turf/FROM = T // the turf of origin we're travelling FROM
+			var/turf/TO = get_turf(chosen)			 // the turf of origin we're travelling TO
+
+			playsound(TO, 'sound/effects/phasein.ogg', 100, 1)
+
+			var/list/flashers = list()
+			for(var/mob/living/carbon/human/M in viewers(TO, null))
+				if(M:eyecheck() <= 0)
+					flick("e_flash", M.flash) // flash dose faggots
+					flashers += M
+
+			var/y_distance = TO.y - FROM.y
+			var/x_distance = TO.x - FROM.x
+			for (var/atom/movable/A in range(12, FROM )) // iterate thru list of mobs in the area
+				if(istype(A, /obj/item/device/radio/beacon)) continue // don't teleport beacons because that's just insanely stupid
+				if(A.anchored && istype(A, /obj/machinery)) continue
+				if(istype(A, /obj/structure/disposalpipe )) continue
+				if(istype(A, /obj/structure/cable )) continue
+
+				var/turf/newloc = locate(A.x + x_distance, A.y + y_distance, TO.z) // calculate the new place
+				if(!A.Move(newloc)) // if the atom, for some reason, can't move, FORCE them to move! :) We try Move() first to invoke any movement-related checks the atom needs to perform after moving
+					A.loc = locate(A.x + x_distance, A.y + y_distance, TO.z)
+
+				spawn()
+					if(ismob(A) && !(A in flashers)) // don't flash if we're already doing an effect
+						var/mob/M = A
+						if(M.client)
+							var/obj/blueeffect = new /obj(src)
+							blueeffect.screen_loc = "WEST,SOUTH to EAST,NORTH"
+							blueeffect.icon = 'icons/effects/effects.dmi'
+							blueeffect.icon_state = "shieldsparkles"
+							blueeffect.layer = 17
+							blueeffect.mouse_opacity = 0
+							M.client.screen += blueeffect
+							sleep(20)
+							M.client.screen -= blueeffect
+							del(blueeffect)
\ No newline at end of file
diff --git a/code/modules/events/mass_hallucination.dm b/code/modules/events/mass_hallucination.dm
new file mode 100644
index 00000000000..8c50f78cc18
--- /dev/null
+++ b/code/modules/events/mass_hallucination.dm
@@ -0,0 +1,3 @@
+/datum/event/mass_hallucination/start()
+	for(var/mob/living/carbon/C in living_mob_list)
+		C.hallucination += rand(20, 50)
\ No newline at end of file
diff --git a/code/modules/research/xenoarchaeology/artifact/artifact.dm b/code/modules/research/xenoarchaeology/artifact/artifact.dm
index 1ff8a220f32..3517cd96064 100644
--- a/code/modules/research/xenoarchaeology/artifact/artifact.dm
+++ b/code/modules/research/xenoarchaeology/artifact/artifact.dm
@@ -13,10 +13,8 @@
 	artifact_id = "[pick("kappa","sigma","antaeres","beta","omicron","iota","epsilon","omega","gamma","delta","tau","alpha")]-[rand(100,999)]"
 
 	artifact_find_type = pick(\
-	5;/obj/machinery/power/supermatter,\
 	5;/obj/structure/constructshell,\
 	5;/obj/machinery/syndicate_beacon,\
-	25;/obj/machinery/power/supermatter/shard,\
 	50;/obj/structure/cult/pylon,\
 	100;/obj/machinery/auto_cloner,\
 	100;/obj/machinery/giga_drill,\
diff --git a/code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm b/code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm
index 7daa0a665aa..c489bfc10e1 100644
--- a/code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm
+++ b/code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm
@@ -134,11 +134,11 @@
 			ecosystem involving self cannibalism and a symbiotic relationship with the contained liquid.<br><br>\
 			Structure is composed of a carbo-titanium alloy with interlaced reinforcing energy fields, and the contained liquid \
 			resembles proto-plasmic residue supportive of single cellular developmental conditions."
-		if(/obj/machinery/power/supermatter)
-			return "Super dense plasma clump - Appears to have been shaped or hewn, structure is composed of matter 2000% denser than ordinary carbon matter residue.\
+//		if(/obj/machinery/power/supermatter)
+//			return "Super dense plasma clump - Appears to have been shaped or hewn, structure is composed of matter 2000% denser than ordinary carbon matter residue.\
 			Potential application as unrefined plasma source."
-		if(/obj/machinery/power/supermatter)
-			return "Super dense plasma clump - Appears to have been shaped or hewn, structure is composed of matter 2000% denser than ordinary carbon matter residue.\
+//		if(/obj/machinery/power/supermatter)
+//			return "Super dense plasma clump - Appears to have been shaped or hewn, structure is composed of matter 2000% denser than ordinary carbon matter residue.\
 			Potential application as unrefined plasma source."
 		if(/obj/structure/constructshell)
 			return "Tribal idol - Item resembles statues/emblems built by superstitious pre-warp civilisations to honour their gods. Material appears to be a \