Merge branch 'master' of https://github.com/Bubberstation/Bubberstation

code/modules/power/apc/apc_appearance.dm

@@ -111,7 +111,11 @@
 /obj/machinery/power/apc/proc/flicker_hacked_icon()
 	if(opened != APC_COVER_CLOSED)
 		return
+	/* BUBBER EDIT BEGIN - Fix for override not showing on apc
 	var/image/hacker_image = image(icon = 'icons/obj/machines/wallmounts.dmi', loc = src, icon_state = "apcemag", layer = FLOAT_LAYER)
+	*/
+	var/image/hacker_image = image(icon = 'modular_skyrat/modules/aesthetics/apc/icons/apc.dmi', loc = src, icon_state = "apcemag", layer = FLOAT_LAYER)
+	//BUBBER EDIT END
 	var/list/mobs_to_show = list()
 	// Collecting mobs the APC can see for this animation, rather than mobs that can see the APC. Important distinction, intended such that mobs on camera / with XRAY cannot see the flicker.
 	for(var/mob/viewer in view(src))

code/modules/power/power_store.dm

@@ -105,6 +105,7 @@
 
 	return .
 
+/* OVERWRITTEN IN modular_skyrat\modules\aesthetics\cells\cell.dm
 /obj/item/stock_parts/power_store/update_overlays()
 	. = ..()
 	if(grown_battery)
@@ -112,6 +113,7 @@
 	if((charge < 0.01) || !charge_light_type)
 		return
 	. += mutable_appearance('icons/obj/machines/cell_charger.dmi', "[cell_size_prefix]-[charge_light_type]-o[(percent() >= 99.5) ? 2 : 1]")
+*/
 
 /obj/item/stock_parts/power_store/vv_edit_var(vname, vval)
 	if(vname == NAMEOF(src, charge))