dusting off

code/game/objects/items/devices/PDA/PDA.dm

@@ -130,6 +130,11 @@ GLOBAL_LIST_EMPTY(PDAs)
 	new_overlays = TRUE
 	update_icon()
 
+/// This is a mess i probably shouldn't touch.
+/obj/item/pda/ComponentInitialize()
+	. = ..()
+	RemoveElement(/datum/element/object_reskinning)
+
 /obj/item/pda/CtrlShiftClick(mob/living/user)
 	. = ..()
 	if(GLOB.pda_reskins && user.canUseTopic(src, BE_CLOSE, NO_DEXTERY))

code/game/objects/items/melee/energy.dm

@@ -211,8 +211,6 @@
 
 /obj/item/melee/transforming/energy/sword/saber/reskin_obj(mob/M)
 	. = ..()
-	if(!.)
-		return
 	switch(current_skin)
 		if("Sword")
 			icon_state = "sword[active ? sword_color : "0"]"