diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm
index 9932934a83d..da54fbebba3 100644
--- a/code/game/machinery/computer/prisoner.dm
+++ b/code/game/machinery/computer/prisoner.dm
@@ -15,10 +15,17 @@
 	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)
@@ -93,3 +100,76 @@
 			. = TRUE
 
 	add_fingerprint(usr)
+=======
+
+/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)
+>>>>>>> 66b0338... Ports TGUI Security Stuff (#7902)
diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm
index 1fbd897113d..da1df8d8358 100644
--- a/code/game/machinery/computer/security.dm
+++ b/code/game/machinery/computer/security.dm
@@ -389,11 +389,19 @@
 
 					if(field == "age")
 						answer = text2num(answer)
+<<<<<<< HEAD
 					
 					if(field == "rank")
 						if(answer in joblist)
 							active1.fields["real_rank"] = answer
 					
+=======
+
+					if(field == "rank")
+						if(answer in joblist)
+							active1.fields["real_rank"] = answer
+
+>>>>>>> 66b0338... Ports TGUI Security Stuff (#7902)
 					if(field == "criminal")
 						for(var/mob/living/carbon/human/H in player_list)
 							BITSET(H.hud_updateflag, WANTED_HUD)
@@ -509,4 +517,8 @@
 /obj/machinery/computer/secure_data/detective_computer
 	icon_state = "messyfiles"
 
+<<<<<<< HEAD
 #undef FIELD
+=======
+#undef FIELD
+>>>>>>> 66b0338... Ports TGUI Security Stuff (#7902)
diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm
index f4d9c900ed3..2b5da6568f9 100644
--- a/code/game/machinery/doors/brigdoors.dm
+++ b/code/game/machinery/doors/brigdoors.dm
@@ -3,12 +3,17 @@
 #define FONT_COLOR "#09f"
 #define FONT_STYLE "Small Fonts"
 #define MAX_TIMER 36000
+<<<<<<< HEAD
 
 #define PRESET_SHORT 1 MINUTES
 #define PRESET_MEDIUM 5 MINUTES
 #define PRESET_LONG 10 MINUTES
+=======
+>>>>>>> 66b0338... Ports TGUI Security Stuff (#7902)
 
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
+#define PRESET_SHORT 1 MINUTES
+#define PRESET_MEDIUM 5 MINUTES
+#define PRESET_LONG 10 MINUTES
 
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // Brig Door control displays.
@@ -25,15 +30,25 @@
 	layer = ABOVE_WINDOW_LAYER
 	desc = "A remote control for a door."
 	req_access = list(access_brig)
+<<<<<<< HEAD
 	anchored = 1.0		// can't pick it up
 	density = 0			// can walk through it.
 	var/id = null		// id of door it controls.
 
+=======
+	anchored = 1.0    		// can't pick it up
+	density = 0       		// can walk through it.
+	var/id = null     		// id of door it controls.
+>>>>>>> 66b0338... Ports TGUI Security Stuff (#7902)
 	var/activation_time = 0
 	var/timer_duration = 0
 
 	var/timing = FALSE		// boolean, true/1 timer is on, false/0 means it's not timing
 	var/list/obj/machinery/targets = list()
+<<<<<<< HEAD
+=======
+
+>>>>>>> 66b0338... Ports TGUI Security Stuff (#7902)
 
 	maptext_height = 26
 	maptext_width = 32
@@ -73,10 +88,19 @@
 	if(stat & (NOPOWER|BROKEN))
 		return
 
+<<<<<<< HEAD
+=======
+	if(stat & (NOPOWER|BROKEN))
+		return
+>>>>>>> 66b0338... Ports TGUI Security Stuff (#7902)
 	if(timing)
 		if(world.time - activation_time >= timer_duration)
 			timer_end() // open doors, reset timer, clear status screen
 		update_icon()
+<<<<<<< HEAD
+=======
+
+>>>>>>> 66b0338... Ports TGUI Security Stuff (#7902)
 
 // has the door power situation changed, if so update icon.
 /obj/machinery/door_timer/power_change()
@@ -108,7 +132,11 @@
 		C.icon_state = "closed_locked"
 	return 1
 
+<<<<<<< HEAD
 // Opens and unlocks doors, power check
+=======
+/// Opens and unlocks doors, power check
+>>>>>>> 66b0338... Ports TGUI Security Stuff (#7902)
 /obj/machinery/door_timer/proc/timer_end(forced = FALSE)
 	if(stat & (NOPOWER|BROKEN))
 		return 0
@@ -138,6 +166,14 @@
 	if(seconds)
 		. /= 10
 
+<<<<<<< HEAD
+=======
+/obj/machinery/door_timer/proc/time_left(seconds = FALSE)
+	. = max(0, timer_duration - (activation_time ? (world.time - activation_time) : 0))
+	if(seconds)
+		. /= 10
+
+>>>>>>> 66b0338... Ports TGUI Security Stuff (#7902)
 /obj/machinery/door_timer/proc/set_timer(value)
 	var/new_time = clamp(value, 0, MAX_TIMER)
 	. = new_time == timer_duration //return 1 on no change
@@ -145,6 +181,12 @@
 	if(timer_duration && activation_time && timing) // Setting it while active will reset the activation time
 		activation_time = world.time
 
+<<<<<<< HEAD
+=======
+/obj/machinery/door_timer/attack_ai(mob/user)
+	return src.attack_hand(user)
+
+>>>>>>> 66b0338... Ports TGUI Security Stuff (#7902)
 /obj/machinery/door_timer/attack_hand(mob/user)
 	if(..())
 		return TRUE
@@ -291,4 +333,4 @@
 #undef FONT_SIZE
 #undef FONT_COLOR
 #undef FONT_STYLE
-#undef CHARS_PER_LINE
+#undef CHARS_PER_LINE
\ No newline at end of file
diff --git a/code/modules/detectivework/microscope/dnascanner.dm b/code/modules/detectivework/microscope/dnascanner.dm
index 1dac4a0f58f..b87639cce64 100644
--- a/code/modules/detectivework/microscope/dnascanner.dm
+++ b/code/modules/detectivework/microscope/dnascanner.dm
@@ -141,4 +141,4 @@
 	else if(bloodsamp)
 		icon_state = "dnaclosed"
 	else
-		icon_state = "dnaopen"
+		icon_state = "dnaopen"
\ No newline at end of file