Merge pull request #508 from Citadel-Station-13/upstream-merge-26337

[MIRROR] Refactors picture frames to use wall frames system

code/game/machinery/buttons.dm

@@ -215,7 +215,6 @@
 /obj/item/wallframe/button
 	name = "button frame"
 	desc = "Used for building buttons."
-	icon = 'icons/obj/apc_repair.dmi'
-	icon_state = "button_frame"
+	icon_state = "button"
 	result_path = /obj/machinery/button
 	materials = list(MAT_METAL=MINERAL_MATERIAL_AMOUNT)

code/game/machinery/firealarm.dm

@@ -1,10 +1,10 @@
 /obj/item/weapon/electronics/firealarm
 	name = "fire alarm electronics"
-	desc = "A circuit. It has a label on it, it says \"Can handle heat levels up to 40 degrees celsius!\""
+	desc = "A fire alarm circuit. Can handle heat levels up to 40 degrees celsius."
 
 /obj/item/wallframe/firealarm
 	name = "fire alarm frame"
-	desc = "Used for building Fire Alarms"
+	desc = "Used for building fire alarms"
 	icon = 'icons/obj/monitors.dmi'
 	icon_state = "fire_bitem"
 	result_path = /obj/machinery/firealarm

code/game/machinery/porta_turret/portable_turret.dm

@@ -784,8 +784,7 @@
 /obj/item/wallframe/turret_control
 	name = "turret control frame"
 	desc = "Used for building turret control panels"
-	icon = 'icons/obj/apc_repair.dmi'
-	icon_state = "apc_frame"
+	icon_state = "apc"
 	result_path = /obj/machinery/turretid
 	materials = list(MAT_METAL=MINERAL_MATERIAL_AMOUNT)