Cleanup to various loc assignments and nearby code

code/game/machinery/camera/camera.dm

@@ -246,7 +246,7 @@
 		if(disassembled)
 			if(!assembly)
 				assembly = new()
-			assembly.loc = src.loc
+			assembly.forceMove(drop_location())
 			assembly.state = 1
 			assembly.setDir(dir)
 			assembly = null

code/game/machinery/camera/camera_assembly.dm

@@ -80,6 +80,7 @@
 				playsound(src.loc, W.usesound, 50, 1)
 
 				var/input = stripped_input(user, "Which networks would you like to connect this camera to? Separate networks with a comma. No Spaces!\nFor example: SS13,Security,Secret ", "Set Network", "SS13")
+<<<<<<< HEAD
 				if(!input)
 					to_chat(user, "<span class='warning'>No input found, please hang up and try your call again!</span>")
 					return
@@ -140,6 +141,68 @@
 	return 0
 
 /obj/structure/camera_assembly/deconstruct(disassembled = TRUE)
+=======
+				if(!input)
+					to_chat(user, "<span class='warning'>No input found, please hang up and try your call again!</span>")
+					return
+
+				var/list/tempnetwork = splittext(input, ",")
+				if(tempnetwork.len < 1)
+					to_chat(user, "<span class='warning'>No network found, please hang up and try your call again!</span>")
+					return
+
+				state = 4
+				var/obj/machinery/camera/C = new(src.loc)
+				forceMove(C)
+				C.assembly = src
+				C.setDir(src.dir)
+
+				C.network = tempnetwork
+				var/area/A = get_area(src)
+				C.c_tag = "[A.name] ([rand(1, 999)])"
+
+
+			else if(istype(W, /obj/item/wirecutters))
+				new/obj/item/stack/cable_coil(get_turf(src), 2)
+				playsound(src.loc, W.usesound, 50, 1)
+				to_chat(user, "<span class='notice'>You cut the wires from the circuits.</span>")
+				state = 2
+				return
+
+	// Upgrades!
+	if(is_type_in_typecache(W, possible_upgrades) && !is_type_in_list(W, upgrades)) // Is a possible upgrade and isn't in the camera already.
+		if(!user.drop_item(W))
+			return
+		to_chat(user, "<span class='notice'>You attach \the [W] into the assembly inner circuits.</span>")
+		upgrades += W
+		W.forceMove(src)
+		return
+
+	// Taking out upgrades
+	else if(istype(W, /obj/item/crowbar) && upgrades.len)
+		var/obj/U = locate(/obj) in upgrades
+		if(U)
+			to_chat(user, "<span class='notice'>You unattach an upgrade from the assembly.</span>")
+			playsound(src.loc, W.usesound, 50, 1)
+			U.forceMove(drop_location())
+			upgrades -= U
+		return
+
+	return ..()
+
+/obj/structure/camera_assembly/proc/weld(obj/item/weldingtool/WT, mob/living/user)
+	if(!WT.remove_fuel(0, user))
+		return 0
+	to_chat(user, "<span class='notice'>You start to weld \the [src]...</span>")
+	playsound(src.loc, WT.usesound, 50, 1)
+	if(do_after(user, 20*WT.toolspeed, target = src))
+		if(WT.isOn())
+			playsound(loc, 'sound/items/welder2.ogg', 50, 1)
+			return 1
+	return 0
+
+/obj/structure/camera_assembly/deconstruct(disassembled = TRUE)
+>>>>>>> 8b54685... Cleanup to various loc assignments and nearby code (#31069)
 	if(!(flags_1 & NODECONSTRUCT_1))
 		new /obj/item/stack/sheet/metal(loc)
 	qdel(src)