From 93e232104db3460610e952d03de9e998b0fdc46f Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sat, 2 Jun 2018 07:33:52 -0500
Subject: [PATCH] Update embedded_controller_base.dm

---
 .../embedded_controller_base.dm               | 91 -------------------
 1 file changed, 91 deletions(-)

diff --git a/code/game/machinery/embedded_controller/embedded_controller_base.dm b/code/game/machinery/embedded_controller/embedded_controller_base.dm
index d17d07aa93..063cfa6805 100644
--- a/code/game/machinery/embedded_controller/embedded_controller_base.dm
+++ b/code/game/machinery/embedded_controller/embedded_controller_base.dm
@@ -1,93 +1,3 @@
-<<<<<<< HEAD
-/datum/computer/file/embedded_program
-	var/list/memory = list()
-	var/state
-	var/obj/machinery/embedded_controller/master
-
-/datum/computer/file/embedded_program/proc/post_signal(datum/signal/signal, comm_line)
-	if(master)
-		master.post_signal(signal, comm_line)
-	else
-		qdel(signal)
-
-/datum/computer/file/embedded_program/proc/receive_user_command(command)
-
-/datum/computer/file/embedded_program/proc/receive_signal(datum/signal/signal)
-	return null
-
-/datum/computer/file/embedded_program/process()
-	return 0
-
-/obj/machinery/embedded_controller
-	var/datum/computer/file/embedded_program/program
-
-	name = "embedded controller"
-	density = FALSE
-	anchored = TRUE
-
-	var/on = TRUE
-
-/obj/machinery/embedded_controller/ui_interact(mob/user)
-	. = ..()
-	user.set_machine(src)
-	var/datum/browser/popup = new(user, "computer", name) // Set up the popup browser window
-	popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
-	popup.set_content(return_text())
-	popup.open()
-
-/obj/machinery/embedded_controller/update_icon()
-
-/obj/machinery/embedded_controller/proc/return_text()
-
-/obj/machinery/embedded_controller/proc/post_signal(datum/signal/signal, comm_line)
-	return 0
-
-/obj/machinery/embedded_controller/receive_signal(datum/signal/signal)
-	if(istype(signal) && program)
-		program.receive_signal(signal)
-
-/obj/machinery/embedded_controller/Topic(href, href_list)
-	if(..())
-		return 0
-
-	if(program)
-		program.receive_user_command(href_list["command"])
-		addtimer(CALLBACK(program, /datum/computer/file/embedded_program.proc/process), 5)
-
-	usr.set_machine(src)
-	addtimer(CALLBACK(src, .proc/updateDialog), 5)
-
-/obj/machinery/embedded_controller/process()
-	if(program)
-		program.process()
-
-	update_icon()
-	src.updateDialog()
-
-/obj/machinery/embedded_controller/radio
-	var/frequency
-	var/datum/radio_frequency/radio_connection
-
-/obj/machinery/embedded_controller/radio/Destroy()
-	SSradio.remove_object(src,frequency)
-	return ..()
-
-/obj/machinery/embedded_controller/radio/Initialize()
-	. = ..()
-	set_frequency(frequency)
-
-/obj/machinery/embedded_controller/radio/post_signal(datum/signal/signal)
-	signal.transmission_method = TRANSMISSION_RADIO
-	if(radio_connection)
-		return radio_connection.post_signal(src, signal)
-	else
-		signal = null
-
-/obj/machinery/embedded_controller/radio/proc/set_frequency(new_frequency)
-	SSradio.remove_object(src, frequency)
-	frequency = new_frequency
-	radio_connection = SSradio.add_object(src, frequency)
-=======
 /datum/computer/file/embedded_program
 	var/list/memory = list()
 	var/state
@@ -175,4 +85,3 @@
 	SSradio.remove_object(src, frequency)
 	frequency = new_frequency
 	radio_connection = SSradio.add_object(src, frequency)
->>>>>>> 6d0179f... Merge pull request #38116 from AutomaticFrenzy/patch/anchored