Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2

code/modules/integrated_electronics/core/assemblies/clothing.dm

@@ -47,9 +47,9 @@
 	..()
 
 /obj/item/clothing/examine(mob/user)
+	. = ..()
 	if(IC)
-		IC.examine(user)
-	..()
+		. += IC.examine(user)
 
 /obj/item/clothing/CtrlShiftClick(mob/user)
 	var/turf/T = get_turf(src)
@@ -67,18 +67,6 @@
 	else
 		..()
 
-/obj/item/clothing/Moved(oldloc)
-	if(IC)
-		IC.on_loc_moved(oldloc)
-	else
-		..()
-
-/obj/item/clothing/on_loc_moved(oldloc)
-	if(IC)
-		IC.on_loc_moved(oldloc)
-	else
-		..()
-
 // Does most of the repeatative setup.
 /obj/item/clothing/proc/setup_integrated_circuit(new_type)
 	// Set up the internal circuit holder.

code/modules/integrated_electronics/core/assemblies/device.dm

@@ -46,10 +46,10 @@
 		return
 
 /obj/item/device/assembly/electronic_assembly/examine(mob/user)
-	.=..(user, 1)
+	. = ..()
 	if(EA)
 		for(var/obj/item/integrated_circuit/IC in EA.contents)
-			IC.external_examine(user)
+			. += IC.external_examine(user)
 
 /obj/item/device/assembly/electronic_assembly/verb/toggle()
 	set src in usr