Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync

# Conflicts:
#	code/modules/client/preference_setup/general/03_body.dm
#	code/modules/mob/new_player/sprite_accessories.dm
#	html/changelogs/.all_changelog.yml
#	icons/mob/human_races/markings.dmi
#	vorestation.dme

code/modules/power/smes_construction.dm

@@ -345,7 +345,10 @@
 
 				usr << "\red You have disassembled the SMES cell!"
 				var/obj/structure/frame/M = new /obj/structure/frame(src.loc)
-				M.frame_type = "machine"
+				M.frame_type = new /datum/frame/frame_types/machine
+				M.anchored = 1
+				var/obj/item/weapon/circuitboard/C = new /obj/item/weapon/circuitboard/smes
+				M.circuit = C
 				M.state = 2
 				M.icon_state = "machine_1"
 				for(var/obj/I in component_parts)