Merge remote-tracking branch 'citadel/master' into mobility_flags

code/game/objects/items/implants/implantcase.dm

@@ -10,18 +10,14 @@
 	throw_range = 5
 	w_class = WEIGHT_CLASS_TINY
 	custom_materials = list(/datum/material/glass=500)
-	var/obj/item/implant/imp = null
+	var/obj/item/implant/imp
 	var/imp_type
 
-
-/obj/item/implantcase/update_icon()
+/obj/item/implantcase/update_icon_state()
 	if(imp)
 		icon_state = "implantcase-[imp.item_color]"
-		reagents = imp.reagents
 	else
 		icon_state = "implantcase-0"
-		reagents = null
-
 
 /obj/item/implantcase/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/pen))
@@ -46,6 +42,7 @@
 			imp = I.imp
 			I.imp = null
 			update_icon()
+			reagents = imp.reagents
 			I.update_icon()
 		else
 			if(imp)
@@ -54,6 +51,7 @@
 				imp.forceMove(I)
 				I.imp = imp
 				imp = null
+				reagents = null
 				update_icon()
 			I.update_icon()
 

code/game/objects/items/implants/implantchair.dm

@@ -96,16 +96,17 @@
 		visible_message("<span class='warning'>[M] has been implanted by [src].</span>")
 		return TRUE
 
-/obj/machinery/implantchair/update_icon()
+/obj/machinery/implantchair/update_icon_state()
 	icon_state = initial(icon_state)
 	if(state_open)
 		icon_state += "_open"
 	if(occupant)
 		icon_state += "_occupied"
+
+/obj/machinery/implantchair/update_overlays()
+	. = ..()
 	if(ready)
-		add_overlay("ready")
-	else
-		cut_overlays()
+		. += "ready"
 
 /obj/machinery/implantchair/proc/replenish()
 	if(ready_implants < max_implants)

code/game/objects/items/implants/implanter.dm

@@ -14,13 +14,12 @@
 	var/imp_type = null
 
 
-/obj/item/implanter/update_icon()
+/obj/item/implanter/update_icon_state()
 	if(imp)
 		icon_state = "implanter1"
 	else
 		icon_state = "implanter0"
 
-
 /obj/item/implanter/attack(mob/living/M, mob/user)
 	if(!istype(M))
 		return

code/game/objects/items/implants/implantpad.dm

@@ -18,7 +18,7 @@
 	if(case)
 		. += "<span class='notice'>Alt-click [src] to remove the inserted implant case.</span>"
 
-/obj/item/implantpad/update_icon()
+/obj/item/implantpad/update_icon_state()
 	icon_state = "implantpad-[case ? TRUE : FALSE]"
 
 /obj/item/implantpad/AltClick(mob/user)