Merge pull request #11391 from Ghommie/Ghommie-cit612

Porting "Further update_icon splitup"

code/modules/shuttle/emergency.dm

@@ -519,8 +519,9 @@
 	density = FALSE
 	clockwork = TRUE //it'd look weird
 
-/obj/machinery/computer/shuttle/pod/update_icon()
-	return
+/obj/machinery/computer/shuttle/pod/ComponentInitialize()
+	. = ..()
+	AddElement(/datum/element/update_icon_blocker)
 
 /obj/machinery/computer/shuttle/pod/emag_act(mob/user)
 	. = SEND_SIGNAL(src, COMSIG_ATOM_EMAG_ACT)

code/modules/shuttle/manipulator.dm

@@ -31,14 +31,14 @@
 		SSshuttle.manipulator = null
 		. = ..()
 
-/obj/machinery/shuttle_manipulator/update_icon()
-	cut_overlays()
+/obj/machinery/shuttle_manipulator/update_overlays()
+	. = ..()
 	var/mutable_appearance/hologram_projection = mutable_appearance(icon, "hologram_on")
 	hologram_projection.pixel_y = 22
 	var/mutable_appearance/hologram_ship = mutable_appearance(icon, "hologram_whiteship")
 	hologram_ship.pixel_y = 27
-	add_overlay(hologram_projection)
-	add_overlay(hologram_ship)
+	. += hologram_projection
+	. += hologram_ship
 
 /obj/machinery/shuttle_manipulator/can_interact(mob/user)
 	// Only admins can use this, but they can use it from anywhere

code/modules/shuttle/special.dm

@@ -21,7 +21,7 @@
 		desc = "Oh no, not again."
 	update_icon()
 
-/obj/machinery/power/emitter/energycannon/magical/update_icon()
+/obj/machinery/power/emitter/energycannon/magical/update_icon_state()
 	if(active)
 		icon_state = icon_state_on
 	else