WIP

code/modules/awaymissions/gateway.dm

@@ -53,11 +53,8 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
 		ready = TRUE
 	return ready
 
-/obj/machinery/gateway/update_icon()
-	if(active)
-		icon_state = "on"
-		return
-	icon_state = "off"
+/obj/machinery/gateway/update_icon_state()
+	icon_state = active ? "on" : "off"
 
 /obj/machinery/gateway/attack_hand(mob/user)
 	. = ..()
@@ -100,11 +97,8 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
 	var/obj/machinery/gateway/centeraway/awaygate = null
 	can_link = TRUE
 
-/obj/machinery/gateway/centerstation/update_icon()
-	if(active)
-		icon_state = "oncenter"
-		return
-	icon_state = "offcenter"
+/obj/machinery/gateway/centerstation/update_icon_state()
+	icon_state = active ? "oncenter" : "offcenter"
 
 /obj/machinery/gateway/centerstation/process()
 	if((stat & (NOPOWER)) && use_power)
@@ -185,11 +179,8 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
 	stationgate = locate(/obj/machinery/gateway/centerstation)
 
 
-/obj/machinery/gateway/centeraway/update_icon()
-	if(active)
-		icon_state = "oncenter"
-		return
-	icon_state = "offcenter"
+/obj/machinery/gateway/centeraway/update_icon_state()
+	icon_state = active ? "oncenter" : "offcenter"
 
 /obj/machinery/gateway/centeraway/toggleon(mob/user)
 	if(!detect())

code/modules/awaymissions/mission_code/Academy.dm

@@ -337,8 +337,9 @@
 	icon_state = "1"
 	color = rgb(0,0,255)
 
-/obj/structure/ladder/unbreakable/rune/update_icon()
-	return
+/obj/structure/ladder/unbreakable/rune/ComponentInitialize()
+	. = ..()
+	AddElement(/datum/element/update_icon_blocker)
 
 /obj/structure/ladder/unbreakable/rune/show_fluff_message(up,mob/user)
 	user.visible_message("[user] activates \the [src].","<span class='notice'>You activate \the [src].</span>")

code/modules/awaymissions/pamphlet.dm

@@ -35,5 +35,6 @@
 			environs."
 
 //we don't want the silly text overlay!
-/obj/item/paper/pamphlet/update_icon()
-	return
+/obj/item/paper/pamphlet/ComponentInitialize()
+	. = ..()
+	AddElement(/datum/element/update_icon_blocker)