diff --git a/code/datums/ghost_query_vr.dm b/code/datums/ghost_query_vr.dm
index 82152edbcb2..570d50ce150 100644
--- a/code/datums/ghost_query_vr.dm
+++ b/code/datums/ghost_query_vr.dm
@@ -18,8 +18,8 @@
 	cutoff_number = 1
 */
 
-/datum/ghost_query/maints_spawner
-	role_name = "Maintenance Spawner"
+/datum/ghost_query/maints_critter
+	role_name = "Maintenance Critter"
 	be_special_flag = BE_MAINTCRITTER
 	question = "An opportunity to spawn as a Maintenance Critter has appeared. You can spawn as your choice of a mob (from a fairly large list), a morph (a shapeshifting creature capable of mimicking objects or other creatures), or your currently loaded character slot in a special \'lurker\' role."
 	cutoff_number = 1
diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm
index df00dc5431b..4ae24dbac10 100644
--- a/code/game/machinery/pipe/construction.dm
+++ b/code/game/machinery/pipe/construction.dm
@@ -122,7 +122,7 @@ Buildable meters
 	var/obj/machinery/atmospherics/fakeA = pipe_type
 	icon_state = "[initial(fakeA.pipe_state)][mirrored ? "m" : ""]"
 
-/obj/item/pipe/handle_rotation_verbs(angle)
+/obj/item/pipe/handle_rotation_verbs(angle, mob/user)
 	. = ..()
 	if(.)
 		fixdir()
diff --git a/code/game/objects/structures/ghost_pods/unified_ghost_hole.dm b/code/game/objects/structures/ghost_pods/unified_ghost_hole.dm
index 1b5ee829a62..8e160fcffcb 100644
--- a/code/game/objects/structures/ghost_pods/unified_ghost_hole.dm
+++ b/code/game/objects/structures/ghost_pods/unified_ghost_hole.dm
@@ -5,7 +5,7 @@
 	icon_state = "rift"
 	icon_state_opened = "tendril_dead"
 	density = FALSE
-	ghost_query_type = /datum/ghost_query/maints_spawner
+	ghost_query_type = /datum/ghost_query/maints_critter
 	anchored = TRUE
 	invisibility = INVISIBILITY_OBSERVER
 	spawn_active = TRUE
@@ -45,6 +45,7 @@
 			create_lurker(user)
 	used = TRUE
 	icon_state = icon_state_opened
+	update_icon()
 	GLOB.active_ghost_pods -= src
 
 /obj/structure/ghost_pod/ghost_activated/unified_hole/proc/create_simplemob(var/mob/M)
@@ -159,6 +160,19 @@
 	. = ..()
 	GLOB.active_ghost_pods += src
 
+	update_icon()
+
+/obj/structure/ghost_pod/ghost_activated/unified_hole/update_icon()
+	cut_overlays()
+
+	if(used)
+		return
+
+	var/list/glows = list()
+	glows += mutable_appearance(icon, "rift_glow")
+	glows += emissive_appearance(icon, "rift_glow")
+	add_overlay(glows)
+
 /obj/structure/ghost_pod/ghost_activated/unified_hole/Destroy()
 	GLOB.active_ghost_pods -= src
 	. = ..()
diff --git a/code/modules/power/fusion_coil.dm b/code/modules/power/fusion_coil.dm
index 6274a3e2ac0..4fd6ac8278f 100644
--- a/code/modules/power/fusion_coil.dm
+++ b/code/modules/power/fusion_coil.dm
@@ -31,22 +31,24 @@
 
 	cut_overlays()
 
-	. = list()
+	var/list/overlays = list()
 
 	if(coil_damaged)
-		. += mutable_appearance(icon, "fc_unstable")
-		. += emissive_appearance(icon, "fc_unstable")
+		overlays += mutable_appearance(icon, "fc_unstable")
+		overlays += emissive_appearance(icon, "fc_unstable")
 		set_light(1, 3, light_color_danger)
-		return add_overlay(.)
-	else if(coil_charged)
-		. += mutable_appearance(icon, "fc_charged")
-		. += emissive_appearance(icon, "fc_charged")
-		set_light(1, 2, light_color)
-		return add_overlay(.)
-	else
-		set_light(0)
+		add_overlay(overlays)
 		return
 
+	if(coil_charged)
+		overlays += mutable_appearance(icon, "fc_charged")
+		overlays += emissive_appearance(icon, "fc_charged")
+		set_light(1, 2, light_color)
+		add_overlay(overlays)
+		return
+
+	set_light(0)
+
 /obj/item/fusion_coil/bullet_act(obj/item/projectile/P, def_zone)
 	. = ..()
 
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
index 05e0fa72680..f60a4c7c08d 100644
Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ