diff --git a/code/game/machinery/PDApainter.dm b/code/game/machinery/PDApainter.dm
index 9721fb6ee1..00289ee84b 100644
--- a/code/game/machinery/PDApainter.dm
+++ b/code/game/machinery/PDApainter.dm
@@ -1,32 +1,32 @@
-/obj/machinery/pdapainter
-	name = "\improper PDA painter"
-	desc = "A PDA painting machine. To use, simply insert your PDA and choose the desired preset paint scheme."
-	icon = 'icons/obj/pda.dmi'
-	icon_state = "pdapainter"
+/obj/machinery/pdapainter
+	name = "\improper PDA painter"
+	desc = "A PDA painting machine. To use, simply insert your PDA and choose the desired preset paint scheme."
+	icon = 'icons/obj/pda.dmi'
+	icon_state = "pdapainter"
 	density = TRUE
 	anchored = TRUE
-	var/obj/item/device/pda/storedpda = null
-	var/list/colorlist = list()
-	max_integrity = 200
-
-
-/obj/machinery/pdapainter/update_icon()
-	cut_overlays()
-
-	if(stat & BROKEN)
-		icon_state = "[initial(icon_state)]-broken"
-		return
-
-	if(storedpda)
-		add_overlay("[initial(icon_state)]-closed")
-
-	if(powered())
-		icon_state = initial(icon_state)
-	else
-		icon_state = "[initial(icon_state)]-off"
-
-	return
-
+	var/obj/item/device/pda/storedpda = null
+	var/list/colorlist = list()
+	max_integrity = 200
+
+
+/obj/machinery/pdapainter/update_icon()
+	cut_overlays()
+
+	if(stat & BROKEN)
+		icon_state = "[initial(icon_state)]-broken"
+		return
+
+	if(storedpda)
+		add_overlay("[initial(icon_state)]-closed")
+
+	if(powered())
+		icon_state = initial(icon_state)
+	else
+		icon_state = "[initial(icon_state)]-off"
+
+	return
+
 /obj/machinery/pdapainter/Initialize()
 	. = ..()
 	var/list/blocked = list(
@@ -37,74 +37,15 @@
 		/obj/item/device/pda/syndicate)
 
 	for(var/P in typesof(/obj/item/device/pda) - blocked)
-		var/obj/item/device/pda/D = new P
-
-		//D.name = "PDA Style [colorlist.len+1]" //Gotta set the name, otherwise it all comes up as "PDA"
-		D.name = D.icon_state //PDAs don't have unique names, but using the sprite names works.
-
-		src.colorlist += D
-
-/obj/machinery/pdapainter/Destroy()
+		var/obj/item/device/pda/D = new P
+
+		//D.name = "PDA Style [colorlist.len+1]" //Gotta set the name, otherwise it all comes up as "PDA"
+		D.name = D.icon_state //PDAs don't have unique names, but using the sprite names works.
+
+		src.colorlist += D
+
+/obj/machinery/pdapainter/Destroy()
 	QDEL_NULL(storedpda)
-<<<<<<< HEAD
-	return ..()
-
-/obj/machinery/pdapainter/on_deconstruction()
-	if(storedpda)
-		storedpda.forceMove(loc)
-		storedpda = null
-
-/obj/machinery/pdapainter/contents_explosion(severity, target)
-	if(storedpda)
-		storedpda.ex_act(severity, target)
-
-/obj/machinery/pdapainter/handle_atom_del(atom/A)
-	if(A == storedpda)
-		storedpda = null
-		update_icon()
-
-/obj/machinery/pdapainter/attackby(obj/item/O, mob/user, params)
-	if(default_unfasten_wrench(user, O))
-		power_change()
-		return
-
-	else if(istype(O, /obj/item/device/pda))
-		if(storedpda)
-			to_chat(user, "<span class='warning'>There is already a PDA inside!</span>")
-			return
-		else
-			var/obj/item/device/pda/P = user.get_active_held_item()
-			if(istype(P))
-				if(!user.drop_item())
-					return
-				storedpda = P
-				P.loc = src
-				P.add_fingerprint(user)
-				update_icon()
-
-	else if(istype(O, /obj/item/weldingtool) && user.a_intent != INTENT_HARM)
-		var/obj/item/weldingtool/WT = O
-		if(stat & BROKEN)
-			if(WT.remove_fuel(0,user))
-				user.visible_message("[user] is repairing [src].", \
-								"<span class='notice'>You begin repairing [src]...</span>", \
-								"<span class='italics'>You hear welding.</span>")
-				playsound(loc, WT.usesound, 40, 1)
-				if(do_after(user,40*WT.toolspeed, 1, target = src))
-					if(!WT.isOn() || !(stat & BROKEN))
-						return
-					to_chat(user, "<span class='notice'>You repair [src].</span>")
-					playsound(loc, 'sound/items/welder2.ogg', 50, 1)
-					stat &= ~BROKEN
-					obj_integrity = max_integrity
-					update_icon()
-		else
-			to_chat(user, "<span class='notice'>[src] does not need repairs.</span>")
-	else
-		return ..()
-
-/obj/machinery/pdapainter/deconstruct(disassembled = TRUE)
-=======
 	return ..()
 
 /obj/machinery/pdapainter/on_deconstruction()
@@ -158,49 +99,48 @@
 		return ..()
 
 /obj/machinery/pdapainter/deconstruct(disassembled = TRUE)
->>>>>>> b6d349e... Remove drop_item, drop_item_v, put_in_hands_or_del (#31386)
 	if(!(flags_1 & NODECONSTRUCT_1))
-		if(!(stat & BROKEN))
-			stat |= BROKEN
-			update_icon()
-
-/obj/machinery/pdapainter/attack_hand(mob/user)
-	if(!..())
-		add_fingerprint(user)
-
-		if(storedpda)
-			var/obj/item/device/pda/P
-			P = input(user, "Select your color!", "PDA Painting") as null|anything in colorlist
-			if(!P)
-				return
-			if(!in_range(src, user))
-				return
-			if(!storedpda)//is the pda still there?
-				return
-			storedpda.icon_state = P.icon_state
-			storedpda.desc = P.desc
-			ejectpda()
-
-		else
-			to_chat(user, "<span class='notice'>\The [src] is empty.</span>")
-
-
-/obj/machinery/pdapainter/verb/ejectpda()
-	set name = "Eject PDA"
-	set category = "Object"
-	set src in oview(1)
-
-	if(usr.stat || usr.restrained() || !usr.canmove)
-		return
-
-	if(storedpda)
-		storedpda.loc = get_turf(src.loc)
-		storedpda = null
-		update_icon()
-	else
-		to_chat(usr, "<span class='notice'>The [src] is empty.</span>")
-
-
-/obj/machinery/pdapainter/power_change()
-	..()
-	update_icon()
+		if(!(stat & BROKEN))
+			stat |= BROKEN
+			update_icon()
+
+/obj/machinery/pdapainter/attack_hand(mob/user)
+	if(!..())
+		add_fingerprint(user)
+
+		if(storedpda)
+			var/obj/item/device/pda/P
+			P = input(user, "Select your color!", "PDA Painting") as null|anything in colorlist
+			if(!P)
+				return
+			if(!in_range(src, user))
+				return
+			if(!storedpda)//is the pda still there?
+				return
+			storedpda.icon_state = P.icon_state
+			storedpda.desc = P.desc
+			ejectpda()
+
+		else
+			to_chat(user, "<span class='notice'>\The [src] is empty.</span>")
+
+
+/obj/machinery/pdapainter/verb/ejectpda()
+	set name = "Eject PDA"
+	set category = "Object"
+	set src in oview(1)
+
+	if(usr.stat || usr.restrained() || !usr.canmove)
+		return
+
+	if(storedpda)
+		storedpda.loc = get_turf(src.loc)
+		storedpda = null
+		update_icon()
+	else
+		to_chat(usr, "<span class='notice'>The [src] is empty.</span>")
+
+
+/obj/machinery/pdapainter/power_change()
+	..()
+	update_icon()