From bc99e58b3e0daf768cecabfa4b049c584d75579f Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Tue, 9 Mar 2021 16:53:27 -0500
Subject: [PATCH] Update prisoner.dm

---
 code/game/machinery/computer/prisoner.dm | 80 ------------------------
 1 file changed, 80 deletions(-)

diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm
index da54fbebba3..c26d2c5365b 100644
--- a/code/game/machinery/computer/prisoner.dm
+++ b/code/game/machinery/computer/prisoner.dm
@@ -15,92 +15,13 @@
 	var/stop = 0.0
 	var/screen = 0 // 0 - No Access Denied, 1 - Access allowed
 
-<<<<<<< HEAD
-=======
 /obj/machinery/computer/prisoner/attack_ai(var/mob/user as mob)
 	return src.attack_hand(user)
 
->>>>>>> 66b0338... Ports TGUI Security Stuff (#7902)
 /obj/machinery/computer/prisoner/attack_hand(mob/user)
 	if(..())
 		return
 	tgui_interact(user)
-<<<<<<< HEAD
-
-/obj/machinery/computer/prisoner/tgui_interact(mob/user, datum/tgui/ui)
-	ui = SStgui.try_update_ui(user, src, ui)
-	if(!ui)
-		ui = new(user, src, "PrisonerManagement", name)
-		ui.open()
-
-/obj/machinery/computer/prisoner/tgui_data(mob/user)
-	var/list/data = list()
-	
-	data["locked"] = !screen
-	data["chemImplants"] = list()
-	data["trackImplants"] = list()
-	if(screen)
-		for(var/obj/item/weapon/implant/chem/C in all_chem_implants)
-			var/turf/T = get_turf(C)
-			if(!T)
-				continue
-			if(!C.implanted)
-				continue
-			data["chemImplants"].Add(list(list(
-				"host" = C.imp_in,
-				"units" = C.reagents.total_volume,
-				"ref" = "\ref[C]"
-			)))
-		for(var/obj/item/weapon/implant/tracking/track in all_tracking_implants)
-			var/turf/T = get_turf(track)
-			if(!T)
-				continue
-			if(!track.implanted)
-				continue
-			var/loc_display = "Unknown"
-			var/mob/living/L = track.imp_in
-			if((get_z(L) in using_map.station_levels) && !istype(L.loc, /turf/space))
-				loc_display = T.loc
-			if(track.malfunction)
-				loc_display = pick(teleportlocs)
-			data["trackImplants"].Add(list(list(
-				"host" = L,
-				"ref" = "\ref[track]",
-				"id" = "[track.id]",
-				"loc" = "[loc_display]",
-			)))
-
-	return data
-
-/obj/machinery/computer/prisoner/tgui_act(action, list/params)
-	if(..())
-		return TRUE
-
-	switch(action)
-		if("inject")
-			var/obj/item/weapon/implant/I = locate(params["imp"])
-			if(I)
-				I.activate(clamp(params["val"], 0, 10))
-			. = TRUE
-
-		if("lock")
-			if(allowed(usr))
-				screen = !screen
-			else
-				to_chat(usr, "Unauthorized Access.")
-			. = TRUE
-
-		if("warn")
-			var/warning = sanitize(input(usr, "Message:", "Enter your message here!", ""))
-			if(!warning)
-				return
-			var/obj/item/weapon/implant/I = locate(params["imp"])
-			if(I && I.imp_in)
-				to_chat(I.imp_in, "<span class='notice'>You hear a voice in your head saying: '[warning]'</span>")
-			. = TRUE
-
-	add_fingerprint(usr)
-=======
 
 /obj/machinery/computer/prisoner/tgui_interact(mob/user, datum/tgui/ui)
 	ui = SStgui.try_update_ui(user, src, ui)
@@ -172,4 +93,3 @@
 				to_chat(I.imp_in, "<span class='notice'>You hear a voice in your head saying: '[warning]'</span>")
 			. = TRUE
 	add_fingerprint(usr)
->>>>>>> 66b0338... Ports TGUI Security Stuff (#7902)