Merge remote-tracking branch 'upstream/master' into nanites

code/datums/components/_component.dm

@@ -123,6 +123,8 @@
 	signal_enabled = TRUE
 
 /datum/proc/UnregisterSignal(datum/target, sig_type_or_types)
+	if(!target)
+		CRASH("[src] tried to unregister a signal without having a target.")
 	var/list/lookup = target.comp_lookup
 	if(!signal_procs || !signal_procs[target] || !lookup)
 		return

code/datums/components/chasm.dm

@@ -17,11 +17,13 @@
 		/obj/effect/hotspot,
 		/obj/effect/landmark,
 		/obj/effect/temp_visual,
+		/obj/effect/particle_effect,
 		/obj/effect/light_emitter/tendril,
 		/obj/effect/collapse,
 		/obj/effect/particle_effect/ion_trails,
 		/obj/effect/dummy/phased_mob,
-		/obj/effect/immovablerod
+		/obj/effect/immovablerod,
+		/obj/effect/crystalline_reentry
 		))
 
 /datum/component/chasm/Initialize(turf/target)