Ports https://github.com/tgstation/tgstation/pull/50497

code/modules/NTNet/relays.dm

@@ -69,7 +69,7 @@
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 
 	if(!ui)
-		ui = new(user, src, ui_key, "ntnet_relay", "NTNet Quantum Relay", ui_x, ui_y, master_ui, state)
+		ui = new(user, src, ui_key, "NtnetRelay", "NTNet Quantum Relay", ui_x, ui_y, master_ui, state)
 		ui.open()
 
 

code/modules/admin/verbs/borgpanel.dm

@@ -36,7 +36,7 @@
 /datum/borgpanel/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.admin_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "borgopanel", "Borg Panel", 700, 700, master_ui, state)
+		ui = new(user, src, ui_key, "BorgPanel", "Borg Panel", 700, 700, master_ui, state)
 		ui.open()
 
 /datum/borgpanel/ui_data(mob/user)

code/modules/antagonists/changeling/cellular_emporium.dm

@@ -16,7 +16,7 @@
 /datum/cellular_emporium/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.always_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "cellular_emporium", name, 900, 480, master_ui, state)
+		ui = new(user, src, ui_key, "CellularEmporium", name, 900, 480, master_ui, state)
 		ui.open()
 
 /datum/cellular_emporium/ui_data(mob/user)

code/modules/antagonists/nukeop/equipment/nuclearbomb.dm

@@ -7,6 +7,9 @@
 	density = TRUE
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
 
+	ui_x = 350
+	ui_y = 442
+
 	var/timer_set = 90
 	var/default_timer_set = 90
 	var/minimum_timer_set = 90
@@ -262,8 +265,7 @@
 /obj/machinery/nuclearbomb/ui_interact(mob/user, ui_key="main", datum/tgui/ui=null, force_open=0, datum/tgui/master_ui=null, datum/ui_state/state=GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "nuclear_bomb", name, 350, 442, master_ui, state)
-		ui.set_style(ui_style)
+		ui = new(user, src, ui_key, "NuclearBomb", name, ui_x, ui_y, master_ui, state)
 		ui.open()
 
 /obj/machinery/nuclearbomb/ui_data(mob/user)

code/modules/assembly/health.dm

@@ -4,7 +4,6 @@
 	icon_state = "health"
 	custom_materials = list(/datum/material/iron=800, /datum/material/glass=200)
 	attachable = TRUE
-	secured = FALSE
 
 	var/scanning = FALSE
 	var/health_scan
@@ -12,7 +11,8 @@
 
 /obj/item/assembly/health/examine(mob/user)
 	. = ..()
-	. += "<span class='notice'>Use a multitool to swap between \"detect death\" mode and \"detect critical state\" mode.</span>"
+	. += "Use it in hand to turn it off/on and Alt-click to swap between \"detect death\" mode and \"detect critical state\" mode."
+	. += "[src.scanning ? "The sensor is on and you can see [health_scan] displayed on the screen" : "The sensor is off"]."
 
 /obj/item/assembly/health/activate()
 	if(!..())
@@ -30,14 +30,13 @@
 	update_icon()
 	return secured
 
-/obj/item/assembly/health/multitool_act(mob/living/user, obj/item/I)
+/obj/item/assembly/health/AltClick(mob/living/user)
 	if(alarm_health == HEALTH_THRESHOLD_CRIT)
 		alarm_health = HEALTH_THRESHOLD_DEAD
 		to_chat(user, "<span class='notice'>You toggle [src] to \"detect death\" mode.</span>")
 	else
 		alarm_health = HEALTH_THRESHOLD_CRIT
 		to_chat(user, "<span class='notice'>You toggle [src] to \"detect critical state\" mode.</span>")
-	return TRUE
 
 /obj/item/assembly/health/process()
 	if(!scanning || !secured)
@@ -46,7 +45,6 @@
 	var/atom/A = src
 	if(connected && connected.holder)
 		A = connected.holder
-
 	for(A, A && !ismob(A), A=A.loc);
 	// like get_turf(), but for mobs.
 	var/mob/living/M = A
@@ -71,36 +69,7 @@
 		STOP_PROCESSING(SSobj, src)
 	return
 
-/obj/item/assembly/health/ui_interact(mob/user as mob)//TODO: Change this to the wires thingy
+/obj/item/assembly/health/attack_self(mob/user)
 	. = ..()
-	if(!secured)
-		user.show_message("<span class='warning'>The [name] is unsecured!</span>")
-		return FALSE
-	var/dat = "<TT><B>Health Sensor</B></TT>"
-	dat += "<BR><A href='?src=[REF(src)];scanning=1'>[scanning?"On":"Off"]</A>"
-	if(scanning && health_scan)
-		dat += "<BR>Health: [health_scan]"
-	user << browse(dat, "window=hscan")
-	onclose(user, "hscan")
-
-/obj/item/assembly/health/Topic(href, href_list)
-	..()
-	if(!ismob(usr))
-		return
-
-	var/mob/user = usr
-
-	if(!user.canUseTopic(src))
-		usr << browse(null, "window=hscan")
-		onclose(usr, "hscan")
-		return
-
-	if(href_list["scanning"])
-		toggle_scan()
-
-	if(href_list["close"])
-		usr << browse(null, "window=hscan")
-		return
-
-	attack_self(user)
-	return
+	to_chat(user, "<span class='notice'>You toggle [src] [src.scanning ? "off" : "on"].</span>")
+	toggle_scan()

code/modules/assembly/infrared.dm

@@ -4,7 +4,10 @@
 	icon_state = "infrared"
 	custom_materials = list(/datum/material/iron=1000, /datum/material/glass=500)
 	is_position_sensitive = TRUE
-
+	drop_sound = 'sound/items/handling/component_drop.ogg'
+	pickup_sound =  'sound/items/handling/component_pickup.ogg'
+	var/ui_x = 225
+	var/ui_y = 110
 	var/on = FALSE
 	var/visible = FALSE
 	var/maxlength = 8
@@ -38,7 +41,7 @@
 
 /obj/item/assembly/infra/activate()
 	if(!..())
-		return FALSE//Cooldown check
+		return FALSE //Cooldown check
 	on = !on
 	refreshBeam()
 	update_icon()
@@ -69,7 +72,7 @@
 		holder.update_icon()
 	return
 
-/obj/item/assembly/infra/dropped(mob/user)
+/obj/item/assembly/infra/dropped()
 	. = ..()
 	if(holder)
 		holder_movement() //sync the dir of the device as well if it's contained in a TTV or an assembly holder
@@ -133,7 +136,7 @@
 	. = ..()
 	setDir(t)
 
-/obj/item/assembly/infra/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback)
+/obj/item/assembly/infra/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback, force, gentle = FALSE)
 	. = ..()
 	olddir = dir
 
@@ -176,55 +179,56 @@
 			return
 	return refreshBeam()
 
-/obj/item/assembly/infra/ui_interact(mob/user)//TODO: change this this to the wire control panel
-	. = ..()
-	if(is_secured(user))
-		user.set_machine(src)
-		var/dat = "<TT><B>Infrared Laser</B></TT>"
-		dat += "<BR><B>Status</B>: [on ? "<A href='?src=[REF(src)];state=0'>On</A>" : "<A href='?src=[REF(src)];state=1'>Off</A>"]"
-		dat += "<BR><B>Visibility</B>: [visible ? "<A href='?src=[REF(src)];visible=0'>Visible</A>" : "<A href='?src=[REF(src)];visible=1'>Invisible</A>"]"
-		dat += "<BR><BR><A href='?src=[REF(src)];refresh=1'>Refresh</A>"
-		dat += "<BR><BR><A href='?src=[REF(src)];close=1'>Close</A>"
-		user << browse(dat, "window=infra")
-		onclose(user, "infra")
-		return
-
-/obj/item/assembly/infra/Topic(href, href_list)
-	..()
-	if(usr.incapacitated() || !in_range(loc, usr))
-		usr << browse(null, "window=infra")
-		onclose(usr, "infra")
-		return
-	if(href_list["state"])
-		on = !(on)
-		update_icon()
-		refreshBeam()
-	if(href_list["visible"])
-		visible = !(visible)
-		update_icon()
-		refreshBeam()
-	if(href_list["close"])
-		usr << browse(null, "window=infra")
-		return
-	if(usr)
-		attack_self(usr)
-
 /obj/item/assembly/infra/setDir()
 	. = ..()
 	refreshBeam()
 
+/obj/item/assembly/infra/ui_status(mob/user)
+	if(is_secured(user))
+		return ..()
+	return UI_CLOSE
+
+/obj/item/assembly/infra/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
+									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.hands_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "InfraredEmitter", name, ui_x, ui_y, master_ui, state)
+		ui.open()
+
+/obj/item/assembly/infra/ui_data(mob/user)
+	var/list/data = list()
+	data["on"] = on
+	data["visible"] = visible
+	return data
+
+/obj/item/assembly/infra/ui_act(action, params)
+	if(..())
+		return
+
+	switch(action)
+		if("power")
+			on = !on
+			. = TRUE
+		if("visibility")
+			visible = !visible
+			. = TRUE
+
+	update_icon()
+	refreshBeam()
+
 /***************************IBeam*********************************/
 
 /obj/effect/beam/i_beam
 	name = "infrared beam"
 	icon = 'icons/obj/projectiles.dmi'
 	icon_state = "ibeam"
-	var/obj/item/assembly/infra/master
 	anchored = TRUE
 	density = FALSE
 	pass_flags = PASSTABLE|PASSGLASS|PASSGRILLE|LETPASSTHROW
+	var/obj/item/assembly/infra/master
 
 /obj/effect/beam/i_beam/Crossed(atom/movable/AM as mob|obj)
+	. = ..()
 	if(istype(AM, /obj/effect/beam))
 		return
 	if (isitem(AM))

code/modules/assembly/proximity.dm

@@ -4,7 +4,10 @@
 	icon_state = "prox"
 	custom_materials = list(/datum/material/iron=800, /datum/material/glass=200)
 	attachable = TRUE
-
+	drop_sound = 'sound/items/handling/component_drop.ogg'
+	pickup_sound =  'sound/items/handling/component_pickup.ogg'
+	var/ui_x = 250
+	var/ui_y = 185
 	var/scanning = FALSE
 	var/timing = FALSE
 	var/time = 10
@@ -26,7 +29,7 @@
 
 /obj/item/assembly/prox_sensor/activate()
 	if(!..())
-		return FALSE//Cooldown check
+		return FALSE //Cooldown check
 	if(!scanning)
 		timing = !timing
 	else
@@ -41,7 +44,6 @@
 	else
 		proximity_monitor.SetHost(src,src)
 
-
 /obj/item/assembly/prox_sensor/toggle_secure()
 	secured = !secured
 	if(!secured)
@@ -56,8 +58,6 @@
 	update_icon()
 	return secured
 
-
-
 /obj/item/assembly/prox_sensor/HasProximity(atom/movable/AM as mob|obj)
 	if (istype(AM, /obj/effect/beam))
 		return
@@ -75,7 +75,6 @@
 	next_activate = world.time + 30
 	return TRUE
 
-
 /obj/item/assembly/prox_sensor/process()
 	if(!timing)
 		return
@@ -111,50 +110,47 @@
 		holder.update_icon()
 	return
 
-/obj/item/assembly/prox_sensor/ui_interact(mob/user)//TODO: Change this to the wires thingy
-	. = ..()
+/obj/item/assembly/prox_sensor/ui_status(mob/user)
 	if(is_secured(user))
-		var/second = time % 60
-		var/minute = (time - second) / 60
-		var/dat = "<TT><B>Proximity Sensor</B></TT>"
-		if(!scanning)
-			dat += "<BR>[(timing ? "<A href='?src=[REF(src)];time=0'>Arming</A>" : "<A href='?src=[REF(src)];time=1'>Not Arming</A>")] [minute]:[second]"
-			dat += "<BR><A href='?src=[REF(src)];tp=-30'>-</A> <A href='?src=[REF(src)];tp=-1'>-</A> <A href='?src=[REF(src)];tp=1'>+</A> <A href='?src=[REF(src)];tp=30'>+</A>"
-		dat += "<BR><A href='?src=[REF(src)];scanning=[scanning?"0'>Armed":"1'>Unarmed (Movement sensor active when armed!)"]</A>"
-		dat += "<BR>Detection range: <A href='?src=[REF(src)];sense=down'>-</A> [sensitivity] <A href='?src=[REF(src)];sense=up'>+</A>"
-		dat += "<BR><BR><A href='?src=[REF(src)];refresh=1'>Refresh</A>"
-		dat += "<BR><BR><A href='?src=[REF(src)];close=1'>Close</A>"
-		user << browse(dat, "window=prox")
-		onclose(user, "prox")
+		return ..()
+	return UI_CLOSE
+
+/obj/item/assembly/prox_sensor/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
+									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.hands_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "ProximitySensor", name, ui_x, ui_y, master_ui, state)
+		ui.open()
+
+/obj/item/assembly/prox_sensor/ui_data(mob/user)
+	var/list/data = list()
+	data["seconds"] = round(time % 60)
+	data["minutes"] = round((time - data["seconds"]) / 60)
+	data["timing"] = timing
+	data["scanning"] = scanning
+	data["sensitivity"] = sensitivity
+	return data
+
+/obj/item/assembly/prox_sensor/ui_act(action, params)
+	if(..())
 		return
 
-
-/obj/item/assembly/prox_sensor/Topic(href, href_list)
-	..()
-	if(usr.incapacitated() || !in_range(loc, usr))
-		usr << browse(null, "window=prox")
-		onclose(usr, "prox")
-		return
-
-	if(href_list["sense"])
-		sensitivity_change(((href_list["sense"] == "up") ? 1 : -1))
-
-	if(href_list["scanning"])
-		toggle_scan(text2num(href_list["scanning"]))
-
-	if(href_list["time"])
-		timing = text2num(href_list["time"])
-		update_icon()
-
-	if(href_list["tp"])
-		var/tp = text2num(href_list["tp"])
-		time += tp
-		time = min(max(round(time), 0), 600)
-
-	if(href_list["close"])
-		usr << browse(null, "window=prox")
-		return
-
-	if(usr)
-		attack_self(usr)
-
+	switch(action)
+		if("scanning")
+			toggle_scan(!scanning)
+			. = TRUE
+		if("sense")
+			var/value = text2num(params["range"])
+			if(value)
+				sensitivity_change(value)
+				. = TRUE
+		if("time")
+			timing = !timing
+			update_icon()
+			. = TRUE
+		if("input")
+			var/value = text2num(params["adjust"])
+			if(value)
+				value = round(time + value)
+				time = clamp(value, 0, 600)
+				. = TRUE

code/modules/assembly/signaler.dm

@@ -8,32 +8,49 @@
 	custom_materials = list(/datum/material/iron=400, /datum/material/glass=120)
 	wires = WIRE_RECEIVE | WIRE_PULSE | WIRE_RADIO_PULSE | WIRE_RADIO_RECEIVE
 	attachable = TRUE
-
+	drop_sound = 'sound/items/handling/component_drop.ogg'
+	pickup_sound =  'sound/items/handling/component_pickup.ogg'
+	var/ui_x = 280
+	var/ui_y = 132
 	var/code = DEFAULT_SIGNALER_CODE
 	var/frequency = FREQ_SIGNALER
 	var/datum/radio_frequency/radio_connection
-	var/suicider = null
+	///Holds the mind that commited suicide.
+	var/datum/mind/suicider
+	///Holds a reference string to the mob, decides how much of a gamer you are.
+	var/suicide_mob
 	var/hearing_range = 1
 
 /obj/item/assembly/signaler/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] eats \the [src]! If it is signaled, [user.p_they()] will die!</span>")
 	playsound(src, 'sound/items/eatfood.ogg', 50, TRUE)
-	user.transferItemToLoc(src, user, TRUE)
-	suicider = user
-	return MANUAL_SUICIDE
+	moveToNullspace()
+	suicider = user.mind
+	suicide_mob = REF(user)
+	return MANUAL_SUICIDE_NONLETHAL
 
-/obj/item/assembly/signaler/proc/manual_suicide(mob/living/carbon/user)
-	user.visible_message("<span class='suicide'>[user]'s \the [src] receives a signal, killing [user.p_them()] instantly!</span>")
+/obj/item/assembly/signaler/proc/manual_suicide(datum/mind/suicidee)
+	var/mob/living/user = suicidee.current
+	if(!istype(user))
+		return
+	if(suicide_mob == REF(user))
+		user.visible_message("<span class='suicide'>[user]'s [src] receives a signal, killing [user.p_them()] instantly!</span>")
+	else
+		user.visible_message("<span class='suicide'>[user]'s [src] receives a signal and [user.p_they()] die[user.p_s()] like a gamer!</span>")
 	user.adjustOxyLoss(200)//it sends an electrical pulse to their heart, killing them. or something.
 	user.death(0)
+	user.set_suicide(TRUE)
+	user.suicide_log()
+	playsound(user, 'sound/machines/triple_beep.ogg', ASSEMBLY_BEEP_VOLUME, TRUE)
+	qdel(src)
 
 /obj/item/assembly/signaler/Initialize()
 	. = ..()
 	set_frequency(frequency)
 
-
 /obj/item/assembly/signaler/Destroy()
 	SSradio.remove_object(src,frequency)
+	suicider = null
 	. = ..()
 
 /obj/item/assembly/signaler/activate()
@@ -47,14 +64,16 @@
 		holder.update_icon()
 	return
 
-/obj/item/assembly/signaler/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
-	if(!is_secured(user))
-		return
+/obj/item/assembly/signaler/ui_status(mob/user)
+	if(is_secured(user))
+		return ..()
+	return UI_CLOSE
+
+/obj/item/assembly/signaler/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
+									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.hands_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		var/ui_width = 280
-		var/ui_height = 132
-		ui = new(user, src, ui_key, "signaler", name, ui_width, ui_height, master_ui, state)
+		ui = new(user, src, ui_key, "Signaler", name, ui_x, ui_y, master_ui, state)
 		ui.open()
 
 /obj/item/assembly/signaler/ui_data(mob/user)
@@ -63,12 +82,12 @@
 	data["code"] = code
 	data["minFrequency"] = MIN_FREE_FREQ
 	data["maxFrequency"] = MAX_FREE_FREQ
-
 	return data
 
 /obj/item/assembly/signaler/ui_act(action, params)
 	if(..())
 		return
+
 	switch(action)
 		if("signal")
 			INVOKE_ASYNC(src, .proc/signal)
@@ -90,7 +109,7 @@
 			. = TRUE
 
 	update_icon()
-	
+
 /obj/item/assembly/signaler/attackby(obj/item/W, mob/user, params)
 	if(issignaler(W))
 		var/obj/item/assembly/signaler/signaler2 = W
@@ -112,9 +131,6 @@
 	if(usr)
 		GLOB.lastsignalers.Add("[time] <B>:</B> [usr.key] used [src] @ location ([T.x],[T.y],[T.z]) <B>:</B> [format_frequency(frequency)]/[code]")
 
-
-	return
-
 /obj/item/assembly/signaler/receive_signal(datum/signal/signal)
 	. = FALSE
 	if(!signal)
@@ -125,6 +141,7 @@
 		return
 	if(suicider)
 		manual_suicide(suicider)
+		return
 	pulse(TRUE)
 	audible_message("[icon2html(src, hearers(src))] *beep* *beep* *beep*", null, hearing_range)
 	for(var/CHM in get_hearers_in_view(hearing_range, src))
@@ -133,7 +150,6 @@
 			LM.playsound_local(get_turf(src), 'sound/machines/triple_beep.ogg', ASSEMBLY_BEEP_VOLUME, TRUE)
 	return TRUE
 
-
 /obj/item/assembly/signaler/proc/set_frequency(new_frequency)
 	SSradio.remove_object(src, frequency)
 	frequency = new_frequency
@@ -162,7 +178,6 @@
 		return
 	return ..(signal)
 
-
 // Embedded signaller used in anomalies.
 /obj/item/assembly/signaler/anomaly
 	name = "anomaly core"
@@ -179,6 +194,8 @@
 		return FALSE
 	if(signal.data["code"] != code)
 		return FALSE
+	if(suicider)
+		manual_suicide(suicider)
 	for(var/obj/effect/anomaly/A in get_turf(src))
 		A.anomalyNeutralize()
 	return TRUE
@@ -191,4 +208,4 @@
 /obj/item/assembly/signaler/cyborg/attackby(obj/item/W, mob/user, params)
 	return
 /obj/item/assembly/signaler/cyborg/screwdriver_act(mob/living/user, obj/item/I)
-	return
+	return

code/modules/assembly/timer.dm

@@ -4,7 +4,10 @@
 	icon_state = "timer"
 	custom_materials = list(/datum/material/iron=500, /datum/material/glass=50)
 	attachable = TRUE
-
+	drop_sound = 'sound/items/handling/component_drop.ogg'
+	pickup_sound =  'sound/items/handling/component_pickup.ogg'
+	var/ui_x = 275
+	var/ui_y = 115
 	var/timing = FALSE
 	var/time = 5
 	var/saved_time = 5
@@ -41,7 +44,6 @@
 	update_icon()
 	return TRUE
 
-
 /obj/item/assembly/timer/toggle_secure()
 	secured = !secured
 	if(secured)
@@ -52,7 +54,6 @@
 	update_icon()
 	return secured
 
-
 /obj/item/assembly/timer/proc/timer_end()
 	if(!secured || next_activate > world.time)
 		return FALSE
@@ -66,7 +67,6 @@
 		timing = TRUE
 	update_icon()
 
-
 /obj/item/assembly/timer/process()
 	if(!timing)
 		return
@@ -76,7 +76,6 @@
 		timer_end()
 		time = saved_time
 
-
 /obj/item/assembly/timer/update_icon()
 	cut_overlays()
 	attached_overlays = list()
@@ -86,50 +85,44 @@
 	if(holder)
 		holder.update_icon()
 
-
-/obj/item/assembly/timer/ui_interact(mob/user)//TODO: Have this use the wires
-	. = ..()
+/obj/item/assembly/timer/ui_status(mob/user)
 	if(is_secured(user))
-		var/second = time % 60
-		var/minute = (time - second) / 60
-		var/dat = "<TT><B>Timing Unit</B></TT>"
-		dat += "<BR>[(timing ? "<A href='?src=[REF(src)];time=0'>Timing</A>" : "<A href='?src=[REF(src)];time=1'>Not Timing</A>")] [minute]:[second]"
-		dat += "<BR><A href='?src=[REF(src)];tp=-30'>-</A> <A href='?src=[REF(src)];tp=-1'>-</A> <A href='?src=[REF(src)];tp=1'>+</A> <A href='?src=[REF(src)];tp=30'>+</A>"
-		dat += "<BR><BR><A href='?src=[REF(src)];repeat=[(loop ? "0'>Stop repeating" : "1'>Set to repeat")]</A>"
-		dat += "<BR><BR><A href='?src=[REF(src)];refresh=1'>Refresh</A>"
-		dat += "<BR><BR><A href='?src=[REF(src)];close=1'>Close</A>"
-		var/datum/browser/popup = new(user, "timer", name)
-		popup.set_content(dat)
-		popup.open()
+		return ..()
+	return UI_CLOSE
 
+/obj/item/assembly/timer/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
+									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.hands_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "Timer", name, ui_x, ui_y, master_ui, state)
+		ui.open()
 
-/obj/item/assembly/timer/Topic(href, href_list)
-	..()
-	if(!usr.canUseTopic(src, BE_CLOSE))
-		usr << browse(null, "window=timer")
-		onclose(usr, "timer")
+/obj/item/assembly/timer/ui_data(mob/user)
+	var/list/data = list()
+	data["seconds"] = round(time % 60)
+	data["minutes"] = round((time - data["seconds"]) / 60)
+	data["timing"] = timing
+	data["loop"] = loop
+	return data
+
+/obj/item/assembly/timer/ui_act(action, params)
+	if(..())
 		return
 
-	if(href_list["time"])
-		timing = text2num(href_list["time"])
-		if(timing && istype(holder, /obj/item/transfer_valve))
-			var/timer_message = "[ADMIN_LOOKUPFLW(usr)] activated [src] attachment on [holder]."
-			message_admins(timer_message)
-			GLOB.bombers += timer_message
-			log_game("[key_name(usr)] activated [src] attachment on [holder]")
-		update_icon()
-	if(href_list["repeat"])
-		loop = text2num(href_list["repeat"])
-
-	if(href_list["tp"])
-		var/tp = text2num(href_list["tp"])
-		time += tp
-		time = min(max(round(time), 1), 600)
-		saved_time = time
-
-	if(href_list["close"])
-		usr << browse(null, "window=timer")
-		return
-
-	if(usr)
-		attack_self(usr)
+	switch(action)
+		if("time")
+			timing = !timing
+			if(timing && istype(holder, /obj/item/transfer_valve))
+				log_bomber(usr, "activated a", src, "attachment on [holder]")
+			update_icon()
+			. = TRUE
+		if("repeat")
+			loop = !loop
+			. = TRUE
+		if("input")
+			var/value = text2num(params["adjust"])
+			if(value)
+				value = round(time + value)
+				time = clamp(value, 1, 600)
+				saved_time = time
+				. = TRUE

code/modules/atmospherics/machinery/airalarm.dm

@@ -239,7 +239,7 @@
 									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "airalarm", name, 440, 650, master_ui, state)
+		ui = new(user, src, ui_key, "AirAlarm", name, 440, 650, master_ui, state)
 		ui.open()
 
 /obj/machinery/airalarm/ui_data(mob/user)

code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm

@@ -26,6 +26,21 @@ Passive gate is similar to the regular pump except:
 	construction_type = /obj/item/pipe/directional
 	pipe_state = "passivegate"
 
+	ui_x = 335
+	ui_y = 115
+
+/obj/machinery/atmospherics/components/binary/passive_gate/CtrlClick(mob/user)
+	if(can_interact(user))
+		on = !on
+		update_icon()
+	return ..()
+
+/obj/machinery/atmospherics/components/binary/passive_gate/AltClick(mob/user)
+	if(can_interact(user))
+		target_pressure = MAX_OUTPUT_PRESSURE
+		update_icon()
+	return ..()
+
 /obj/machinery/atmospherics/components/binary/passive_gate/Destroy()
 	SSradio.remove_object(src,frequency)
 	return ..()
@@ -91,7 +106,7 @@ Passive gate is similar to the regular pump except:
 																		datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "atmos_pump", name, 335, 115, master_ui, state)
+		ui = new(user, src, ui_key, "AtmosPump", name, ui_x, ui_y, master_ui, state)
 		ui.open()
 
 /obj/machinery/atmospherics/components/binary/passive_gate/ui_data()

code/modules/atmospherics/machinery/components/binary_devices/pump.dm

@@ -111,7 +111,7 @@
 																datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "atmos_pump", name, 335, 115, master_ui, state)
+		ui = new(user, src, ui_key, "AtmosPump", name, 335, 115, master_ui, state)
 		ui.open()
 
 /obj/machinery/atmospherics/components/binary/pump/ui_data()
@@ -212,4 +212,4 @@
 
 /obj/machinery/atmospherics/components/binary/pump/on/layer3
 	piping_layer = 3
-	icon_state= "pump_on_map-3"
+	icon_state= "pump_on_map-3"

code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm

@@ -96,7 +96,7 @@
 																		datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "atmos_pump", name, 310, 115, master_ui, state)
+		ui = new(user, src, ui_key, "AtmosPump", name, 310, 115, master_ui, state)
 		ui.open()
 
 /obj/machinery/atmospherics/components/binary/volume_pump/ui_data()
@@ -200,4 +200,4 @@
 
 /obj/machinery/atmospherics/components/binary/volume_pump/on/layer3
 	piping_layer = 3
-	icon_state = "volpump_map-3"
+	icon_state = "volpump_map-3"

code/modules/atmospherics/machinery/components/trinary_devices/filter.dm

@@ -138,7 +138,7 @@
 																	datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "atmos_filter", name, 475, 185, master_ui, state)
+		ui = new(user, src, ui_key, "AtmosFilter", name, 475, 185, master_ui, state)
 		ui.open()
 
 /obj/machinery/atmospherics/components/trinary/filter/ui_data()
@@ -280,4 +280,4 @@
 	critical_machine = TRUE
 
 /obj/machinery/atmospherics/components/trinary/filter/flipped/critical
-	critical_machine = TRUE
+	critical_machine = TRUE

code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm

@@ -131,7 +131,7 @@
 																	datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "atmos_mixer", name, ui_x, ui_y, master_ui, state)
+		ui = new(user, src, ui_key, "AtmosMixer", name, ui_x, ui_y, master_ui, state)
 		ui.open()
 
 /obj/machinery/atmospherics/components/trinary/mixer/ui_data()

code/modules/atmospherics/machinery/components/unary_devices/cryo.dm

@@ -317,7 +317,7 @@
 																	datum/tgui/master_ui = null, datum/ui_state/state = GLOB.notcontained_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "cryo", name, 400, 550, master_ui, state)
+		ui = new(user, src, ui_key, "Cryo", name, 400, 550, master_ui, state)
 		ui.open()
 
 /obj/machinery/atmospherics/components/unary/cryo_cell/ui_data()

code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm

@@ -20,6 +20,21 @@
 
 	pipe_state = "injector"
 
+	ui_x = 310
+	ui_y = 115
+
+/obj/machinery/atmospherics/components/unary/outlet_injector/CtrlClick(mob/user)
+	if(can_interact(user))
+		on = !on
+		update_icon()
+	return ..()
+
+/obj/machinery/atmospherics/components/unary/outlet_injector/AltClick(mob/user)
+	if(can_interact(user))
+		volume_rate = MAX_TRANSFER_RATE
+		update_icon()
+	return ..()
+
 /obj/machinery/atmospherics/components/unary/outlet_injector/Destroy()
 	SSradio.remove_object(src,frequency)
 	return ..()
@@ -140,7 +155,7 @@
 																		datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "atmos_pump", name, 310, 115, master_ui, state)
+		ui = new(user, src, ui_key, "AtmosPump", name, ui_x, ui_y, master_ui, state)
 		ui.open()
 
 /obj/machinery/atmospherics/components/unary/outlet_injector/ui_data()

code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm

@@ -128,7 +128,7 @@
 																	datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "thermomachine", name, ui_x, ui_y, master_ui, state)
+		ui = new(user, src, ui_key, "ThermoMachine", name, ui_x, ui_y, master_ui, state)
 		ui.open()
 
 /obj/machinery/atmospherics/components/unary/thermomachine/ui_data(mob/user)

code/modules/atmospherics/machinery/portable/canister.dm

@@ -321,7 +321,7 @@
 															datum/tgui/master_ui = null, datum/ui_state/state = GLOB.physical_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "canister", name, 420, 405, master_ui, state)
+		ui = new(user, src, ui_key, "Canister", name, 420, 405, master_ui, state)
 		ui.open()
 
 /obj/machinery/portable_atmospherics/canister/ui_data()

code/modules/atmospherics/machinery/portable/pump.dm

@@ -8,6 +8,8 @@
 	name = "portable air pump"
 	icon_state = "psiphon:0"
 	density = TRUE
+	ui_x = 300
+	ui_y = 315
 
 	var/on = FALSE
 	var/direction = PUMP_OUT
@@ -32,7 +34,6 @@
 /obj/machinery/portable_atmospherics/pump/update_icon_state()
 	icon_state = "psiphon:[on]"
 
-
 /obj/machinery/portable_atmospherics/pump/update_overlays()
 	. = ..()
 	if(holding)
@@ -79,14 +80,14 @@
 				on = FALSE
 				update_icon()
 		else if(on && holding && direction == PUMP_OUT)
-			investigate_log("[key_name(user)] started a transfer into [holding].<br>", INVESTIGATE_ATMOS)
+			investigate_log("[key_name(user)] started a transfer into [holding].", INVESTIGATE_ATMOS)
 
 
 /obj/machinery/portable_atmospherics/pump/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
 														datum/tgui/master_ui = null, datum/ui_state/state = GLOB.physical_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "portable_pump", name, 300, 315, master_ui, state)
+		ui = new(user, src, ui_key, "PortablePump", name, ui_x, ui_y, master_ui, state)
 		ui.open()
 
 /obj/machinery/portable_atmospherics/pump/ui_data()
@@ -121,14 +122,14 @@
 					message_admins("[ADMIN_LOOKUPFLW(usr)] turned on a pump that contains [n2o ? "N2O" : ""][n2o && plasma ? " & " : ""][plasma ? "Plasma" : ""] at [ADMIN_VERBOSEJMP(src)]")
 					log_admin("[key_name(usr)] turned on a pump that contains [n2o ? "N2O" : ""][n2o && plasma ? " & " : ""][plasma ? "Plasma" : ""] at [AREACOORD(src)]")
 			else if(on && direction == PUMP_OUT)
-				investigate_log("[key_name(usr)] started a transfer into [holding].<br>", INVESTIGATE_ATMOS)
+				investigate_log("[key_name(usr)] started a transfer into [holding].", INVESTIGATE_ATMOS)
 			. = TRUE
 		if("direction")
 			if(direction == PUMP_OUT)
 				direction = PUMP_IN
 			else
 				if(on && holding)
-					investigate_log("[key_name(usr)] started a transfer into [holding].<br>", INVESTIGATE_ATMOS)
+					investigate_log("[key_name(usr)] started a transfer into [holding].", INVESTIGATE_ATMOS)
 				direction = PUMP_OUT
 			. = TRUE
 		if("pressure")
@@ -142,19 +143,14 @@
 			else if(pressure == "max")
 				pressure = PUMP_MAX_PRESSURE
 				. = TRUE
-			else if(pressure == "input")
-				pressure = input("New release pressure ([PUMP_MIN_PRESSURE]-[PUMP_MAX_PRESSURE] kPa):", name, pump.target_pressure) as num|null
-				if(!isnull(pressure) && !..())
-					. = TRUE
 			else if(text2num(pressure) != null)
 				pressure = text2num(pressure)
 				. = TRUE
 			if(.)
-				pump.target_pressure = CLAMP(round(pressure), PUMP_MIN_PRESSURE, PUMP_MAX_PRESSURE)
+				pump.target_pressure = clamp(round(pressure), PUMP_MIN_PRESSURE, PUMP_MAX_PRESSURE)
 				investigate_log("was set to [pump.target_pressure] kPa by [key_name(usr)].", INVESTIGATE_ATMOS)
 		if("eject")
 			if(holding)
-				holding.forceMove(drop_location())
-				holding = null
+				replace_tank(usr, FALSE)
 				. = TRUE
 	update_icon()

code/modules/atmospherics/machinery/portable/scrubber.dm

@@ -2,6 +2,8 @@
 	name = "portable air scrubber"
 	icon_state = "pscrubber:0"
 	density = TRUE
+	ui_x = 320
+	ui_y = 350
 
 	var/on = FALSE
 	var/volume_rate = 1000
@@ -71,7 +73,7 @@
 														datum/tgui/master_ui = null, datum/ui_state/state = GLOB.physical_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "portable_scrubber", name, 320, 335, master_ui, state)
+		ui = new(user, src, ui_key, "PortableScrubber", name, ui_x, ui_y, master_ui, state)
 		ui.open()
 
 /obj/machinery/portable_atmospherics/scrubber/ui_data()

code/modules/awaymissions/gateway.dm

@@ -1,246 +1,327 @@
+/// Station home gateway
 GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
+/// List of possible gateway destinations.
+GLOBAL_LIST_EMPTY(gateway_destinations)
+
+/**
+  * Corresponds to single entry in gateway control.
+  *
+  * Will NOT be added automatically to GLOB.gateway_destinations list.
+  */
+/datum/gateway_destination
+	var/name = "Unknown Destination"
+	var/wait = 0 /// How long after roundstart this destination becomes active
+	var/enabled = TRUE /// If disabled, the destination won't be availible
+	var/hidden = FALSE /// Will not show on gateway controls at all.
+
+/* Can a gateway link to this destination right now. */
+/datum/gateway_destination/proc/is_availible()
+	return enabled && (world.time - SSticker.round_start_time >= wait)
+
+/* Returns user-friendly description why you can't connect to this destination, displayed in UI */
+/datum/gateway_destination/proc/get_availible_reason()
+	. = "Unreachable"
+	if(world.time - SSticker.round_start_time < wait)
+		. = "Connection desynchronized. Recalibration in progress."
+
+/* Check if the movable is allowed to arrive at this destination (exile implants mostly) */
+/datum/gateway_destination/proc/incoming_pass_check(atom/movable/AM)
+	return TRUE
+
+/* Get the actual turf we'll arrive at */
+/datum/gateway_destination/proc/get_target_turf()
+	CRASH("get target turf not implemented for this destination type")
+
+/* Called after moving the movable to target turf */
+/datum/gateway_destination/proc/post_transfer(atom/movable/AM)
+	if (ismob(AM))
+		var/mob/M = AM
+		if (M.client)
+			M.client.move_delay = max(world.time + 5, M.client.move_delay)
+
+/* Called when gateway activates with this destination. */
+/datum/gateway_destination/proc/activate(obj/machinery/gateway/activated)
+	return
+
+/* Called when gateway targeting this destination deactivates. */
+/datum/gateway_destination/proc/deactivate(obj/machinery/gateway/deactivated)
+	return
+
+/* Returns data used by gateway controller ui */
+/datum/gateway_destination/proc/get_ui_data()
+	. = list()
+	.["ref"] = REF(src)
+	.["name"] = name
+	.["availible"] = is_availible()
+	.["reason"] = get_availible_reason()
+	if(wait)
+		.["timeout"] = max(1 - (wait - (world.time - SSticker.round_start_time)) / wait, 0)
+
+/* Destination is another gateway */
+/datum/gateway_destination/gateway
+	/// The gateway this destination points at
+	var/obj/machinery/gateway/target_gateway
+
+/* We set the target gateway target to activator gateway */
+/datum/gateway_destination/gateway/activate(obj/machinery/gateway/activated)
+	if(!target_gateway.target)
+		target_gateway.activate(activated)
+
+/* We turn off the target gateway if it's linked with us */
+/datum/gateway_destination/gateway/deactivate(obj/machinery/gateway/deactivated)
+	if(target_gateway.target == deactivated.destination)
+		target_gateway.deactivate()
+
+/datum/gateway_destination/gateway/is_availible()
+	return ..() && target_gateway.calibrated && !target_gateway.target && target_gateway.powered()
+
+/datum/gateway_destination/gateway/get_availible_reason()
+	. = ..()
+	if(!target_gateway.calibrated)
+		. = "Exit gateway malfunction. Manual recalibration required."
+	if(target_gateway.target)
+		. = "Exit gateway in use."
+	if(!target_gateway.powered())
+		. = "Exit gateway unpowered."
+
+/datum/gateway_destination/gateway/get_target_turf()
+	return get_step(target_gateway.portal,SOUTH)
+
+/datum/gateway_destination/gateway/post_transfer(atom/movable/AM)
+	. = ..()
+	addtimer(CALLBACK(AM,/atom/movable.proc/setDir,SOUTH),0)
+
+/* Special home destination, so we can check exile implants */
+/datum/gateway_destination/gateway/home
+
+/datum/gateway_destination/gateway/home/incoming_pass_check(atom/movable/AM)
+	if(isliving(AM))
+		if(check_exile_implant(AM))
+			return FALSE
+	else
+		for(var/mob/living/L in AM.contents)
+			if(check_exile_implant(L))
+				target_gateway.say("Rejecting [AM]: Exile implant detected in contained lifeform.")
+				return FALSE
+	if(AM.has_buckled_mobs())
+		for(var/mob/living/L in AM.buckled_mobs)
+			if(check_exile_implant(L))
+				target_gateway.say("Rejecting [AM]: Exile implant detected in close proximity lifeform.")
+				return FALSE
+	return TRUE
+
+/datum/gateway_destination/gateway/home/proc/check_exile_implant(mob/living/L)
+	for(var/obj/item/implant/exile/E in L.implants)//Checking that there is an exile implant
+		to_chat(L, "<span class='userdanger'>The station gate has detected your exile implant and is blocking your entry.</span>")
+		return TRUE
+	return FALSE
+
+
+/* Destination is one ore more turfs - created by landmarks */
+/datum/gateway_destination/point
+	var/list/target_turfs = list()
+	/// Used by away landmarks
+	var/id
+
+/datum/gateway_destination/point/get_target_turf()
+	return pick(target_turfs)
+
+/* Dense invisible object starting the teleportation. Created by gateways on activation. */
+/obj/effect/gateway_portal_bumper
+	var/obj/machinery/gateway/gateway
+	density = TRUE
+	invisibility = INVISIBILITY_ABSTRACT
+
+/obj/effect/gateway_portal_bumper/Bumped(atom/movable/AM)
+	if(get_dir(src,AM) == SOUTH)
+		gateway.Transfer(AM)
+
+/obj/effect/gateway_portal_bumper/Destroy(force)
+	. = ..()
+	gateway = null
 
 /obj/machinery/gateway
 	name = "gateway"
 	desc = "A mysterious gateway built by unknown hands, it allows for faster than light travel to far-flung locations."
 	icon = 'icons/obj/machines/gateway.dmi'
 	icon_state = "off"
-	density = TRUE
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
-	var/active = 0
-	var/checkparts = TRUE
-	var/list/obj/effect/landmark/randomspawns = list()
+
+	// 3x2 offset by one row
+	pixel_x = -32
+	pixel_y = -32
+	bound_height = 64
+	bound_width = 96
+	bound_x = -32
+	bound_y = 0
+	density = TRUE
+
+	use_power = IDLE_POWER_USE
+	idle_power_usage = 100
+	active_power_usage = 5000
+
 	var/calibrated = TRUE
-	var/list/linked = list()
-	var/can_link = FALSE	//Is this the centerpiece?
+	/// Type of instanced gateway destination, needs to be subtype of /datum/gateway_destination/gateway
+	var/destination_type = /datum/gateway_destination/gateway
+	/// Name of the generated destination
+	var/destination_name = "Unknown Gateway"
+	/// This is our own destination, pointing at this gateway
+	var/datum/gateway_destination/gateway/destination
+	/// This is current active destination
+	var/datum/gateway_destination/target
+	/// bumper object, the thing that starts actual teleport
+	var/obj/effect/gateway_portal_bumper/portal
 
 /obj/machinery/gateway/Initialize()
-	randomspawns = GLOB.awaydestinations
+	generate_destination()
 	update_icon()
-	if(!istype(src, /obj/machinery/gateway/centerstation) && !istype(src, /obj/machinery/gateway/centeraway))
-		switch(dir)
-			if(SOUTH,SOUTHEAST,SOUTHWEST)
-				density = FALSE
 	return ..()
 
-/obj/machinery/gateway/proc/toggleoff()
-	for(var/obj/machinery/gateway/G in linked)
-		G.active = 0
-		G.update_icon()
-	active = 0
+/obj/machinery/gateway/proc/generate_destination()
+	destination = new destination_type
+	destination.name = destination_name
+	destination.target_gateway = src
+	GLOB.gateway_destinations += destination
+
+/obj/machinery/gateway/proc/deactivate()
+	var/datum/gateway_destination/dest = target
+	target = null
+	dest.deactivate(src)
+	QDEL_NULL(portal)
+	use_power = IDLE_POWER_USE
 	update_icon()
 
-/obj/machinery/gateway/proc/detect()
-	if(!can_link)
-		return FALSE
-	linked = list()	//clear the list
-	var/turf/T = loc
-	var/ready = FALSE
-
-	for(var/i in GLOB.alldirs)
-		T = get_step(loc, i)
-		var/obj/machinery/gateway/G = locate(/obj/machinery/gateway) in T
-		if(G)
-			linked.Add(G)
-			continue
-
-		//this is only done if we fail to find a part
-		ready = FALSE
-		toggleoff()
-		break
-
-	if((linked.len == 8) || !checkparts)
-		ready = TRUE
-	return ready
+/obj/machinery/gateway/process()
+	if((stat & (NOPOWER)) && use_power)
+		if(target)
+			deactivate()
+		return
 
 /obj/machinery/gateway/update_icon_state()
-	icon_state = active ? "on" : "off"
+	if(target)
+		icon_state = "on"
+	else
+		icon_state = "off"
 
-/obj/machinery/gateway/attack_hand(mob/user)
-	. = ..()
-	if(.)
-		return
-	if(!detect())
-		return
-	if(!active)
-		toggleon(user)
-		return
-	toggleoff()
-
-/obj/machinery/gateway/proc/toggleon(mob/user)
-	return FALSE
-
-/obj/machinery/gateway/safe_throw_at()
+/obj/machinery/gateway/safe_throw_at(atom/target, range, speed, mob/thrower, spin = TRUE, diagonals_first = FALSE, datum/callback/callback, force = MOVE_FORCE_STRONG, gentle = FALSE)
 	return
 
+/obj/machinery/gateway/proc/generate_bumper()
+	portal = new(get_turf(src))
+	portal.gateway = src
+
+/obj/machinery/gateway/proc/activate(datum/gateway_destination/D)
+	if(!powered() || target)
+		return
+	target = D
+	target.activate(destination)
+	generate_bumper()
+	use_power = ACTIVE_POWER_USE
+	update_icon()
+
+/obj/machinery/gateway/proc/Transfer(atom/movable/AM)
+	if(!target || !target.incoming_pass_check(AM))
+		return
+	AM.forceMove(target.get_target_turf())
+	target.post_transfer(AM)
+
+/* Station's primary gateway */
+/obj/machinery/gateway/centerstation
+	destination_type = /datum/gateway_destination/gateway/home
+	destination_name = "Home Gateway"
+
 /obj/machinery/gateway/centerstation/Initialize()
 	. = ..()
 	if(!GLOB.the_gateway)
 		GLOB.the_gateway = src
-	update_icon()
-	wait = world.time + CONFIG_GET(number/gateway_delay)	//+ thirty minutes default
-	awaygate = locate(/obj/machinery/gateway/centeraway)
 
 /obj/machinery/gateway/centerstation/Destroy()
 	if(GLOB.the_gateway == src)
 		GLOB.the_gateway = null
 	return ..()
 
-//this is da important part wot makes things go
-/obj/machinery/gateway/centerstation
-	density = TRUE
-	icon_state = "offcenter"
-	use_power = IDLE_POWER_USE
-
-	//warping vars
-	var/wait = 0				//this just grabs world.time at world start
-	var/obj/machinery/gateway/centeraway/awaygate = null
-	can_link = TRUE
-
-/obj/machinery/gateway/centerstation/update_icon_state()
-	icon_state = active ? "oncenter" : "offcenter"
-
-/obj/machinery/gateway/centerstation/process()
-	if((stat & (NOPOWER)) && use_power)
-		if(active)
-			toggleoff()
-		return
-
-	if(active)
-		use_power(5000)
-
-/obj/machinery/gateway/centerstation/toggleon(mob/user)
-	if(!detect())
-		return
-	if(!powered())
-		return
-	if(!awaygate)
-		to_chat(user, "<span class='notice'>Error: No destination found.</span>")
-		return
-	if(world.time < wait)
-		to_chat(user, "<span class='notice'>Error: Warpspace triangulation in progress. Estimated time to completion: [DisplayTimeText(wait - world.time)].</span>")
-		return
-
-	for(var/obj/machinery/gateway/G in linked)
-		G.active = 1
-		G.update_icon()
-	active = 1
-	update_icon()
-
-//okay, here's the good teleporting stuff
-/obj/machinery/gateway/centerstation/Bumped(atom/movable/AM)
-	if(!active)
-		return
-	if(!detect())
-		return
-	if(!awaygate || QDELETED(awaygate))
-		return
-
-	if(awaygate.calibrated)
-		AM.forceMove(get_step(awaygate.loc, SOUTH))
-		AM.setDir(SOUTH)
-		if (ismob(AM))
-			var/mob/M = AM
-			if (M.client)
-				M.client.move_delay = max(world.time + 5, M.client.move_delay)
-		return
+/obj/machinery/gateway/multitool_act(mob/living/user, obj/item/I)
+	if(calibrated)
+		to_chat(user, "<span class='alert'>The gate is already calibrated, there is no work for you to do here.</span>")
 	else
-		var/obj/effect/landmark/dest = pick(randomspawns)
-		if(dest)
-			AM.forceMove(get_turf(dest))
-			AM.setDir(SOUTH)
-			use_power(5000)
-		return
-
-/obj/machinery/gateway/centeraway/attackby(obj/item/W, mob/user, params)
-	if(istype(W, /obj/item/multitool))
-		if(calibrated)
-			to_chat(user, "\black The gate is already calibrated, there is no work for you to do here.")
-			return
-		else
-			to_chat(user, "<span class='boldnotice'>Recalibration successful!</span>: \black This gate's systems have been fine tuned.  Travel to this gate will now be on target.")
-			calibrated = TRUE
-			return
-
-/////////////////////////////////////Away////////////////////////
-
-
-/obj/machinery/gateway/centeraway
-	density = TRUE
-	icon_state = "offcenter"
-	use_power = NO_POWER_USE
-	var/obj/machinery/gateway/centerstation/stationgate = null
-	can_link = TRUE
-
-
-/obj/machinery/gateway/centeraway/Initialize()
-	. = ..()
-	update_icon()
-	stationgate = locate(/obj/machinery/gateway/centerstation)
-
-
-/obj/machinery/gateway/centeraway/update_icon_state()
-	icon_state = active ? "oncenter" : "offcenter"
-
-/obj/machinery/gateway/centeraway/toggleon(mob/user)
-	if(!detect())
-		return
-	if(!stationgate)
-		to_chat(user, "<span class='notice'>Error: No destination found.</span>")
-		return
-
-	for(var/obj/machinery/gateway/G in linked)
-		G.active = 1
-		G.update_icon()
-	active = 1
-	update_icon()
-
-/obj/machinery/gateway/centeraway/proc/check_exile_implant(mob/living/L)
-	for(var/obj/item/implant/exile/E in L.implants)//Checking that there is an exile implant
-		to_chat(L, "\black The station gate has detected your exile implant and is blocking your entry.")
-		return TRUE
-	return FALSE
-
-/obj/machinery/gateway/centeraway/Bumped(atom/movable/AM)
-	if(!detect())
-		return
-	if(!active)
-		return
-	if(!stationgate || QDELETED(stationgate))
-		return
-	if(isliving(AM))
-		if(check_exile_implant(AM))
-			return
-	else
-		for(var/mob/living/L in AM.contents)
-			if(check_exile_implant(L))
-				say("Rejecting [AM]: Exile implant detected in contained lifeform.")
-				return
-	if(AM.has_buckled_mobs())
-		for(var/mob/living/L in AM.buckled_mobs)
-			if(check_exile_implant(L))
-				say("Rejecting [AM]: Exile implant detected in close proximity lifeform.")
-				return
-	AM.forceMove(get_step(stationgate.loc, SOUTH))
-	AM.setDir(SOUTH)
-	if (ismob(AM))
-		var/mob/M = AM
-		if (M.client)
-			M.client.move_delay = max(world.time + 5, M.client.move_delay)
-
-
-/obj/machinery/gateway/centeraway/admin
-	desc = "A mysterious gateway built by unknown hands, this one seems more compact."
-
-/obj/machinery/gateway/centeraway/admin/Initialize()
-	. = ..()
-	if(stationgate && !stationgate.awaygate)
-		stationgate.awaygate = src
-
-/obj/machinery/gateway/centeraway/admin/detect()
+		to_chat(user, "<span class='boldnotice'>Recalibration successful!</span>: \black This gate's systems have been fine tuned. Travel to this gate will now be on target.")
+		calibrated = TRUE
 	return TRUE
 
+/* Doesn't need control console or power, always links to home when interacting. */
+/obj/machinery/gateway/away
+	density = TRUE
+	use_power = NO_POWER_USE
+
+/obj/machinery/gateway/away/interact(mob/user, special_state)
+	. = ..()
+	if(!target)
+		if(!GLOB.the_gateway)
+			to_chat(user,"<span class='warning'>Home gateway is not responding!</span>")
+		if(GLOB.the_gateway.target)
+			to_chat(user,"<span class='warning'>Home gateway already in use!</span>")
+			return
+		activate(GLOB.the_gateway.destination)
+	else
+		deactivate()
+
+/* Gateway control computer */
+/obj/machinery/computer/gateway_control
+	name = "Gateway Control"
+	desc = "Human friendly interface to the mysterious gate next to it."
+	var/obj/machinery/gateway/G
+
+/obj/machinery/computer/gateway_control/Initialize(mapload, obj/item/circuitboard/C)
+	. = ..()
+	try_to_linkup()
+
+/obj/machinery/computer/gateway_control/ui_interact(mob/user, ui_key = "main", datum/tgui/ui, force_open, datum/tgui/master_ui, datum/ui_state/state = GLOB.default_state)
+	. = ..()
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "Gateway", name, ui_x, ui_y, master_ui, state)
+		ui.open()
+
+/obj/machinery/computer/gateway_control/ui_data(mob/user)
+	. = ..()
+	.["gateway_present"] = G
+	.["gateway_status"] = G ? G.powered() : FALSE
+	.["current_target"] = G?.target?.get_ui_data()
+	var/list/destinations = list()
+	if(G)
+		for(var/datum/gateway_destination/D in GLOB.gateway_destinations)
+			if(D == G.destination)
+				continue
+			destinations += list(D.get_ui_data())
+	.["destinations"] = destinations
+
+/obj/machinery/computer/gateway_control/ui_act(action, list/params)
+	. = ..()
+	if(.)
+		return
+	switch(action)
+		if("linkup")
+			try_to_linkup()
+			return TRUE
+		if("activate")
+			var/datum/gateway_destination/D = locate(params["destination"]) in GLOB.gateway_destinations
+			try_to_connect(D)
+			return TRUE
+		if("deactivate")
+			if(G && G.target)
+				G.deactivate()
+			return TRUE
+
+/obj/machinery/computer/gateway_control/proc/try_to_linkup()
+	G = locate(/obj/machinery/gateway) in view(7,get_turf(src))
+
+/obj/machinery/computer/gateway_control/proc/try_to_connect(datum/gateway_destination/D)
+	if(!D || !G)
+		return
+	if(!D.is_availible() || G.target)
+		return
+	G.activate(D)
 
 /obj/item/paper/fluff/gateway
-	info = "Congratulations,<br><br>Your station has been selected to carry out the Gateway Project.<br><br>The equipment will be shipped to you at the start of the next quarter.<br> You are to prepare a secure location to house the equipment as outlined in the attached documents.<br><br>--Nanotrasen Blue Space Research"
+	info = "Congratulations,<br><br>Your station has been selected to carry out the Gateway Project.<br><br>The equipment will be shipped to you at the start of the next quarter.<br> You are to prepare a secure location to house the equipment as outlined in the attached documents.<br><br>--Nanotrasen Bluespace Research"
 	name = "Confidential Correspondence, Pg 1"

code/modules/cargo/centcom_podlauncher.dm

@@ -55,7 +55,7 @@ force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.adm
 
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "centcom_podlauncher", "Config/Launch Supplypod", 700, 700, master_ui, state)
+		ui = new(user, src, ui_key, "CentcomPodLauncher", "Config/Launch Supplypod", 700, 700, master_ui, state)
 		ui.open()
 
 /datum/centcom_podlauncher/ui_data(mob/user) //Sends info about the pod to the UI.

code/modules/cargo/console.dm

@@ -68,15 +68,18 @@
 											datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "cargo", name, ui_x, ui_y, master_ui, state)
+		ui = new(user, src, ui_key, "Cargo", name, ui_x, ui_y, master_ui, state)
 		ui.open()
 
 /obj/machinery/computer/cargo/ui_data()
 	var/list/data = list()
 	data["location"] = SSshuttle.supply.getStatusText()
+	/*var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR)
+	if(D)
+		data["points"] = D.account_balance*/
 	data["away"] = SSshuttle.supply.getDockedId() == "supply_away"
+	//data["self_paid"] = self_paid
 	data["docked"] = SSshuttle.supply.mode == SHUTTLE_IDLE
-	data["points"] = SSshuttle.points
 	data["loan"] = !!SSshuttle.shuttle_loan
 	data["loan_dispatched"] = SSshuttle.shuttle_loan && SSshuttle.shuttle_loan.dispatched
 	var/message = "Remember to stamp and send back the supply manifests."
@@ -92,6 +95,7 @@
 			"cost" = SO.pack.cost,
 			"id" = SO.id,
 			"orderer" = SO.orderer,
+			"paid" = !isnull(SO.paying_account) //paid by requester
 		))
 
 	data["requests"] = list()
@@ -124,6 +128,7 @@
 			"cost" = P.cost,
 			"id" = pack,
 			"desc" = P.desc || P.name, // If there is a description, use it. Otherwise use the pack's name.
+			//"small_item" = P.small_item,
 			"access" = P.access
 		))
 	return data
@@ -162,6 +167,8 @@
 			else
 				SSshuttle.shuttle_loan.loan_shuttle()
 				say("The supply shuttle has been loaned to CentCom.")
+				investigate_log("[key_name(usr)] accepted a shuttle loan event.", INVESTIGATE_CARGO)
+				log_game("[key_name(usr)] accepted a shuttle loan event.")
 				. = TRUE
 		if("add")
 			var/id = text2path(params["id"])
@@ -182,19 +189,36 @@
 				name = usr.real_name
 				rank = "Silicon"
 
+		/*	var/datum/bank_account/account
+			if(self_paid && ishuman(usr))
+				var/mob/living/carbon/human/H = usr
+				var/obj/item/card/id/id_card = H.get_idcard(TRUE)
+				if(!istype(id_card))
+					say("No ID card detected.")
+					return
+				account = id_card.registered_account
+				if(!istype(account))
+					say("Invalid bank account.")
+					return
+		*/
 			var/reason = ""
-			if(requestonly)
+			if(requestonly && !self_paid)
 				reason = stripped_input("Reason:", name, "")
 				if(isnull(reason) || ..())
 					return
 
 			var/turf/T = get_turf(src)
-			var/datum/supply_order/SO = new(pack, name, rank, ckey, reason)
+			var/datum/supply_order/SO = new(pack, name, rank, ckey, reason, account)
 			SO.generateRequisition(T)
-			if(requestonly)
+			if(requestonly && !self_paid)
 				SSshuttle.requestlist += SO
 			else
 				SSshuttle.shoppinglist += SO
+				if(self_paid)
+					say("Order processed. The price will be charged to [account.account_holder]'s bank account on delivery.")
+			if(requestonly && message_cooldown < world.time)
+				radio.talk_into(src, "A new order has been requested.", RADIO_CHANNEL_SUPPLY)
+				message_cooldown = world.time + 30 SECONDS
 			. = TRUE
 		if("remove")
 			var/id = text2num(params["id"])
@@ -224,6 +248,9 @@
 		if("denyall")
 			SSshuttle.requestlist.Cut()
 			. = TRUE
+	/*	if("toggleprivate")
+			self_paid = !self_paid
+	*/		. = TRUE
 	if(.)
 		post_signal("supply")
 

code/modules/cargo/expressconsole.dm

@@ -1,5 +1,5 @@
 #define MAX_EMAG_ROCKETS 8
-#define BEACON_COST 5000
+#define BEACON_COST 500
 #define SP_LINKED 1
 #define SP_READY 2
 #define SP_LAUNCH 3
@@ -13,8 +13,11 @@
 		All sales are near instantaneous - please choose carefully"
 	icon_screen = "supply_express"
 	circuit = /obj/item/circuitboard/computer/cargo/express
+	ui_x = 600
+	ui_y = 700
 	blockade_warning = "Bluespace instability detected. Delivery impossible."
 	req_access = list(ACCESS_QM)
+
 	var/message
 	var/printed_beacons = 0 //number of beacons printed. Used to determine beacon names.
 	var/list/meme_pack_data
@@ -40,7 +43,7 @@
 		to_chat(user, "<span class='notice'>You [locked ? "lock" : "unlock"] the interface.</span>")
 		return
 	else if(istype(W, /obj/item/disk/cargo/bluespace_pod))
-		podType = /obj/structure/closet/supplypod/bluespacepod
+		podType = /obj/structure/closet/supplypod/bluespacepod//doesnt effect circuit board, making reversal possible
 		to_chat(user, "<span class='notice'>You insert the disk into [src], allowing for advanced supply delivery vehicles.</span>")
 		qdel(W)
 		return TRUE
@@ -50,22 +53,20 @@
 			sb.link_console(src, user)
 			return TRUE
 		else
-			to_chat(user, "<span class='notice'>[src] is already linked to [sb].</span>")
+			to_chat(user, "<span class='alert'>[src] is already linked to [sb].</span>")
 	..()
 
 /obj/machinery/computer/cargo/express/emag_act(mob/living/user)
-	. = SEND_SIGNAL(src, COMSIG_ATOM_EMAG_ACT)
 	if(obj_flags & EMAGGED)
 		return
-	user.visible_message("<span class='warning'>[user] swipes a suspicious card through [src]!</span>",
-	"<span class='notice'>You change the routing protocols, allowing the Supply Pod to land anywhere on the station.</span>")
+	if(user)
+		user.visible_message("<span class='warning'>[user] swipes a suspicious card through [src]!</span>",
+		"<span class='notice'>You change the routing protocols, allowing the Supply Pod to land anywhere on the station.</span>")
 	obj_flags |= EMAGGED
 	// This also sets this on the circuit board
 	var/obj/item/circuitboard/computer/cargo/board = circuit
 	board.obj_flags |= EMAGGED
 	packin_up()
-	req_access = list()
-	return TRUE
 
 /obj/machinery/computer/cargo/express/proc/packin_up() // oh shit, I'm sorry
 	meme_pack_data = list() // sorry for what?
@@ -90,23 +91,25 @@
 /obj/machinery/computer/cargo/express/ui_interact(mob/living/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) // Remember to use the appropriate state.
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "cargo_express", name, 600, 700, master_ui, state)
+		ui = new(user, src, ui_key, "CargoExpress", name, ui_x, ui_y, master_ui, state)
 		ui.open()
 
 /obj/machinery/computer/cargo/express/ui_data(mob/user)
 	var/canBeacon = beacon && (isturf(beacon.loc) || ismob(beacon.loc))//is the beacon in a valid location?
 	var/list/data = list()
+	var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR)
+	if(D)
+		data["points"] = D.account_balance
 	data["locked"] = locked//swipe an ID to unlock
-	data["siliconUser"] = hasSiliconAccessInArea(user)
+	data["siliconUser"] = user.has_unlimited_silicon_privilege
 	data["beaconzone"] = beacon ? get_area(beacon) : ""//where is the beacon located? outputs in the tgui
 	data["usingBeacon"] = usingBeacon //is the mode set to deliver to the beacon or the cargobay?
 	data["canBeacon"] = !usingBeacon || canBeacon //is the mode set to beacon delivery, and is the beacon in a valid location?
-	data["canBuyBeacon"] = cooldown <= 0 && SSshuttle.points >= BEACON_COST
+	data["canBuyBeacon"] = cooldown <= 0 && D.account_balance >= BEACON_COST
 	data["beaconError"] = usingBeacon && !canBeacon ? "(BEACON ERROR)" : ""//changes button text to include an error alert if necessary
 	data["hasBeacon"] = beacon != null//is there a linked beacon?
 	data["beaconName"] = beacon ? beacon.name : "No Beacon Found"
 	data["printMsg"] = cooldown > 0 ? "Print Beacon for [BEACON_COST] credits ([cooldown])" : "Print Beacon for [BEACON_COST] credits"//buttontext for printing beacons
-	data["points"] = SSshuttle.points
 	data["supplies"] = list()
 	message = "Sales are near-instantaneous - please choose carefully."
 	if(SSshuttle.supplyBlocked)
@@ -137,13 +140,15 @@
 			if (beacon)
 				beacon.update_status(SP_READY) //turns on the beacon's ready light
 		if("printBeacon")
-			if (SSshuttle.points >= BEACON_COST)
-				cooldown = 10//a ~ten second cooldown for printing beacons to prevent spam
-				var/obj/item/supplypod_beacon/C = new /obj/item/supplypod_beacon(drop_location())
-				C.link_console(src, usr)//rather than in beacon's Initialize(), we can assign the computer to the beacon by reusing this proc)
-				printed_beacons++//printed_beacons starts at 0, so the first one out will be called beacon # 1
-				beacon.name = "Supply Pod Beacon #[printed_beacons]"
-				SSshuttle.points -= BEACON_COST
+			var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR)
+			if(D)
+				if(D.adjust_money(-BEACON_COST))
+					cooldown = 10//a ~ten second cooldown for printing beacons to prevent spam
+					var/obj/item/supplypod_beacon/C = new /obj/item/supplypod_beacon(drop_location())
+					C.link_console(src, usr)//rather than in beacon's Initialize(), we can assign the computer to the beacon by reusing this proc)
+					printed_beacons++//printed_beacons starts at 0, so the first one out will be called beacon # 1
+					beacon.name = "Supply Pod Beacon #[printed_beacons]"
+
 
 		if("add")//Generate Supply Order first
 			var/id = text2path(params["id"])
@@ -163,8 +168,12 @@
 			var/reason = ""
 			var/list/empty_turfs
 			var/datum/supply_order/SO = new(pack, name, rank, ckey, reason)
+			var/points_to_check
+			var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR)
+			if(D)
+				points_to_check = D.account_balance
 			if(!(obj_flags & EMAGGED))
-				if(SO.pack.cost <= SSshuttle.points)
+				if(SO.pack.cost <= points_to_check)
 					var/LZ
 					if (istype(beacon) && usingBeacon)//prioritize beacons over landing in cargobay
 						LZ = get_turf(beacon)
@@ -181,14 +190,13 @@
 							CHECK_TICK
 						if(empty_turfs && empty_turfs.len)
 							LZ = pick(empty_turfs)
-					if (SO.pack.cost <= SSshuttle.points && LZ)//we need to call the cost check again because of the CHECK_TICK call
-						SSshuttle.points -= SO.pack.cost
-						SSblackbox.record_feedback("nested tally", "cargo_imports", 1, list("[SO.pack.cost]", "[SO.pack.name]"))
-						new /obj/effect/abstract/DPtarget(LZ, podType, SO)
+					if (SO.pack.cost <= points_to_check && LZ)//we need to call the cost check again because of the CHECK_TICK call
+						D.adjust_money(-SO.pack.cost)
+						new /obj/effect/DPtarget(LZ, podType, SO)
 						. = TRUE
 						update_icon()
 			else
-				if(SO.pack.cost * (0.72*MAX_EMAG_ROCKETS) <= SSshuttle.points) // bulk discount :^)
+				if(SO.pack.cost * (0.72*MAX_EMAG_ROCKETS) <= points_to_check) // bulk discount :^)
 					landingzone = GLOB.areas_by_type[pick(GLOB.the_station_areas)]  //override default landing zone
 					for(var/turf/open/floor/T in landingzone.contents)
 						if(is_blocked_turf(T))
@@ -196,13 +204,13 @@
 						LAZYADD(empty_turfs, T)
 						CHECK_TICK
 					if(empty_turfs && empty_turfs.len)
-						SSshuttle.points -= SO.pack.cost * (0.72*MAX_EMAG_ROCKETS)
-						SSblackbox.record_feedback("nested tally", "cargo_imports", MAX_EMAG_ROCKETS, list("[SO.pack.cost * 0.72]", "[SO.pack.name]"))
+						D.adjust_money(-(SO.pack.cost * (0.72*MAX_EMAG_ROCKETS)))
+
 						SO.generateRequisition(get_turf(src))
 						for(var/i in 1 to MAX_EMAG_ROCKETS)
 							var/LZ = pick(empty_turfs)
 							LAZYREMOVE(empty_turfs, LZ)
-							new /obj/effect/abstract/DPtarget(LZ, podType, SO)
+							new /obj/effect/DPtarget(LZ, podType, SO)
 							. = TRUE
 							update_icon()
 							CHECK_TICK

code/modules/events/pirates.dm

@@ -5,7 +5,7 @@
 	max_occurrences = 1
 	min_players = 10
 	earliest_start = 30 MINUTES
-	gamemode_blacklist = list("nuclear","dynamic")
+	gamemode_blacklist = list("nuclear")
 
 /datum/round_event_control/pirates/preRunEvent()
 	if (!SSmapping.empty_space)
@@ -15,8 +15,9 @@
 
 /datum/round_event/pirates
 	startWhen = 60 //2 minutes to answer
-	var/datum/comm_message/threat_message
+	var/datum/comm_message/threat
 	var/payoff = 0
+	var/payoff_min = 20000
 	var/paid_off = FALSE
 	var/ship_name = "Space Privateers Association"
 	var/shuttle_spawned = FALSE
@@ -25,30 +26,38 @@
 	ship_name = pick(strings(PIRATE_NAMES_FILE, "ship_names"))
 
 /datum/round_event/pirates/announce(fake)
-	priority_announce("A report has been downloaded and printed out at all communications consoles.", "Incoming Classified Message", "commandreport") // CITADEL EDIT metabreak
+	priority_announce("Incoming subspace communication. Secure channel opened at all communication consoles.", "Incoming Message", 'sound/ai/commandreport.ogg')
 	if(fake)
 		return
-	threat_message = new
-	payoff = round(SSshuttle.points * 0.80)
-	threat_message.title = "Business proposition"
-	threat_message.content = "This is [ship_name]. Pay up [payoff] credits or you'll walk the plank."
-	threat_message.possible_answers = list("We'll pay.","No way.")
-	threat_message.answer_callback = CALLBACK(src,.proc/answered)
-	SScommunications.send_message(threat_message,unique = TRUE)
+	threat = new
+	var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR)
+	if(D)
+		payoff = max(payoff_min, FLOOR(D.account_balance * 0.80, 1000))
+	threat.title = "Business proposition"
+	threat.content = "This is [ship_name]. Pay up [payoff] credits or you'll walk the plank."
+	threat.possible_answers = list("We'll pay.","No way.")
+	threat.answer_callback = CALLBACK(src,.proc/answered)
+	SScommunications.send_message(threat,unique = TRUE)
 
 /datum/round_event/pirates/proc/answered()
-	if(threat_message && threat_message.answered == 1)
-		if(SSshuttle.points >= payoff)
-			SSshuttle.points -= payoff
-			priority_announce("Thanks for the credits, landlubbers.",sender_override = ship_name)
-			paid_off = TRUE
-			return
-		else
-			priority_announce("Trying to cheat us? You'll regret this!",sender_override = ship_name)
+	if(threat && threat.answered == 1)
+		var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR)
+		if(D)
+			if(D.adjust_money(-payoff))
+				priority_announce("Thanks for the credits, landlubbers.", sender_override = ship_name)
+				paid_off = TRUE
+				return
+			else
+				priority_announce("Trying to cheat us? You'll regret this!", sender_override = ship_name)
 	if(!shuttle_spawned)
 		spawn_shuttle()
+	else
+		priority_announce("Too late to beg for mercy!", sender_override = ship_name)
 
 /datum/round_event/pirates/start()
+	if(threat && !threat.answered)
+		threat.possible_answers = list("Too late")
+		threat.answered = 1
 	if(!paid_off && !shuttle_spawned)
 		spawn_shuttle()
 
@@ -59,8 +68,8 @@
 	shuffle_inplace(candidates)
 
 	var/datum/map_template/shuttle/pirate/default/ship = new
-	var/x = rand(TRANSITIONEDGE,world.maxx - TRANSITIONEDGE - ship.width)
-	var/y = rand(TRANSITIONEDGE,world.maxy - TRANSITIONEDGE - ship.height)
+	var/x = rand(TRANSITIONEDGE, world.maxx - TRANSITIONEDGE - ship.width)
+	var/y = rand(TRANSITIONEDGE, world.maxy - TRANSITIONEDGE - ship.height)
 	var/z = SSmapping.empty_space.z_value
 	var/turf/T = locate(x,y,z)
 	if(!T)
@@ -68,16 +77,18 @@
 
 	if(!ship.load(T))
 		CRASH("Loading pirate ship failed!")
+
 	for(var/turf/A in ship.get_affected_turfs(T))
 		for(var/obj/effect/mob_spawn/human/pirate/spawner in A)
 			if(candidates.len > 0)
 				var/mob/M = candidates[1]
 				spawner.create(M.ckey)
 				candidates -= M
+				announce_to_ghosts(M)
 			else
-				notify_ghosts("Space pirates are waking up!", source = spawner, action=NOTIFY_ATTACK, flashwindow = FALSE, ignore_dnr_observers = TRUE)
+				announce_to_ghosts(spawner)
 
-	priority_announce("A report has been downloaded and printed out at all communications consoles.", "Incoming Classified Message", "commandreport") //CITADEL EDIT also metabreak here too
+	priority_announce("Unidentified armed ship detected near the station.")
 
 //Shuttle equipment
 
@@ -94,16 +105,16 @@
 
 /obj/machinery/shuttle_scrambler/Initialize(mapload)
 	. = ..()
-	gps = new/obj/item/gps/internal/pirate(src)
-	gps.tracking = FALSE
 	update_icon()
 
 /obj/machinery/shuttle_scrambler/process()
 	if(active)
 		if(is_station_level(z))
-			var/siphoned = min(SSshuttle.points,siphon_per_tick)
-			SSshuttle.points -= siphoned
-			credits_stored += siphoned
+			var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR)
+			if(D)
+				var/siphoned = min(D.account_balance,siphon_per_tick)
+				D.adjust_money(-siphoned)
+				credits_stored += siphoned
 			interrupt_research()
 		else
 			return
@@ -122,7 +133,7 @@
 	if(!active)
 		if(alert(user, "Turning the scrambler on will make the shuttle trackable by GPS. Are you sure you want to do it?", "Scrambler", "Yes", "Cancel") == "Cancel")
 			return
-		if(active || !user.canUseTopic(src))
+		if(active || !user.canUseTopic(src, BE_CLOSE))
 			return
 		toggle_on(user)
 		update_icon()
@@ -139,14 +150,12 @@
 		new /obj/effect/temp_visual/emp(get_turf(S))
 
 /obj/machinery/shuttle_scrambler/proc/dump_loot(mob/user)
-	if(credits_stored < 200)
-		to_chat(user,"<span class='notice'>Not enough credits to retrieve.</span>")
-		return
-	while(credits_stored >= 200)
-		new /obj/item/stack/spacecash/c200(drop_location())
-		credits_stored -= 200
-	to_chat(user,"<span class='notice'>You retrieve the siphoned credits!</span>")
-	credits_stored = 0
+	if(credits_stored)	// Prevents spamming empty holochips
+		new /obj/item/holochip(drop_location(), credits_stored)
+		to_chat(user,"<span class='notice'>You retrieve the siphoned credits!</span>")
+		credits_stored = 0
+	else
+		to_chat(user,"<span class='notice'>There's nothing to withdraw.</span>")
 
 /obj/machinery/shuttle_scrambler/proc/send_notification()
 	priority_announce("Data theft signal detected, source registered on local gps units.")
@@ -171,7 +180,6 @@
 /obj/item/gps/internal/pirate
 	gpstag = "Nautical Signal"
 	desc = "You can hear shanties over the static."
-
 /obj/machinery/computer/shuttle/pirate
 	name = "pirate shuttle console"
 	shuttleId = "pirateship"
@@ -195,40 +203,19 @@
 /obj/docking_port/mobile/pirate
 	name = "pirate shuttle"
 	id = "pirateship"
-	var/engines_cooling = FALSE
-	var/engine_cooldown = 3 MINUTES
-
-/obj/docking_port/mobile/pirate/getStatusText()
-	. = ..()
-	if(engines_cooling)
-		return "[.] - Engines cooling."
-
-/obj/docking_port/mobile/pirate/initiate_docking(obj/docking_port/stationary/new_dock, movement_direction, force=FALSE)
-	. = ..()
-	if(. == DOCKING_SUCCESS && !is_reserved_level(new_dock.z))
-		engines_cooling = TRUE
-		addtimer(CALLBACK(src,.proc/reset_cooldown),engine_cooldown,TIMER_UNIQUE)
-
-/obj/docking_port/mobile/pirate/proc/reset_cooldown()
-	engines_cooling = FALSE
-
-/obj/docking_port/mobile/pirate/canMove()
-	if(engines_cooling)
-		return FALSE
-	return ..()
+	rechargeTime = 3 MINUTES
 
 /obj/machinery/suit_storage_unit/pirate
 	suit_type = /obj/item/clothing/suit/space
 	helmet_type = /obj/item/clothing/head/helmet/space
 	mask_type = /obj/item/clothing/mask/breath
-	storage_type = /obj/item/tank/jetpack/void
+	storage_type = /obj/item/tank/internals/oxygen
 
 /obj/machinery/loot_locator
 	name = "Booty Locator"
 	desc = "This sophisticated machine scans the nearby space for items of value."
 	icon = 'icons/obj/machines/research.dmi'
 	icon_state = "tdoppler"
-	resistance_flags = INDESTRUCTIBLE
 	density = TRUE
 	var/cooldown = 300
 	var/next_use = 0
@@ -262,13 +249,13 @@
 	name = "cargo hold pad"
 	icon = 'icons/obj/telescience.dmi'
 	icon_state = "lpad-idle-o"
-	resistance_flags = INDESTRUCTIBLE
 	var/idle_state = "lpad-idle-o"
 	var/warmup_state = "lpad-idle"
 	var/sending_state = "lpad-beam"
 	var/cargo_hold_id
 
 /obj/machinery/piratepad/multitool_act(mob/living/user, obj/item/multitool/I)
+	. = ..()
 	if (istype(I))
 		to_chat(user, "<span class='notice'>You register [src] in [I]s buffer.</span>")
 		I.buffer = src
@@ -276,8 +263,9 @@
 
 /obj/machinery/computer/piratepad_control
 	name = "cargo hold control terminal"
-	resistance_flags = INDESTRUCTIBLE
-	var/status_report = "Idle"
+	ui_x = 600
+	ui_y = 230
+	var/status_report = "Ready for delivery."
 	var/obj/machinery/piratepad/pad
 	var/warmup_time = 100
 	var/sending = FALSE
@@ -291,10 +279,10 @@
 	return INITIALIZE_HINT_LATELOAD
 
 /obj/machinery/computer/piratepad_control/multitool_act(mob/living/user, obj/item/multitool/I)
+	. = ..()
 	if (istype(I) && istype(I.buffer,/obj/machinery/piratepad))
 		to_chat(user, "<span class='notice'>You link [src] with [I.buffer] in [I] buffer.</span>")
 		pad = I.buffer
-		updateDialog()
 		return TRUE
 
 /obj/machinery/computer/piratepad_control/LateInitialize()
@@ -307,29 +295,44 @@
 	else
 		pad = locate() in range(4,src)
 
-/obj/machinery/computer/piratepad_control/ui_interact(mob/user)
-	. = ..()
-	var/list/t = list()
-	t += "<div class='statusDisplay'>Cargo Hold Control<br>"
-	t += "Current cargo value : [points]"
-	t += "</div>"
-	if(!pad)
-		t += "<div class='statusDisplay'>No pad located.</div><BR>"
-	else
-		t += "<br>[status_report]<br>"
-		if(!sending)
-			t += "<a href='?src=[REF(src)];recalc=1;'>Recalculate Value</a><a href='?src=[REF(src)];send=1'>Send</a>"
-		else
-			t += "<a href='?src=[REF(src)];stop=1'>Stop sending</a>"
+/obj/machinery/computer/piratepad_control/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
+									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "CargoHoldTerminal", name, ui_x, ui_y, master_ui, state)
+		ui.open()
 
-	var/datum/browser/popup = new(user, "piratepad", name, 300, 500)
-	popup.set_content(t.Join())
-	popup.open()
+/obj/machinery/computer/piratepad_control/ui_data(mob/user)
+	var/list/data = list()
+	data["points"] = points
+	data["pad"] = pad ? TRUE : FALSE
+	data["sending"] = sending
+	data["status_report"] = status_report
+	return data
+
+/obj/machinery/computer/piratepad_control/ui_act(action, params)
+	if(..())
+		return
+	if(!pad)
+		return
+
+	switch(action)
+		if("recalc")
+			recalc()
+			. = TRUE
+		if("send")
+			start_sending()
+			. = TRUE
+		if("stop")
+			stop_sending()
+			. = TRUE
 
 /obj/machinery/computer/piratepad_control/proc/recalc()
 	if(sending)
 		return
-	status_report = "Predicted value:<br>"
+
+	status_report = "Predicted value: "
+	var/value = 0
 	var/datum/export_report/ex = new
 	for(var/atom/movable/AM in get_turf(pad))
 		if(AM == pad)
@@ -337,7 +340,12 @@
 		export_item_and_contents(AM, EXPORT_PIRATE | EXPORT_CARGO | EXPORT_CONTRABAND | EXPORT_EMAG, apply_elastic = FALSE, dry_run = TRUE, external_report = ex)
 
 	for(var/datum/export/E in ex.total_amount)
-		status_report += E.total_printout(ex,notes = FALSE) + "<br>"
+		status_report += E.total_printout(ex,notes = FALSE)
+		status_report += " "
+		value += ex.total_value[E]
+
+	if(!value)
+		status_report += "0"
 
 /obj/machinery/computer/piratepad_control/proc/send()
 	if(!sending)
@@ -350,14 +358,15 @@
 			continue
 		export_item_and_contents(AM, EXPORT_PIRATE | EXPORT_CARGO | EXPORT_CONTRABAND | EXPORT_EMAG, apply_elastic = FALSE, delete_unsold = FALSE, external_report = ex)
 
-	status_report = "Sold:<br>"
+	status_report = "Sold: "
 	var/value = 0
 	for(var/datum/export/E in ex.total_amount)
 		var/export_text = E.total_printout(ex,notes = FALSE) //Don't want nanotrasen messages, makes no sense here.
 		if(!export_text)
 			continue
 
-		status_report += export_text + "<br>"
+		status_report += export_text
+		status_report += " "
 		value += ex.total_value[E]
 
 	if(!total_report)
@@ -370,11 +379,13 @@
 
 	points += value
 
+	if(!value)
+		status_report += "Nothing"
+
 	pad.visible_message("<span class='notice'>[pad] activates!</span>")
 	flick(pad.sending_state,pad)
 	pad.icon_state = pad.idle_state
 	sending = FALSE
-	updateDialog()
 
 /obj/machinery/computer/piratepad_control/proc/start_sending()
 	if(sending)
@@ -389,24 +400,10 @@
 	if(!sending)
 		return
 	sending = FALSE
-	status_report = "Idle"
+	status_report = "Ready for delivery."
 	pad.icon_state = pad.idle_state
 	deltimer(sending_timer)
 
-/obj/machinery/computer/piratepad_control/Topic(href, href_list)
-	if(..())
-		return
-	if(pad)
-		if(href_list["recalc"])
-			recalc()
-		if(href_list["send"])
-			start_sending()
-		if(href_list["stop"])
-			stop_sending()
-		updateDialog()
-	else
-		updateDialog()
-
 /datum/export/pirate
 	export_category = EXPORT_PIRATE
 
@@ -431,6 +428,8 @@
 	var/mob/living/carbon/human/H = AM
 	if(H.stat != CONSCIOUS || !H.mind || !H.mind.assigned_role) //mint condition only
 		return 0
+	else if("pirate" in H.faction) //can't ransom your fellow pirates to CentCom!
+		return 0
 	else
 		if(H.mind.assigned_role in GLOB.command_positions)
 			return 3000
@@ -456,3 +455,12 @@
 /datum/export/pirate/cash/get_amount(obj/O)
 	var/obj/item/stack/spacecash/C = O
 	return ..() * C.amount * C.value
+
+/datum/export/pirate/holochip
+	cost = 1
+	unit_name = "holochip"
+	export_types = list(/obj/item/holochip)
+
+/datum/export/pirate/holochip/get_cost(atom/movable/AM)
+	var/obj/item/holochip/H = AM
+	return H.credits

code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm

@@ -160,7 +160,7 @@
 /obj/machinery/smartfridge/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "smartvend", name, 440, 550, master_ui, state)
+		ui = new(user, src, ui_key, "SmartVend", name, 440, 550, master_ui, state)
 		ui.set_autoupdate(FALSE)
 		ui.open()
 

code/modules/holodeck/computer.dm

@@ -83,7 +83,7 @@
 /obj/machinery/computer/holodeck/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "holodeck", name, 400, 500, master_ui, state)
+		ui = new(user, src, ui_key, "Holodeck", name, 400, 500, master_ui, state)
 		ui.open()
 
 /obj/machinery/computer/holodeck/ui_data(mob/user)

code/modules/language/language_menu.dm

@@ -11,7 +11,7 @@
 /datum/language_menu/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.language_menu_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "language_menu", "Language Menu", 700, 600, master_ui, state)
+		ui = new(user, src, ui_key, "LanguageMenu", "Language Menu", 700, 600, master_ui, state)
 		ui.open()
 
 /datum/language_menu/ui_data(mob/user)

code/modules/library/lib_codex_gigas.dm

@@ -99,7 +99,7 @@
 									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "codex_gigas", name, 450, 450, master_ui, state)
+		ui = new(user, src, ui_key, "CodexGigas", name, 450, 450, master_ui, state)
 		ui.open()
 
 /obj/item/book/codex_gigas/ui_data(mob/user)

code/modules/library/soapstone.dm

@@ -209,7 +209,7 @@
 /obj/structure/chisel_message/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.always_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "engraved_message", name, 600, 300, master_ui, state)
+		ui = new(user, src, ui_key, "EngravedMessage", name, 600, 300, master_ui, state)
 		ui.open()
 
 /obj/structure/chisel_message/ui_data(mob/user)

code/modules/mining/laborcamp/laborstacker.dm

@@ -8,6 +8,9 @@ GLOBAL_LIST(labor_sheet_values)
 	icon = 'icons/obj/machines/mining_machines.dmi'
 	icon_state = "console"
 	density = FALSE
+	ui_x = 315
+	ui_y = 430
+
 	var/obj/machinery/mineral/stacking_machine/laborstacker/stacking_machine = null
 	var/machinedir = SOUTH
 	var/obj/machinery/door/airlock/release_door
@@ -36,7 +39,7 @@ GLOBAL_LIST(labor_sheet_values)
 									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "labor_claim_console", name, 315, 430, master_ui, state)
+		ui = new(user, src, ui_key, "LaborClaimConsole", name, ui_x, ui_y, master_ui, state)
 		ui.open()
 
 /obj/machinery/mineral/labor_claim_console/ui_data(mob/user)
@@ -100,7 +103,6 @@ GLOBAL_LIST(labor_sheet_values)
 							Radio.talk_into(src, "A prisoner has returned to the station. Minerals and Prisoner ID card ready for retrieval.", FREQ_SECURITY)
 						to_chat(usr, "<span class='notice'>Shuttle received message and will be sent shortly.</span>")
 						. = TRUE
-						
 
 /obj/machinery/mineral/labor_claim_console/proc/locate_stacking_machine()
 	stacking_machine = locate(/obj/machinery/mineral/stacking_machine, get_step(src, machinedir))
@@ -110,19 +112,16 @@ GLOBAL_LIST(labor_sheet_values)
 		qdel(src)
 
 /obj/machinery/mineral/labor_claim_console/emag_act(mob/user)
-	. = ..()
-	if(obj_flags & EMAGGED)
-		return
-	obj_flags |= EMAGGED
-	to_chat(user, "<span class='warning'>PZZTTPFFFT</span>")
-	return TRUE
+	if(!(obj_flags & EMAGGED))
+		obj_flags |= EMAGGED
+		to_chat(user, "<span class='warning'>PZZTTPFFFT</span>")
 
 /**********************Prisoner Collection Unit**************************/
 
 /obj/machinery/mineral/stacking_machine/laborstacker
 	force_connect = TRUE
 	var/points = 0 //The unclaimed value of ore stacked.
-
+	damage_deflection = 21
 /obj/machinery/mineral/stacking_machine/laborstacker/process_sheet(obj/item/stack/sheet/inp)
 	points += inp.point_value * inp.amount
 	..()

code/modules/mining/machine_redemption.dm

@@ -193,7 +193,7 @@
 /obj/machinery/mineral/ore_redemption/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "ore_redemption_machine", "Ore Redemption Machine", 440, 550, master_ui, state)
+		ui = new(user, src, ui_key, "OreRedemptionMachine", "Ore Redemption Machine", 440, 550, master_ui, state)
 		ui.open()
 
 /obj/machinery/mineral/ore_redemption/ui_data(mob/user)

code/modules/mining/machine_vending.dm

@@ -93,10 +93,22 @@
 	else
 		icon_state = "[initial(icon_state)]-off"
 
-/obj/machinery/mineral/equipment_vendor/ui_interact(mob/user)
-	. = ..()
-	var/list/dat = list()
-	dat += "<br><b>Equipment point cost list:</b><BR><table border='0' width='300'>"
+/obj/machinery/mineral/equipment_vendor/ui_base_html(html)
+	var/datum/asset/spritesheet/assets = get_asset_datum(/datum/asset/spritesheet/vending)
+	. = replacetext(html, "<!--customheadhtml-->", assets.css_tag())
+
+/obj/machinery/mineral/equipment_vendor/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
+									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		var/datum/asset/assets = get_asset_datum(/datum/asset/spritesheet/vending)
+		assets.send(user)
+		ui = new(user, src, ui_key, "MiningVendor", name, ui_x, ui_y, master_ui, state)
+		ui.open()
+
+/obj/machinery/mineral/equipment_vendor/ui_static_data(mob/user)
+	. = list()
+	.["product_records"] = list()
 	for(var/datum/data/mining_equipment/prize in prize_list)
 		dat += "<tr><td>[prize.equipment_name]</td><td>[prize.cost]</td><td><A href='?src=[REF(src)];purchase=[REF(prize)]'>Purchase</A></td></tr>"
 	dat += "</table>"

code/modules/mining/mint.dm

@@ -6,11 +6,14 @@
 	icon = 'icons/obj/economy.dmi'
 	icon_state = "coinpress0"
 	density = TRUE
-	var/newCoins = 0   //how many coins the machine made in it's last load
+	input_dir = EAST
+	ui_x = 300
+	ui_y = 250
+	needs_item_input = TRUE
+
+	var/produced_coins = 0 // how many coins the machine has made in it's last cycle
 	var/processing = FALSE
 	var/chosen = /datum/material/iron //which material will be used to make coins
-	var/coinsToProduce = 10
-	speed_process = TRUE
 
 
 /obj/machinery/mineral/mint/Initialize()
@@ -28,89 +31,102 @@
 		/datum/material/mythril,
 		/datum/material/plastic,
 		/datum/material/runite
-	), MINERAL_MATERIAL_AMOUNT * 50, FALSE, /obj/item/stack)
-	chosen =  SSmaterials.GetMaterialRef(chosen)
+	), MINERAL_MATERIAL_AMOUNT * 75, FALSE, /obj/item/stack)
+	chosen = SSmaterials.GetMaterialRef(chosen)
 
-/obj/machinery/mineral/mint/process()
-	var/turf/T = get_step(src, input_dir)
-	if(!T)
+
+/obj/machinery/mineral/mint/pickup_item(datum/source, atom/movable/target, atom/oldLoc)
+	if(!istype(target, /obj/item/stack))
 		return
 
 	var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
-	for(var/obj/item/stack/sheet/O in T)
-		var/inserted = materials.insert_item(O)
-		if(inserted)
-			qdel(O)
+	var/obj/item/stack/S = target
 
-/obj/machinery/mineral/mint/attack_hand(mob/user)
+	if(materials.insert_item(S))
+		qdel(S)
+
+/obj/machinery/mineral/mint/process()
+	if(processing)
+		var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
+		var/datum/material/M = chosen
+
+		if(!M)
+			processing = FALSE
+			icon_state = "coinpress0"
+			return
+
+		icon_state = "coinpress1"
+		var/coin_mat = MINERAL_MATERIAL_AMOUNT
+
+		for(var/sheets in 1 to 2)
+			if(materials.use_amount_mat(coin_mat, chosen))
+				for(var/coin_to_make in 1 to 5)
+					create_coins()
+					produced_coins++
+			else
+				var/found_new = FALSE
+				for(var/datum/material/inserted_material in materials.materials)
+					var/amount = materials.get_material_amount(inserted_material)
+
+					if(amount)
+						chosen = inserted_material
+						found_new = TRUE
+
+				if(!found_new)
+					processing = FALSE
+	else
+		end_processing()
+		icon_state = "coinpress0"
+
+/obj/machinery/mineral/mint/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
+											datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "Mint", name, ui_x, ui_y, master_ui, state)
+		ui.open()
+
+/obj/machinery/mineral/mint/ui_data()
+	var/list/data = list()
+	data["inserted_materials"] = list()
+	data["chosen_material"] = null
+
+	var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
+	for(var/datum/material/inserted_material in materials.materials)
+		var/amount = materials.get_material_amount(inserted_material)
+		if(!amount)
+			continue
+		data["inserted_materials"] += list(list(
+			"material" = inserted_material.name,
+			"amount" = amount,
+		))
+		if(chosen == inserted_material)
+			data["chosen_material"] = inserted_material.name
+
+	data["produced_coins"] = produced_coins
+	data["processing"] = processing
+
+	return data;
+
+/obj/machinery/mineral/mint/ui_act(action, params, datum/tgui/ui)
 	. = ..()
 	if(.)
 		return
-	var/dat = "<b>Coin Press</b><br>"
-
-	var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
-	for(var/datum/material/M in materials.materials)
-		var/amount = materials.get_material_amount(M)
-		if(!amount && chosen != M)
-			continue
-		dat += "<br><b>[M.name] amount:</b> [amount] cm<sup>3</sup> "
-		if (chosen == M)
-			dat += "<b>Chosen</b>"
-		else
-			dat += "<A href='?src=[REF(src)];choose=[REF(M)]'>Choose</A>"
-
-	var/datum/material/M = chosen
-
-	dat += "<br><br>Will produce [coinsToProduce] [lowertext(M.name)] coins if enough materials are available.<br>"
-	dat += "<A href='?src=[REF(src)];chooseAmt=-10'>-10</A> "
-	dat += "<A href='?src=[REF(src)];chooseAmt=-5'>-5</A> "
-	dat += "<A href='?src=[REF(src)];chooseAmt=-1'>-1</A> "
-	dat += "<A href='?src=[REF(src)];chooseAmt=1'>+1</A> "
-	dat += "<A href='?src=[REF(src)];chooseAmt=5'>+5</A> "
-	dat += "<A href='?src=[REF(src)];chooseAmt=10'>+10</A> "
-
-	dat += "<br><br>In total this machine produced <font color='green'><b>[newCoins]</b></font> coins."
-	dat += "<br><A href='?src=[REF(src)];makeCoins=[1]'>Make coins</A>"
-	user << browse(dat, "window=mint")
-
-/obj/machinery/mineral/mint/Topic(href, href_list)
-	if(..())
-		return
-	usr.set_machine(src)
-	src.add_fingerprint(usr)
-	if(processing==1)
-		to_chat(usr, "<span class='notice'>The machine is processing.</span>")
-		return
-	var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
-	if(href_list["choose"])
-		var/datum/material/new_material = locate(href_list["choose"])
-		if(istype(new_material))
-			chosen = new_material
-	if(href_list["chooseAmt"])
-		coinsToProduce = CLAMP(coinsToProduce + text2num(href_list["chooseAmt"]), 0, 1000)
-		updateUsrDialog()
-	if(href_list["makeCoins"])
-		var/temp_coins = coinsToProduce
+	if(action == "startpress")
+		if (!processing)
+			produced_coins = 0
 		processing = TRUE
-		icon_state = "coinpress1"
-		var/coin_mat = MINERAL_MATERIAL_AMOUNT * 0.2
-		var/datum/material/M = chosen
-		if(!M)
-			updateUsrDialog()
-			return
-
-		while(coinsToProduce > 0 && materials.use_amount_mat(coin_mat, chosen))
-			create_coins()
-			coinsToProduce--
-			newCoins++
-			src.updateUsrDialog()
-			sleep(5)
-
-		icon_state = "coinpress0"
+		begin_processing()
+		return TRUE
+	if (action == "stoppress")
 		processing = FALSE
-		coinsToProduce = temp_coins
-	src.updateUsrDialog()
-	return
+		end_processing()
+		return TRUE
+	if (action == "changematerial")
+		var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
+		for(var/datum/material/mat in materials.materials)
+			if (params["material_name"] == mat.name)
+				chosen = mat
+		return TRUE
 
 /obj/machinery/mineral/mint/proc/create_coins()
 	var/turf/T = get_step(src,output_dir)

code/modules/mining/satchel_ore_boxdm.dm

@@ -9,6 +9,9 @@
 	density = TRUE
 	pressure_resistance = 5*ONE_ATMOSPHERE
 
+	var/ui_x = 335
+	var/ui_y = 415
+
 /obj/structure/ore_box/attackby(obj/item/W, mob/user, params)
 	if (istype(W, /obj/item/stack/ore))
 		user.transferItemToLoc(W, src)
@@ -24,16 +27,16 @@
 
 /obj/structure/ore_box/crowbar_act(mob/living/user, obj/item/I)
 	if(I.use_tool(src, user, 50, volume=50))
-		user.visible_message("[user] pries \the [src] apart.",
+		user.visible_message("<span class='notice'>[user] pries \the [src] apart.</span>",
 			"<span class='notice'>You pry apart \the [src].</span>",
-			"<span class='italics'>You hear splitting wood.</span>")
+			"<span class='hear'>You hear splitting wood.</span>")
 		deconstruct(TRUE, user)
 	return TRUE
 
 /obj/structure/ore_box/examine(mob/living/user)
 	if(Adjacent(user) && istype(user))
 		ui_interact(user)
-	return ..()
+	. = ..()
 
 /obj/structure/ore_box/attack_hand(mob/user)
 	. = ..()
@@ -62,7 +65,7 @@
 									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "ore_box", name, 335, 415, master_ui, state)
+		ui = new(user, src, ui_key, "OreBox", name, ui_x, ui_y, master_ui, state)
 		ui.open()
 
 /obj/structure/ore_box/ui_data()

code/modules/mob/dead/observer/notificationprefs.dm

@@ -24,7 +24,7 @@
 /datum/notificationpanel/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.observer_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "notificationpanel", "Notification Preferences", 270, 360, master_ui, state)
+		ui = new(user, src, ui_key, "NotificationPreferences", "Notification Preferences", 270, 360, master_ui, state)
 		ui.open()
 
 /datum/notificationpanel/ui_data(mob/user)

code/modules/mob/living/carbon/human/species_types/jellypeople.dm

@@ -302,7 +302,7 @@
 
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "slime_swap_body", name, 400, 400, master_ui, state)
+		ui = new(user, src, ui_key, "SlimeBodySwapper", name, 400, 400, master_ui, state)
 		ui.open()
 
 /datum/action/innate/swap_body/ui_data(mob/user)

code/modules/mob/living/silicon/ai/robot_control.dm

@@ -0,0 +1,74 @@
+/datum/robot_control
+	var/mob/living/silicon/ai/owner
+
+/datum/robot_control/New(mob/living/silicon/ai/new_owner)
+	if(!istype(new_owner))
+		qdel(src)
+	owner = new_owner
+
+/datum/robot_control/proc/is_interactable(mob/user)
+	if(user != owner || owner.incapacitated())
+		return FALSE
+	if(owner.control_disabled)
+		to_chat(user, "<span class='warning'>Wireless control is disabled.</span>")
+		return FALSE
+	return TRUE
+
+/datum/robot_control/ui_status(mob/user)
+	if(is_interactable(user))
+		return ..()
+	return UI_CLOSE
+
+/datum/robot_control/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
+							datum/tgui/master_ui = null, datum/ui_state/state = GLOB.always_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "RemoteRobotControl", "Remote Robot Control", 500, 500, master_ui, state)
+		ui.open()
+
+/datum/robot_control/ui_data(mob/user)
+	if(!owner || user != owner)
+		return
+	var/list/data = list()
+	var/turf/ai_current_turf = get_turf(owner)
+	var/ai_zlevel = ai_current_turf.z
+
+	data["robots"] = list()
+	for(var/mob/living/simple_animal/bot/B in GLOB.bots_list)
+		if(B.z != ai_zlevel || B.remote_disabled) //Only non-emagged bots on the same Z-level are detected!
+			continue
+		var/list/robot_data = list(
+			name = B.name,
+			model = B.model,
+			mode = B.get_mode(),
+			hacked = B.hacked,
+			location = get_area_name(B, TRUE),
+			ref = REF(B)
+		)
+		data["robots"] += list(robot_data)
+
+	return data
+
+/datum/robot_control/ui_act(action, params)
+	if(..())
+		return
+	if(!is_interactable(usr))
+		return
+
+	switch(action)
+		if("callbot") //Command a bot to move to a selected location.
+			if(owner.call_bot_cooldown > world.time)
+				to_chat(usr, "<span class='danger'>Error: Your last call bot command is still processing, please wait for the bot to finish calculating a route.</span>")
+				return
+			owner.Bot = locate(params["ref"]) in GLOB.bots_list
+			if(!owner.Bot || owner.Bot.remote_disabled || owner.control_disabled)
+				return
+			owner.waypoint_mode = TRUE
+			to_chat(usr, "<span class='notice'>Set your waypoint by clicking on a valid location free of obstructions.</span>")
+			. = TRUE
+		if("interface") //Remotely connect to a bot!
+			owner.Bot = locate(params["ref"]) in GLOB.bots_list
+			if(!owner.Bot || owner.Bot.remote_disabled || owner.control_disabled)
+				return
+			owner.Bot.attack_ai(usr)
+			. = TRUE

code/modules/mob/living/simple_animal/bot/mulebot.dm

@@ -174,7 +174,7 @@
 										datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "mulebot", name, ui_x, ui_y, master_ui, state)
+		ui = new(user, src, ui_key, "Mule", name, ui_x, ui_y, master_ui, state)
 		ui.open()
 
 /mob/living/simple_animal/bot/mulebot/ui_data(mob/user)

code/modules/modular_computers/computers/item/computer_ui.dm

@@ -37,9 +37,9 @@
 	if (!ui)
 		var/datum/asset/assets = get_asset_datum(/datum/asset/simple/headers)
 		assets.send(user)
-
-		ui = new(user, src, ui_key, "ntos_main", "NtOS Main menu", 400, 500, master_ui, state)
-		ui.set_style("ntos")
+		assets = get_asset_datum(/datum/asset/simple/arcade)
+		assets.send(user)
+		ui = new(user, src, ui_key, "NtosMain", "NtOS Main menu", 400, 500, master_ui, state)
 		ui.open()
 		ui.set_autoupdate(state = 1)
 

code/modules/modular_computers/file_system/programs/airestorer.dm

@@ -7,9 +7,9 @@
 	requires_ntnet = 0
 	usage_flags = PROGRAM_CONSOLE
 	transfer_access = ACCESS_HEADS
-	available_on_ntnet = 1
-	tgui_id = "ntos_ai_restorer"
-	ui_x = 600
+	available_on_ntnet = TRUE
+	tgui_id = "NtosAiRestorer"
+	ui_x = 370
 	ui_y = 400
 
 	var/restoring = FALSE
@@ -118,4 +118,4 @@
 
 /datum/computer_file/program/aidiag/kill_program(forced)
 	restoring = FALSE
-	return ..(forced)
+	return ..(forced)

code/modules/modular_computers/file_system/programs/alarm.dm

@@ -7,7 +7,7 @@
 	requires_ntnet = 1
 	network_destination = "alarm monitoring network"
 	size = 5
-	tgui_id = "ntos_station_alert"
+	tgui_id = "NtosStationAlertConsole"
 	ui_x = 315
 	ui_y = 500
 

code/modules/modular_computers/file_system/programs/antagonist/contract_uplink.dm

@@ -8,9 +8,8 @@
 	available_on_ntnet = 0
 	unsendable = 1
 	undeletable = 1
-	tgui_id = "synd_contract"
-	ui_style = "syndicate"
-	ui_x = 600
+	tgui_id = "SyndContractor"
+	ui_x = 500
 	ui_y = 600
 	var/error = ""
 	var/page = CONTRACT_UPLINK_PAGE_CONTRACTS
@@ -165,4 +164,4 @@
 		screen_to_be = "assign"
 	program_icon_state = screen_to_be
 	update_computer_icon()
-	return data
+	return data

code/modules/modular_computers/file_system/programs/antagonist/dos.dm

@@ -4,11 +4,10 @@
 	program_icon_state = "hostile"
 	extended_desc = "This advanced script can perform denial of service attacks against NTNet quantum relays. The system administrator will probably notice this. Multiple devices can run this program together against same relay for increased effect"
 	size = 20
-	requires_ntnet = 1
-	available_on_ntnet = 0
-	available_on_syndinet = 1
-	tgui_id = "ntos_net_dos"
-	ui_style = "syndicate"
+	requires_ntnet = TRUE
+	available_on_ntnet = FALSE
+	available_on_syndinet = TRUE
+	tgui_id = "NtosNetDos"
 	ui_x = 400
 	ui_y = 250
 
@@ -97,4 +96,4 @@
 			data["relays"] += list(list("id" = R.uid))
 		data["focus"] = target ? target.uid : null
 
-	return data
+	return data

code/modules/modular_computers/file_system/programs/antagonist/revelation.dm

@@ -4,11 +4,10 @@
 	program_icon_state = "hostile"
 	extended_desc = "This virus can destroy hard drive of system it is executed on. It may be obfuscated to look like another non-malicious program. Once armed, it will destroy the system upon next execution."
 	size = 13
-	requires_ntnet = 0
-	available_on_ntnet = 0
-	available_on_syndinet = 1
-	tgui_id = "ntos_revelation"
-	ui_style = "syndicate"
+	requires_ntnet = FALSE
+	available_on_ntnet = FALSE
+	available_on_syndinet = TRUE
+	tgui_id = "NtosRevelation"
 	ui_x = 400
 	ui_y = 250
 
@@ -68,4 +67,4 @@
 
 	data["armed"] = armed
 
-	return data
+	return data

code/modules/modular_computers/file_system/programs/arcade.dm

@@ -0,0 +1,176 @@
+/datum/computer_file/program/arcade
+	filename = "arcade"
+	filedesc = "Nanotrasen Micro Arcade"
+	program_icon_state = "arcade"
+	extended_desc = "This port of the classic game 'Outbomb Cuban Pete', redesigned to run on tablets, with thrilling graphics and chilling storytelling."
+	requires_ntnet = FALSE
+	network_destination = "arcade network"
+	size = 6
+	tgui_id = "NtosArcade"
+	ui_x = 450
+	ui_y = 350
+
+	///Returns TRUE if the game is being played.
+	var/game_active = TRUE
+	///This disables buttom actions from having any impact if TRUE. Resets to FALSE when the player is allowed to make an action again.
+	var/pause_state = FALSE
+	var/boss_hp = 45
+	var/boss_mp = 15
+	var/player_hp = 30
+	var/player_mp = 10
+	var/ticket_count = 0
+	///Shows what text is shown on the app, usually showing the log of combat actions taken by the player.
+	var/heads_up = "Nanotrasen says, winners make us money."
+	var/boss_name = "Cuban Pete's Minion"
+	///Determines which boss image to use on the UI.
+	var/boss_id = 1
+
+/datum/computer_file/program/arcade/proc/game_check(mob/user)
+	sleep(5)
+	user?.mind?.adjust_experience(/datum/skill/gaming, 1)
+	if(boss_hp <= 0)
+		heads_up = "You have crushed [boss_name]! Rejoice!"
+		playsound(computer.loc, 'sound/arcade/win.ogg', 50, TRUE, extrarange = -3, falloff = 10)
+		game_active = FALSE
+		program_icon_state = "arcade_off"
+		if(istype(computer))
+			computer.update_icon()
+		ticket_count += 1
+		user?.mind?.adjust_experience(/datum/skill/gaming, 50)
+		sleep(10)
+	else if(player_hp <= 0 || player_mp <= 0)
+		heads_up = "You have been defeated... how will the station survive?"
+		playsound(computer.loc, 'sound/arcade/lose.ogg', 50, TRUE, extrarange = -3, falloff = 10)
+		game_active = FALSE
+		program_icon_state = "arcade_off"
+		if(istype(computer))
+			computer.update_icon()
+		user?.mind?.adjust_experience(/datum/skill/gaming, 10)
+		sleep(10)
+
+/datum/computer_file/program/arcade/proc/enemy_check(mob/user)
+	var/boss_attackamt = 0 //Spam protection from boss attacks as well.
+	var/boss_mpamt = 0
+	var/bossheal = 0
+	if(pause_state == TRUE)
+		boss_attackamt = rand(3,6)
+		boss_mpamt = rand (2,4)
+		bossheal = rand (4,6)
+	if(game_active == FALSE)
+		return
+	if (boss_mp <= 5)
+		heads_up = "[boss_mpamt] magic power has been stolen from you!"
+		playsound(computer.loc, 'sound/arcade/steal.ogg', 50, TRUE, extrarange = -3, falloff = 10)
+		player_mp -= boss_mpamt
+		boss_mp += boss_mpamt
+	else if(boss_mp > 5 && boss_hp <12)
+		heads_up = "[boss_name] heals for [bossheal] health!"
+		playsound(computer.loc, 'sound/arcade/heal.ogg', 50, TRUE, extrarange = -3, falloff = 10)
+		boss_hp += bossheal
+		boss_mp -= boss_mpamt
+	else
+		heads_up = "[boss_name] attacks you for [boss_attackamt] damage!"
+		playsound(computer.loc, 'sound/arcade/hit.ogg', 50, TRUE, extrarange = -3, falloff = 10)
+		player_hp -= boss_attackamt
+
+	pause_state = FALSE
+	game_check()
+
+/datum/computer_file/program/arcade/ui_interact(mob/user, ui_key, datum/tgui/ui, force_open, datum/tgui/master_ui, datum/ui_state/state)
+	. = ..()
+	var/datum/asset/assets = get_asset_datum(/datum/asset/simple/arcade)
+	assets.send(user)
+
+/datum/computer_file/program/arcade/ui_data(mob/user)
+	var/list/data = get_header_data()
+
+	data["Hitpoints"] = boss_hp
+	data["PlayerHitpoints"] = player_hp
+	data["PlayerMP"] = player_mp
+	data["TicketCount"] = ticket_count
+	data["GameActive"] = game_active
+	data["PauseState"] = pause_state
+	data["Status"] = heads_up
+	data["BossID"] = "boss[boss_id].gif"
+	return data
+
+/datum/computer_file/program/arcade/ui_act(action, list/params)
+	if(..())
+		return TRUE
+	var/obj/item/computer_hardware/printer/printer
+	if(computer)
+		printer = computer.all_components[MC_PRINT]
+
+	var/gamerSkillLevel = usr.mind?.get_skill_level(/datum/skill/gaming)
+	var/gamerSkill = usr.mind?.get_skill_modifier(/datum/skill/gaming, SKILL_RANDS_MODIFIER)
+	switch(action)
+		if("Attack")
+			var/attackamt = 0 //Spam prevention.
+			if(pause_state == FALSE)
+				attackamt = rand(2,6) + rand(0, gamerSkill)
+			pause_state = TRUE
+			heads_up = "You attack for [attackamt] damage."
+			playsound(computer.loc, 'sound/arcade/hit.ogg', 50, TRUE, extrarange = -3, falloff = 10)
+			boss_hp -= attackamt
+			sleep(10)
+			game_check()
+			enemy_check()
+			return TRUE
+		if("Heal")
+			var/healamt = 0 //More Spam Prevention.
+			var/healcost = 0
+			if(pause_state == FALSE)
+				healamt = rand(6,8) + rand(0, gamerSkill)
+				var/maxPointCost = 3
+				if(gamerSkillLevel >= SKILL_LEVEL_JOURNEYMAN)
+					maxPointCost = 2
+				healcost = rand(1, maxPointCost)
+			pause_state = TRUE
+			heads_up = "You heal for [healamt] damage."
+			playsound(computer.loc, 'sound/arcade/heal.ogg', 50, TRUE, extrarange = -3, falloff = 10)
+			player_hp += healamt
+			player_mp -= healcost
+			sleep(10)
+			game_check()
+			enemy_check()
+			return TRUE
+		if("Recharge_Power")
+			var/rechargeamt = 0 //As above.
+			if(pause_state == FALSE)
+				rechargeamt = rand(4,7) + rand(0, gamerSkill)
+			pause_state = TRUE
+			heads_up = "You regain [rechargeamt] magic power."
+			playsound(computer.loc, 'sound/arcade/mana.ogg', 50, TRUE, extrarange = -3, falloff = 10)
+			player_mp += rechargeamt
+			sleep(10)
+			game_check()
+			enemy_check()
+			return TRUE
+		if("Dispense_Tickets")
+			if(!printer)
+				to_chat(usr, "<span class='notice'>Hardware error: A printer is required to redeem tickets.</span>")
+				return
+			if(printer.stored_paper <= 0)
+				to_chat(usr, "<span class='notice'>Hardware error: Printer is out of paper.</span>")
+				return
+			else
+				computer.visible_message("<span class='notice'>\The [computer] prints out paper.</span>")
+				if(ticket_count >= 1)
+					new /obj/item/stack/arcadeticket((get_turf(computer)), 1)
+					to_chat(usr, "<span class='notice'>[src] dispenses a ticket!</span>")
+					ticket_count -= 1
+					printer.stored_paper -= 1
+				else
+					to_chat(usr, "<span class='notice'>You don't have any stored tickets!</span>")
+				return TRUE
+		if("Start_Game")
+			game_active = TRUE
+			boss_hp = 45
+			player_hp = 30
+			player_mp = 10
+			heads_up = "You stand before [boss_name]! Prepare for battle!"
+			program_icon_state = "arcade"
+			boss_id = rand(1,6)
+			pause_state = FALSE
+			if(istype(computer))
+				computer.update_icon()

code/modules/modular_computers/file_system/programs/atmosscan.dm

@@ -0,0 +1,33 @@
+/datum/computer_file/program/atmosscan
+	filename = "atmosscan"
+	filedesc = "Atmospheric Scanner"
+	program_icon_state = "air"
+	extended_desc = "A small built-in sensor reads out the atmospheric conditions around the device."
+	network_destination = "atmos scan"
+	size = 4
+	tgui_id = "NtosAtmos"
+	ui_x = 300
+	ui_y = 350
+
+/datum/computer_file/program/atmosscan/ui_data(mob/user)
+	var/list/data = get_header_data()
+	var/list/airlist = list()
+	var/turf/T = get_turf(ui_host())
+	if(T)
+		var/datum/gas_mixture/environment = T.return_air()
+		var/list/env_gases = environment.gases
+		var/pressure = environment.return_pressure()
+		var/total_moles = environment.total_moles()
+		data["AirPressure"] = round(pressure,0.1)
+		data["AirTemp"] = round(environment.temperature-T0C)
+		if (total_moles)
+			for(var/id in env_gases)
+				var/gas_level = env_gases[id][MOLES]/total_moles
+				if(gas_level > 0)
+					airlist += list(list("name" = "[env_gases[id][GAS_META][META_GAS_NAME]]", "percentage" = round(gas_level*100, 0.01)))
+		data["AirData"] = airlist
+	return data
+
+/datum/computer_file/program/atmosscan/ui_act(action, list/params)
+	if(..())
+		return TRUE

code/modules/modular_computers/file_system/programs/borg_monitor.dm

@@ -0,0 +1,69 @@
+/datum/computer_file/program/borg_monitor
+	filename = "cyborgmonitor"
+	filedesc = "Cyborg Remote Monitoring"
+	ui_header = "borg_mon.gif"
+	program_icon_state = "generic"
+	extended_desc = "This program allows for remote monitoring of station cyborgs."
+	requires_ntnet = TRUE
+	transfer_access = ACCESS_ROBOTICS
+	network_destination = "cyborg remote monitoring"
+	size = 5
+	tgui_id = "NtosCyborgRemoteMonitor"
+	ui_x = 600
+	ui_y = 800
+
+/datum/computer_file/program/borg_monitor/ui_data(mob/user)
+	var/list/data = get_header_data()
+
+	data["card"] = FALSE
+	if(computer.GetID())
+		data["card"] = TRUE
+
+	data["cyborgs"] = list()
+	for(var/mob/living/silicon/robot/R in GLOB.silicon_mobs)
+		if((get_turf(computer)).z != (get_turf(R)).z)
+			continue
+		if(R.scrambledcodes)
+			continue
+
+		var/list/upgrade
+		for(var/obj/item/borg/upgrade/I in R.upgrades)
+			upgrade += "\[[I.name]\] "
+
+		var/shell = FALSE
+		if(R.shell && !R.ckey)
+			shell = TRUE
+
+		var/list/cyborg_data = list(
+			name = R.name,
+			locked_down = R.lockcharge,
+			status = R.stat,
+			shell_discon = shell,
+			charge = R.cell ? round(R.cell.percent()) : null,
+			module = R.module ? "[R.module.name] Module" : "No Module Detected",
+			upgrades = upgrade,
+			ref = REF(R)
+		)
+		data["cyborgs"] += list(cyborg_data)
+	return data
+
+/datum/computer_file/program/borg_monitor/ui_act(action, params)
+	if(..())
+		return
+
+	switch(action)
+		if("messagebot")
+			var/mob/living/silicon/robot/R = locate(params["ref"]) in GLOB.silicon_mobs
+			if(!istype(R))
+				return
+			var/obj/item/card/id/ID = computer.GetID()
+			if(!ID)
+				return
+			var/message = stripped_input(usr, message = "Enter message to be sent to remote cyborg.", title = "Send Message")
+			if(!message)
+				return
+			to_chat(R, "<br><br><span class='notice'>Message from [ID.registered_name] -- \"[message]\"</span><br>")
+			SEND_SOUND(R, 'sound/machines/twobeep_high.ogg')
+			if(R.connected_ai)
+				to_chat(R.connected_ai, "<br><br><span class='notice'>Message from [ID.registered_name] to [R] -- \"[message]\"</span><br>")
+				SEND_SOUND(R.connected_ai, 'sound/machines/twobeep_high.ogg')

code/modules/modular_computers/file_system/programs/card.dm

@@ -6,91 +6,84 @@
 	transfer_access = ACCESS_HEADS
 	requires_ntnet = 0
 	size = 8
-	tgui_id = "ntos_card"
-	ui_x = 600
-	ui_y = 700
+	tgui_id = "NtosCard"
+	ui_x = 450
+	ui_y = 520
 
-	var/mod_mode = 1
-	var/is_centcom = 0
-	var/show_assignments = 0
-	var/minor = 0
-	var/authenticated = 0
-	var/list/reg_ids = list()
-	var/list/region_access = null
-	var/list/head_subordinates = null
-	var/target_dept = 0 //Which department this computer has access to. 0=all departments
-	var/change_position_cooldown = 30
-	//Jobs you cannot open new positions for
-	var/list/blacklisted = list(
-		"AI",
-		"Assistant",
-		"Cyborg",
-		"Captain",
-		"Head of Personnel",
-		"Head of Security",
-		"Chief Engineer",
-		"Research Director",
-		"Chief Medical Officer")
+	var/is_centcom = FALSE
+	var/minor = FALSE
+	var/authenticated = FALSE
+	var/list/region_access
+	var/list/head_subordinates
+	///Which departments this computer has access to. Defined as access regions. null = all departments
+	var/target_dept
 
-	//The scaling factor of max total positions in relation to the total amount of people on board the station in %
-	var/max_relative_positions = 30 //30%: Seems reasonable, limit of 6 @ 20 players
+	//For some reason everything was exploding if this was static.
+	var/list/sub_managers
 
-	//This is used to keep track of opened positions for jobs to allow instant closing
-	//Assoc array: "JobName" = (int)<Opened Positions>
-	var/list/opened_positions = list();
+/datum/computer_file/program/card_mod/New(obj/item/modular_computer/comp)
+	. = ..()
+	sub_managers = list(
+		"[ACCESS_HOP]" = list(
+			"department" = list(CARDCON_DEPARTMENT_SERVICE, CARDCON_DEPARTMENT_COMMAND),
+			"region" = 1,
+			"head" = "Head of Personnel"
+		),
+		"[ACCESS_HOS]" = list(
+			"department" = CARDCON_DEPARTMENT_SECURITY,
+			"region" = 2,
+			"head" = "Head of Security"
+		),
+		"[ACCESS_CMO]" = list(
+			"department" = CARDCON_DEPARTMENT_MEDICAL,
+			"region" = 3,
+			"head" = "Chief Medical Officer"
+		),
+		"[ACCESS_RD]" = list(
+			"department" = CARDCON_DEPARTMENT_SCIENCE,
+			"region" = 4,
+			"head" = "Research Director"
+		),
+		"[ACCESS_CE]" = list(
+			"department" = CARDCON_DEPARTMENT_ENGINEERING,
+			"region" = 5,
+			"head" = "Chief Engineer"
+		)
+	)
 
-/datum/computer_file/program/card_mod/New()
-	..()
-	addtimer(CALLBACK(src, .proc/SetConfigCooldown), 0)
+/datum/computer_file/program/card_mod/proc/authenticate(mob/user, obj/item/card/id/id_card)
+	if(!id_card)
+		return
 
-/datum/computer_file/program/card_mod/proc/SetConfigCooldown()
-	change_position_cooldown = CONFIG_GET(number/id_console_jobslot_delay)
+	region_access = list()
+	if(!target_dept && (ACCESS_CHANGE_IDS in id_card.access))
+		minor = FALSE
+		authenticated = TRUE
+		update_static_data(user)
+		return TRUE
 
-/datum/computer_file/program/card_mod/event_idremoved(background, slot)
-	if(!slot || slot == 2)// slot being false means both are removed
-		minor = 0
-		authenticated = 0
-		head_subordinates = null
-		region_access = null
+	var/list/head_types = list()
+	for(var/access_text in sub_managers)
+		var/list/info = sub_managers[access_text]
+		var/access = text2num(access_text)
+		if((access in id_card.access) && ((info["region"] in target_dept) || !length(target_dept)))
+			region_access += info["region"]
+			//I don't even know what I'm doing anymore
+			head_types += info["head"]
 
+	head_subordinates = list()
+	if(length(head_types))
+		for(var/j in SSjob.occupations)
+			var/datum/job/job = j
+			for(var/head in head_types)//god why
+				if(head in job.department_head)
+					head_subordinates += job.title
 
-/datum/computer_file/program/card_mod/proc/job_blacklisted(jobtitle)
-	return (jobtitle in blacklisted)
-
-
-//Logic check for if you can open the job
-/datum/computer_file/program/card_mod/proc/can_open_job(datum/job/job)
-	if(job)
-		if(!job_blacklisted(job.title))
-			if((job.total_positions <= GLOB.player_list.len * (max_relative_positions / 100)))
-				var/delta = (world.time / 10) - GLOB.time_last_changed_position
-				if((change_position_cooldown < delta) || (opened_positions[job.title] < 0))
-					return 1
-				return -2
-			return 0
-	return 0
-
-//Logic check for if you can close the job
-/datum/computer_file/program/card_mod/proc/can_close_job(datum/job/job)
-	if(job)
-		if(!job_blacklisted(job.title))
-			if(job.total_positions > job.current_positions)
-				var/delta = (world.time / 10) - GLOB.time_last_changed_position
-				if((change_position_cooldown < delta) || (opened_positions[job.title] > 0))
-					return 1
-				return -2
-			return 0
-	return 0
-
-/datum/computer_file/program/card_mod/proc/format_jobs(list/jobs)
-	var/obj/item/computer_hardware/card_slot/card_slot = computer.all_components[MC_CARD]
-	var/obj/item/card/id/id_card = card_slot.stored_card
-	var/list/formatted = list()
-	for(var/job in jobs)
-		formatted.Add(list(list(
-			"display_name" = replacetext(job, "&nbsp", " "),
-			"target_rank" = id_card && id_card.assignment ? id_card.assignment : "Unassigned",
-			"job" = job)))
+	if(length(region_access))
+		minor = TRUE
+		authenticated = TRUE
+		update_static_data(user)
+		return TRUE
 
 	return formatted
 

code/modules/modular_computers/file_system/programs/cargoship.dm

@@ -0,0 +1,74 @@
+/datum/computer_file/program/shipping
+	filename = "shipping"
+	filedesc = "Nanotrasen Shipping Scanner"
+	program_icon_state = "shipping"
+	extended_desc = "A combination printer/scanner app that enables modular computers to print barcodes for easy scanning and shipping."
+	network_destination = "ship scanner"
+	size = 6
+	tgui_id = "NtosShipping"
+	ui_x = 450
+	ui_y = 350
+	///Account used for creating barcodes.
+	var/datum/bank_account/payments_acc
+	///The amount which the tagger will recieve for the sale.
+	var/percent_cut = 20
+
+/datum/computer_file/program/shipping/ui_data(mob/user)
+	var/list/data = get_header_data()
+
+	var/obj/item/computer_hardware/card_slot/card_slot = computer.all_components[MC_CARD]
+	var/obj/item/computer_hardware/printer/printer = computer.all_components[MC_PRINT]
+	var/obj/item/card/id/id_card = card_slot ? card_slot.stored_card : null
+	data["has_id_slot"] = !!card_slot
+	data["has_printer"] = !!printer
+	data["paperamt"] = printer ? "[printer.stored_paper] / [printer.max_paper]" : null
+	data["card_owner"] = card_slot && card_slot.stored_card ? id_card.registered_name : "No Card Inserted."
+	data["current_user"] = payments_acc ? payments_acc.account_holder : null
+	data["barcode_split"] = percent_cut
+	return data
+
+/datum/computer_file/program/shipping/ui_act(action, list/params)
+	if(..())
+		return TRUE
+	if(!computer)
+		return
+
+	// Get components
+	var/obj/item/computer_hardware/card_slot/card_slot = computer.all_components[MC_CARD]
+	var/obj/item/computer_hardware/printer/printer = computer.all_components[MC_PRINT]
+	var/obj/item/card/id/id_card = card_slot ? card_slot.stored_card : null
+	if(!card_slot || !printer) //We need both to successfully use this app.
+		return
+
+	switch(action)
+		if("ejectid")
+			if(id_card)
+				card_slot.try_eject(TRUE, usr)
+		if("selectid")
+			if(!id_card)
+				return
+			if(!id_card.registered_account)
+				playsound(get_turf(ui_host()), 'sound/machines/buzz-sigh.ogg', 50, TRUE, -1)
+				return
+			payments_acc = id_card.registered_account
+			playsound(get_turf(ui_host()), 'sound/machines/ping.ogg', 50, TRUE, -1)
+		if("resetid")
+			payments_acc = null
+		if("setsplit")
+			var/potential_cut = input("How much would you like to payout to the registered card?","Percentage Profit") as num|null
+			percent_cut = potential_cut ? clamp(round(potential_cut, 1), 1, 50) : 20
+		if("print")
+			if(!printer)
+				to_chat(usr, "<span class='notice'>Hardware error: A printer is required to print barcodes.</span>")
+				return
+			if(printer.stored_paper <= 0)
+				to_chat(usr, "<span class='notice'>Hardware error: Printer is out of paper.</span>")
+				return
+			if(!payments_acc)
+				to_chat(usr, "<span class='notice'>Software error: Please set a current user first.</span>")
+				return
+			var/obj/item/barcode/barcode = new /obj/item/barcode(get_turf(ui_host()))
+			barcode.payments_acc = payments_acc
+			barcode.percent_cut = percent_cut
+			printer.stored_paper--
+			to_chat(usr, "<span class='notice'>The computer prints out a barcode.</span>")

code/modules/modular_computers/file_system/programs/configurator.dm

@@ -14,7 +14,7 @@
 	ui_y = 630
 	available_on_ntnet = 0
 	requires_ntnet = 0
-	tgui_id = "ntos_configuration"
+	tgui_id = "NtosConfiguration"
 
 	var/obj/item/modular_computer/movable = null
 

code/modules/modular_computers/file_system/programs/crewmanifest.dm

@@ -0,0 +1,50 @@
+/datum/computer_file/program/crew_manifest
+	filename = "crewmani"
+	filedesc = "Crew Manifest"
+	program_icon_state = "id"
+	extended_desc = "Program for viewing and printing the current crew manifest"
+	transfer_access = ACCESS_HEADS
+	requires_ntnet = FALSE
+	size = 4
+	tgui_id = "NtosCrewManifest"
+	ui_x = 400
+	ui_y = 480
+
+/datum/computer_file/program/crew_manifest/ui_static_data(mob/user)
+	var/list/data = list()
+	data["manifest"] = GLOB.data_core.get_manifest()
+	return data
+
+/datum/computer_file/program/crew_manifest/ui_data(mob/user)
+	var/list/data = get_header_data()
+
+	var/obj/item/computer_hardware/printer/printer
+	if(computer)
+		printer = computer.all_components[MC_PRINT]
+
+	if(computer)
+		data["have_printer"] = !!printer
+	else
+		data["have_printer"] = FALSE
+	return data
+
+/datum/computer_file/program/crew_manifest/ui_act(action, params, datum/tgui/ui)
+	if(..())
+		return
+
+	var/obj/item/computer_hardware/printer/printer
+	if(computer)
+		printer = computer.all_components[MC_PRINT]
+
+	switch(action)
+		if("PRG_print")
+			if(computer && printer) //This option should never be called if there is no printer
+				var/contents = {"<h4>Crew Manifest</h4>
+								<br>
+								[GLOB.data_core ? GLOB.data_core.get_manifest_html(0) : ""]
+								"}
+				if(!printer.print_text(contents,text("crew manifest ([])", station_time_timestamp())))
+					to_chat(usr, "<span class='notice'>Hardware error: Printer was unable to print the file. It may be out of paper.</span>")
+					return
+				else
+					computer.visible_message("<span class='notice'>\The [computer] prints out a paper.</span>")

code/modules/modular_computers/file_system/programs/file_browser.dm

@@ -4,10 +4,10 @@
 	extended_desc = "This program allows management of files."
 	program_icon_state = "generic"
 	size = 8
-	requires_ntnet = 0
-	available_on_ntnet = 0
-	undeletable = 1
-	tgui_id = "ntos_file_manager"
+	requires_ntnet = FALSE
+	available_on_ntnet = FALSE
+	undeletable = TRUE
+	tgui_id = "NtosFileManager"
 
 	var/open_file
 	var/error

code/modules/modular_computers/file_system/programs/jobmanagement.dm

@@ -0,0 +1,141 @@
+/datum/computer_file/program/job_management
+	filename = "job_manage"
+	filedesc = "Job Manager"
+	program_icon_state = "id"
+	extended_desc = "Program for viewing and changing job slot avalibility."
+	transfer_access = ACCESS_HEADS
+	requires_ntnet = 0
+	size = 4
+	tgui_id = "NtosJobManager"
+	ui_x = 400
+	ui_y = 620
+
+	var/change_position_cooldown = 30
+	//Jobs you cannot open new positions for
+	var/list/blacklisted = list(
+		"AI",
+		"Assistant",
+		"Cyborg",
+		"Captain",
+		"Head of Personnel",
+		"Head of Security",
+		"Chief Engineer",
+		"Research Director",
+		"Chief Medical Officer")
+
+	//The scaling factor of max total positions in relation to the total amount of people on board the station in %
+	var/max_relative_positions = 30 //30%: Seems reasonable, limit of 6 @ 20 players
+
+	//This is used to keep track of opened positions for jobs to allow instant closing
+	//Assoc array: "JobName" = (int)<Opened Positions>
+	var/list/opened_positions = list()
+
+/datum/computer_file/program/job_management/New()
+	..()
+	change_position_cooldown = CONFIG_GET(number/id_console_jobslot_delay)
+
+/datum/computer_file/program/job_management/proc/can_open_job(datum/job/job)
+	if(!(job?.title in blacklisted))
+		if((job.total_positions <= length(GLOB.player_list) * (max_relative_positions / 100)))
+			var/delta = (world.time / 10) - GLOB.time_last_changed_position
+			if((change_position_cooldown < delta) || (opened_positions[job.title] < 0))
+				return TRUE
+	return FALSE
+
+/datum/computer_file/program/job_management/proc/can_close_job(datum/job/job)
+	if(!(job?.title in blacklisted))
+		if(job.total_positions > length(GLOB.player_list) * (max_relative_positions / 100))
+			var/delta = (world.time / 10) - GLOB.time_last_changed_position
+			if((change_position_cooldown < delta) || (opened_positions[job.title] > 0))
+				return TRUE
+	return FALSE
+
+/datum/computer_file/program/job_management/ui_act(action, params, datum/tgui/ui)
+	if(..())
+		return
+
+	var/authed = FALSE
+	var/mob/user = usr
+	var/obj/item/card/id/user_id = user.get_idcard()
+	if(user_id)
+		if(ACCESS_CHANGE_IDS in user_id.access)
+			authed = TRUE
+
+	if(!authed)
+		return
+
+	switch(action)
+		if("PRG_open_job")
+			var/edit_job_target = params["target"]
+			var/datum/job/j = SSjob.GetJob(edit_job_target)
+			if(!j || !can_open_job(j))
+				return
+			if(opened_positions[edit_job_target] >= 0)
+				GLOB.time_last_changed_position = world.time / 10
+			j.total_positions++
+			opened_positions[edit_job_target]++
+			playsound(computer, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
+			return TRUE
+		if("PRG_close_job")
+			var/edit_job_target = params["target"]
+			var/datum/job/j = SSjob.GetJob(edit_job_target)
+			if(!j || !can_close_job(j))
+				return
+			//Allow instant closing without cooldown if a position has been opened before
+			if(opened_positions[edit_job_target] <= 0)
+				GLOB.time_last_changed_position = world.time / 10
+			j.total_positions--
+			opened_positions[edit_job_target]--
+			playsound(computer, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
+			return TRUE
+		if("PRG_priority")
+			if(length(SSjob.prioritized_jobs) >= 5)
+				return
+			var/priority_target = params["target"]
+			var/datum/job/j = SSjob.GetJob(priority_target)
+			if(!j)
+				return
+			if(j.total_positions <= j.current_positions)
+				return
+			if(j in SSjob.prioritized_jobs)
+				SSjob.prioritized_jobs -= j
+			else
+				SSjob.prioritized_jobs += j
+			playsound(computer, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
+			return TRUE
+
+
+/datum/computer_file/program/job_management/ui_data(mob/user)
+	var/list/data = get_header_data()
+
+	var/authed = FALSE
+	var/obj/item/card/id/user_id = user.get_idcard(FALSE)
+	if(user_id)
+		if(ACCESS_CHANGE_IDS in user_id.access)
+			authed = TRUE
+
+	data["authed"] = authed
+
+	var/list/pos = list()
+	for(var/j in SSjob.occupations)
+		var/datum/job/job = j
+		if(job.title in blacklisted)
+			continue
+
+		pos += list(list(
+			"title" = job.title,
+			"current" = job.current_positions,
+			"total" = job.total_positions,
+			"status_open" = authed ? can_open_job(job) : FALSE,
+			"status_close" = authed ? can_close_job(job) : FALSE,
+		))
+	data["slots"] = pos
+	var/delta = round(change_position_cooldown - ((world.time / 10) - GLOB.time_last_changed_position), 1)
+	data["cooldown"] = delta < 0 ? 0 : delta
+	var/list/priority = list()
+	for(var/j in SSjob.prioritized_jobs)
+		var/datum/job/job = j
+		priority += job.title
+	data["prioritized"] = priority
+	return data
+

code/modules/modular_computers/file_system/programs/ntdownloader.dm

@@ -10,7 +10,9 @@
 	requires_ntnet_feature = NTNET_SOFTWAREDOWNLOAD
 	available_on_ntnet = 0
 	ui_header = "downloader_finished.gif"
-	tgui_id = "ntos_net_downloader"
+	tgui_id = "NtosNetDownloader"
+	ui_x = 480
+	ui_y = 735
 
 	var/datum/computer_file/program/downloaded_file = null
 	var/hacked_download = 0
@@ -168,4 +170,4 @@
 
 /datum/computer_file/program/ntnetdownload/kill_program(forced)
 	abort_file_download()
-	return ..(forced)
+	return ..(forced)

code/modules/modular_computers/file_system/programs/ntmonitor.dm

@@ -6,8 +6,8 @@
 	size = 12
 	requires_ntnet = 1
 	required_access = ACCESS_NETWORK	//NETWORK CONTROL IS A MORE SECURE PROGRAM.
-	available_on_ntnet = 1
-	tgui_id = "ntos_net_monitor"
+	available_on_ntnet = TRUE
+	tgui_id = "NtosNetMonitor"
 
 /datum/computer_file/program/ntnetmonitor/ui_act(action, params)
 	if(..())
@@ -78,4 +78,4 @@
 		data["ntnetlogs"] += list(list("entry" = i))
 	data["ntnetmaxlogs"] = SSnetworks.station_network.setting_maxlogcount
 
-	return data
+	return data

code/modules/modular_computers/file_system/programs/ntnrc_client.dm

@@ -9,7 +9,7 @@
 	network_destination = "NTNRC server"
 	ui_header = "ntnrc_idle.gif"
 	available_on_ntnet = 1
-	tgui_id = "ntos_net_chat"
+	tgui_id = "NtosNetChat"
 	ui_x = 900
 	ui_y = 675
 

code/modules/modular_computers/file_system/programs/powermonitor.dm

@@ -11,8 +11,7 @@
 	requires_ntnet = 0
 	network_destination = "power monitoring system"
 	size = 9
-	tgui_id = "ntos_power_monitor"
-	ui_style = "ntos"
+	tgui_id = "NtosPowerMonitor"
 	ui_x = 550
 	ui_y = 700
 

code/modules/modular_computers/file_system/programs/robocontrol.dm

@@ -0,0 +1,86 @@
+
+/datum/computer_file/program/robocontrol
+	filename = "robocontrol"
+	filedesc = "Bot Remote Controller"
+	program_icon_state = "robot"
+	extended_desc = "A remote controller used for giving basic commands to non-sentient robots."
+	transfer_access = ACCESS_ROBOTICS
+	requires_ntnet = TRUE
+	network_destination = "robotics control network"
+	size = 12
+	tgui_id = "NtosRoboControl"
+	ui_x = 550
+	ui_y = 550
+	///Number of simple robots on-station.
+	var/botcount = 0
+	///Used to find the location of the user for the purposes of summoning robots.
+	var/mob/current_user
+	///Access granted by the used to summon robots.
+	var/list/current_access = list()
+
+/datum/computer_file/program/robocontrol/ui_data(mob/user)
+	var/list/data = get_header_data()
+	var/turf/current_turf = get_turf(ui_host())
+	var/zlevel = current_turf.z
+	var/list/botlist = list()
+	var/list/mulelist = list()
+
+	var/obj/item/computer_hardware/card_slot/card_slot = computer ? computer.all_components[MC_CARD] : null
+	data["have_id_slot"] = !!card_slot
+	if(computer)
+		var/obj/item/card/id/id_card = card_slot ? card_slot.stored_card : null
+		data["has_id"] = !!id_card
+		data["id_owner"] = id_card ? id_card.registered_name : "No Card Inserted."
+		data["access_on_card"] = id_card ? id_card.access : null
+
+	botcount = 0
+	current_user = user
+
+	for(var/B in GLOB.bots_list)
+		var/mob/living/simple_animal/bot/Bot = B
+		if(!Bot.on || Bot.z != zlevel || Bot.remote_disabled) //Only non-emagged bots on the same Z-level are detected!
+			continue //Also, the PDA must have access to the bot type.
+		var/list/newbot = list("name" = Bot.name, "mode" = Bot.get_mode_ui(), "model" = Bot.model, "locat" = get_area(Bot), "bot_ref" = REF(Bot), "mule_check" = FALSE)
+		if(Bot.bot_type == MULE_BOT)
+			var/mob/living/simple_animal/bot/mulebot/MULE = Bot
+			mulelist += list(list("name" = MULE.name, "dest" = MULE.destination, "power" = MULE.cell ? MULE.cell.percent() : 0, "home" = MULE.home_destination, "autoReturn" = MULE.auto_return, "autoPickup" = MULE.auto_pickup, "reportDelivery" = MULE.report_delivery, "mule_ref" = REF(MULE)))
+			if(MULE.load)
+				data["load"] = MULE.load.name
+			newbot["mule_check"] = TRUE
+		botlist += list(newbot)
+
+	data["bots"] = botlist
+	data["mules"] = mulelist
+	data["botcount"] = botlist.len
+
+	return data
+
+/datum/computer_file/program/robocontrol/ui_act(action, list/params)
+	if(..())
+		return TRUE
+	var/obj/item/computer_hardware/card_slot/card_slot
+	var/obj/item/card/id/id_card
+	if(computer)
+		card_slot = computer.all_components[MC_CARD]
+		if(card_slot)
+			id_card = card_slot.stored_card
+
+	var/list/standard_actions = list("patroloff", "patrolon", "ejectpai")
+	var/list/MULE_actions = list("stop", "go", "home", "destination", "setid", "sethome", "unload", "autoret", "autopick", "report", "ejectpai")
+	var/mob/living/simple_animal/bot/Bot = locate(params["robot"]) in GLOB.bots_list
+	if (action in standard_actions)
+		Bot.bot_control(action, current_user, current_access)
+	if (action in MULE_actions)
+		Bot.bot_control(action, current_user, current_access, TRUE)
+	switch(action)
+		if("summon")
+			Bot.bot_control(action, current_user, id_card ? id_card.access : current_access)
+		if("ejectcard")
+			if(!computer || !card_slot)
+				return
+			if(id_card)
+				GLOB.data_core.manifest_modify(id_card.registered_name, id_card.assignment)
+				card_slot.try_eject(TRUE, current_user)
+			else
+				playsound(get_turf(ui_host()) , 'sound/machines/buzz-sigh.ogg', 25, FALSE)
+	return

code/modules/modular_computers/file_system/programs/sm_monitor.dm

@@ -8,8 +8,7 @@
 	transfer_access = ACCESS_CONSTRUCTION
 	network_destination = "supermatter monitoring system"
 	size = 5
-	tgui_id = "ntos_supermatter_monitor"
-	ui_style = "ntos"
+	tgui_id = "NtosSupermatterMonitor"
 	ui_x = 600
 	ui_y = 350
 	var/last_status = SUPERMATTER_INACTIVE
@@ -124,4 +123,4 @@
 			for(var/obj/machinery/power/supermatter_crystal/S in supermatters)
 				if(S.uid == newuid)
 					active = S
-			return TRUE
+			return TRUE

code/modules/modular_computers/laptop_vendor.dm

@@ -232,7 +232,7 @@
 
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if (!ui)
-		ui = new(user, src, ui_key, "computer_fabricator", "Personal Computer Vendor", ui_x, ui_y, state = state)
+		ui = new(user, src, ui_key, "ComputerFabricator", "Personal Computer Vendor", ui_x, ui_y, state = state)
 		ui.open()
 
 /obj/machinery/lapvend/attackby(obj/item/I, mob/user)

code/modules/power/apc.dm

@@ -859,7 +859,7 @@
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 
 	if(!ui)
-		ui = new(user, src, ui_key, "apc", name, 450, 460, master_ui, state)
+		ui = new(user, src, ui_key, "Apc", name, 450, 460, master_ui, state)
 		ui.open()
 
 /obj/machinery/power/apc/ui_data(mob/user)

code/modules/power/gravitygenerator.dm

@@ -28,7 +28,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
 	var/sprite_number = 0
 
-/obj/machinery/gravity_generator/safe_throw_at()
+/obj/machinery/gravity_generator/safe_throw_at(atom/target, range, speed, mob/thrower, spin = TRUE, diagonals_first = FALSE, datum/callback/callback, force = MOVE_FORCE_STRONG, gentle = FALSE)
 	return FALSE
 
 /obj/machinery/gravity_generator/ex_act(severity, target)
@@ -56,7 +56,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
 	qdel(src)
 
 /obj/machinery/gravity_generator/proc/set_broken()
-	stat |= BROKEN
+	obj_break()
 
 /obj/machinery/gravity_generator/proc/set_fix()
 	stat &= ~BROKEN
@@ -116,6 +116,8 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
 	sprite_number = 8
 	use_power = IDLE_POWER_USE
 	interaction_flags_machine = INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_OFFLINE
+	ui_x = 400
+	ui_y = 165
 	var/on = TRUE
 	var/breaker = TRUE
 	var/list/parts = list()
@@ -187,14 +189,14 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
 /obj/machinery/gravity_generator/main/attackby(obj/item/I, mob/user, params)
 	switch(broken_state)
 		if(GRAV_NEEDS_SCREWDRIVER)
-			if(istype(I, /obj/item/screwdriver))
+			if(I.tool_behaviour == TOOL_SCREWDRIVER)
 				to_chat(user, "<span class='notice'>You secure the screws of the framework.</span>")
 				I.play_tool_sound(src)
 				broken_state++
 				update_icon()
 				return
 		if(GRAV_NEEDS_WELDING)
-			if(istype(I, /obj/item/weldingtool))
+			if(I.tool_behaviour == TOOL_WELDER)
 				if(I.use_tool(src, user, 0, volume=50, amount=1))
 					to_chat(user, "<span class='notice'>You mend the damaged framework.</span>")
 					broken_state++
@@ -206,14 +208,14 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
 				if(PS.get_amount() >= 10)
 					PS.use(10)
 					to_chat(user, "<span class='notice'>You add the plating to the framework.</span>")
-					playsound(src.loc, 'sound/machines/click.ogg', 75, 1)
+					playsound(src.loc, 'sound/machines/click.ogg', 75, TRUE)
 					broken_state++
 					update_icon()
 				else
 					to_chat(user, "<span class='warning'>You need 10 sheets of plasteel!</span>")
 				return
 		if(GRAV_NEEDS_WRENCH)
-			if(istype(I, /obj/item/wrench))
+			if(I.tool_behaviour == TOOL_WRENCH)
 				to_chat(user, "<span class='notice'>You secure the plating to the framework.</span>")
 				I.play_tool_sound(src)
 				set_fix()
@@ -224,7 +226,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
 									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "gravity_generator", name, 400, 200, master_ui, state)
+		ui = new(user, src, ui_key, "GravityGenerator", name, ui_x, ui_y, master_ui, state)
 		ui.open()
 
 /obj/machinery/gravity_generator/main/ui_data(mob/user)
@@ -241,16 +243,18 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
 /obj/machinery/gravity_generator/main/ui_act(action, params)
 	if(..())
 		return
+
 	switch(action)
 		if("gentoggle")
 			breaker = !breaker
 			investigate_log("was toggled [breaker ? "<font color='green'>ON</font>" : "<font color='red'>OFF</font>"] by [key_name(usr)].", INVESTIGATE_GRAVITY)
 			set_power()
+			. = TRUE
 
 // Power and Icon States
 
 /obj/machinery/gravity_generator/main/power_change()
-	..()
+	. = ..()
 	investigate_log("has [stat & NOPOWER ? "lost" : "regained"] power.", INVESTIGATE_GRAVITY)
 	set_power()
 
@@ -313,7 +317,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
 				charge_count -= 2
 
 			if(charge_count % 4 == 0 && prob(75)) // Let them know it is charging/discharging.
-				playsound(src.loc, 'sound/effects/empulse.ogg', 100, 1)
+				playsound(src.loc, 'sound/effects/empulse.ogg', 100, TRUE)
 
 			updateDialog()
 			if(prob(25)) // To help stop "Your clothes feel warm." spam.

code/modules/power/monitor.dm

@@ -10,6 +10,9 @@
 	idle_power_usage = 20
 	active_power_usage = 100
 	circuit = /obj/item/circuitboard/computer/powermonitor
+	tgui_id = "PowerMonitor"
+	ui_x = 550
+	ui_y = 700
 
 	var/obj/structure/cable/attached_wire
 	var/obj/machinery/power/apc/local_apc
@@ -19,8 +22,6 @@
 	var/record_interval = 50
 	var/next_record = 0
 	var/is_secret_monitor = FALSE
-	tgui_id = "power_monitor"
-	ui_style = "ntos"
 
 /obj/machinery/computer/monitor/secret //Hides the power monitor (such as ones on ruins & CentCom) from PDA's to prevent metagaming.
 	name = "outdated power monitoring console"
@@ -87,7 +88,7 @@
 											datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, tgui_id, name, 550, 700, master_ui, state)
+		ui = new(user, src, ui_key, "PowerMonitor", name, ui_x, ui_y, master_ui, state)
 		ui.open()
 
 /obj/machinery/computer/monitor/ui_data()

code/modules/power/port_gen.dm

@@ -1,4 +1,3 @@
-
 //Baseline portable generator. Has all the default handling. Not intended to be used on it's own (since it generates unlimited power).
 /obj/machinery/power/port_gen
 	name = "portable generator"
@@ -8,10 +7,11 @@
 	density = TRUE
 	anchored = FALSE
 	use_power = NO_POWER_USE
+	ui_x = 450
+	ui_y = 340
 
-	var/active = 0
+	var/active = FALSE
 	var/power_gen = 5000
-	var/recent_fault = 0
 	var/power_output = 1
 	var/consumption = 0
 	var/base_icon = "portgen0"
@@ -27,8 +27,16 @@
 	QDEL_NULL(soundloop)
 	return ..()
 
+/obj/machinery/power/port_gen/should_have_node()
+	return anchored
+
+/obj/machinery/power/port_gen/connect_to_network()
+	if(!anchored)
+		return FALSE
+	. = ..()
+
 /obj/machinery/power/port_gen/proc/HasFuel() //Placeholder for fuel check.
-	return 1
+	return TRUE
 
 /obj/machinery/power/port_gen/proc/UseFuel() //Placeholder for fuel use.
 	return
@@ -39,26 +47,38 @@
 /obj/machinery/power/port_gen/proc/handleInactive()
 	return
 
+/obj/machinery/power/port_gen/proc/TogglePower()
+	if(active)
+		active = FALSE
+		update_icon()
+		soundloop.stop()
+	else if(HasFuel())
+		active = TRUE
+		START_PROCESSING(SSmachines, src)
+		update_icon()
+		soundloop.start()
+
 /obj/machinery/power/port_gen/update_icon_state()
 	icon_state = "[base_icon]_[active]"
 
 /obj/machinery/power/port_gen/process()
-	if(active && HasFuel() && !crit_fail && anchored && powernet)
-		add_avail(power_gen * power_output)
+	if(active)
+		if(!HasFuel() || !anchored)
+			TogglePower()
+			return
+		if(powernet)
+			add_avail(power_gen * power_output)
 		UseFuel()
-		src.updateDialog()
-		soundloop.start()
-
 	else
-		active = 0
 		handleInactive()
-		update_icon()
-		soundloop.stop()
 
 /obj/machinery/power/port_gen/examine(mob/user)
 	. = ..()
 	. += "It is[!active?"n't":""] running."
 
+/////////////////
+// P.A.C.M.A.N //
+/////////////////
 /obj/machinery/power/port_gen/pacman
 	name = "\improper P.A.C.M.A.N.-type portable generator"
 	circuit = /obj/item/circuitboard/machine/pacman
@@ -78,8 +98,8 @@
 /obj/machinery/power/port_gen/pacman/Initialize()
 	. = ..()
 
-	var/obj/sheet = new sheet_path(null)
-	sheet_name = sheet.name
+	var/obj/S = sheet_path
+	sheet_name = initial(S.name)
 
 /obj/machinery/power/port_gen/pacman/Destroy()
 	DropFuel()
@@ -100,16 +120,16 @@
 
 /obj/machinery/power/port_gen/pacman/examine(mob/user)
 	. = ..()
-	. += "<span class='notice'>The generator has [sheets] units of [sheet_name] fuel left, producing [power_gen] per cycle.</span>"
-	if(crit_fail)
-		. += "<span class='danger'>The generator seems to have broken down.</span>"
+	. += "<span class='notice'>The generator has [sheets] units of [sheet_name] fuel left, producing [DisplayPower(power_gen)] per cycle.</span>"
+	if(anchored)
+		. += "<span class='notice'>It is anchored to the ground.</span>"
 	if(in_range(user, src) || isobserver(user))
 		. += "<span class='notice'>The status display reads: Fuel efficiency increased by <b>[(consumption*100)-100]%</b>.</span>"
 
 /obj/machinery/power/port_gen/pacman/HasFuel()
 	if(sheets >= 1 / (time_per_sheet / power_output) - sheet_left)
-		return 1
-	return 0
+		return TRUE
+	return FALSE
 
 /obj/machinery/power/port_gen/pacman/DropFuel()
 	if(sheets)
@@ -145,13 +165,11 @@
 	if (current_heat > 300)
 		overheat()
 		qdel(src)
-	return
 
 /obj/machinery/power/port_gen/pacman/handleInactive()
-
-	if (current_heat > 0)
-		current_heat = max(current_heat - 2, 0)
-		src.updateDialog()
+	current_heat = max(current_heat - 2, 0)
+	if(current_heat == 0)
+		STOP_PROCESSING(SSmachines, src)
 
 /obj/machinery/power/port_gen/pacman/proc/overheat()
 	explosion(src.loc, 2, 5, 2, -1)
@@ -166,24 +184,21 @@
 		to_chat(user, "<span class='notice'>You add [amount] sheets to the [src.name].</span>")
 		sheets += amount
 		addstack.use(amount)
-		updateUsrDialog()
 		return
 	else if(!active)
-
-		if(istype(O, /obj/item/wrench))
-
+		if(O.tool_behaviour == TOOL_WRENCH)
 			if(!anchored && !isinspace())
+				anchored = TRUE
 				connect_to_network()
 				to_chat(user, "<span class='notice'>You secure the generator to the floor.</span>")
-				anchored = TRUE
 			else if(anchored)
+				anchored = FALSE
 				disconnect_from_network()
 				to_chat(user, "<span class='notice'>You unsecure the generator from the floor.</span>")
-				anchored = FALSE
 
-			playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1)
+			playsound(src, 'sound/items/deconstruct.ogg', 50, TRUE)
 			return
-		else if(istype(O, /obj/item/screwdriver))
+		else if(O.tool_behaviour == TOOL_SCREWDRIVER)
 			panel_open = !panel_open
 			O.play_tool_sound(src)
 			if(panel_open)
@@ -196,12 +211,10 @@
 	return ..()
 
 /obj/machinery/power/port_gen/pacman/emag_act(mob/user)
-	. = ..()
 	if(obj_flags & EMAGGED)
 		return
 	obj_flags |= EMAGGED
 	emp_act(EMP_HEAVY)
-	return TRUE
 
 /obj/machinery/power/port_gen/pacman/attack_ai(mob/user)
 	interact(user)
@@ -209,60 +222,52 @@
 /obj/machinery/power/port_gen/pacman/attack_paw(mob/user)
 	interact(user)
 
-/obj/machinery/power/port_gen/pacman/ui_interact(mob/user)
-	. = ..()
-	if (get_dist(src, user) > 1 )
-		if(!isAI(user))
-			user.unset_machine()
-			user << browse(null, "window=port_gen")
-			return
+/obj/machinery/power/port_gen/pacman/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
+												datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "PortableGenerator", name, ui_x, ui_y, master_ui, state)
+		ui.open()
 
-	var/dat = text("<b>[name]</b><br>")
-	if (active)
-		dat += text("Generator: <A href='?src=[REF(src)];action=disable'>On</A><br>")
-	else
-		dat += text("Generator: <A href='?src=[REF(src)];action=enable'>Off</A><br>")
-	dat += text("[capitalize(sheet_name)]: [sheets] - <A href='?src=[REF(src)];action=eject'>Eject</A><br>")
-	var/stack_percent = round(sheet_left * 100, 1)
-	dat += text("Current stack: [stack_percent]% <br>")
-	dat += text("Power output: <A href='?src=[REF(src)];action=lower_power'>-</A> [power_gen * power_output] <A href='?src=[REF(src)];action=higher_power'>+</A><br>")
-	dat += text("Power current: [(powernet == null ? "Unconnected" : "[DisplayPower(avail())]")]<br>")
-	dat += text("Heat: [current_heat]<br>")
-	dat += "<br><A href='?src=[REF(src)];action=close'>Close</A>"
-	user << browse(dat, "window=port_gen")
-	onclose(user, "port_gen")
+/obj/machinery/power/port_gen/pacman/ui_data()
+	var/data = list()
 
-/obj/machinery/power/port_gen/pacman/Topic(href, href_list)
+	data["active"] = active
+	data["sheet_name"] = capitalize(sheet_name)
+	data["sheets"] = sheets
+	data["stack_percent"] = round(sheet_left * 100, 0.1)
+
+	data["anchored"] = anchored
+	data["connected"] = (powernet == null ? 0 : 1)
+	data["ready_to_boot"] = anchored && HasFuel()
+	data["power_generated"] = DisplayPower(power_gen)
+	data["power_output"] = DisplayPower(power_gen * power_output)
+	data["power_available"] = (powernet == null ? 0 : DisplayPower(avail()))
+	data["current_heat"] = current_heat
+	. =  data
+
+/obj/machinery/power/port_gen/pacman/ui_act(action, params)
 	if(..())
 		return
+	switch(action)
+		if("toggle_power")
+			TogglePower()
+			. = TRUE
 
-	src.add_fingerprint(usr)
-	if(href_list["action"])
-		if(href_list["action"] == "enable")
-			if(!active && HasFuel() && !crit_fail)
-				active = 1
-				src.updateUsrDialog()
-				update_icon()
-		if(href_list["action"] == "disable")
-			if (active)
-				active = 0
-				src.updateUsrDialog()
-				update_icon()
-		if(href_list["action"] == "eject")
+		if("eject")
 			if(!active)
 				DropFuel()
-				src.updateUsrDialog()
-		if(href_list["action"] == "lower_power")
+				. = TRUE
+
+		if("lower_power")
 			if (power_output > 1)
 				power_output--
-				src.updateUsrDialog()
-		if (href_list["action"] == "higher_power")
+				. = TRUE
+
+		if("higher_power")
 			if (power_output < 4 || (obj_flags & EMAGGED))
 				power_output++
-				src.updateUsrDialog()
-		if (href_list["action"] == "close")
-			usr << browse(null, "window=port_gen")
-			usr.unset_machine()
+				. = TRUE
 
 /obj/machinery/power/port_gen/pacman/super
 	name = "\improper S.U.P.E.R.P.A.C.M.A.N.-type portable generator"

code/modules/power/singularity/particle_accelerator/particle_control.dm

@@ -9,15 +9,17 @@
 	idle_power_usage = 500
 	active_power_usage = 10000
 	dir = NORTH
-	var/strength_upper_limit = 2
-	var/interface_control = 1
-	var/list/obj/structure/particle_accelerator/connected_parts
-	var/assembled = 0
-	var/construction_state = PA_CONSTRUCTION_UNSECURED
-	var/active = 0
-	var/strength = 0
-	var/powered = 0
 	mouse_opacity = MOUSE_OPACITY_OPAQUE
+	ui_x = 350
+	ui_y = 185
+	var/strength_upper_limit = 2
+	var/interface_control = TRUE
+	var/list/obj/structure/particle_accelerator/connected_parts
+	var/assembled = FALSE
+	var/construction_state = PA_CONSTRUCTION_UNSECURED
+	var/active = FALSE
+	var/strength = 0
+	var/powered = FALSE
 
 /obj/machinery/particle_accelerator/control_box/Initialize()
 	. = ..()
@@ -34,30 +36,27 @@
 	QDEL_NULL(wires)
 	return ..()
 
-/obj/machinery/particle_accelerator/control_box/attack_hand(mob/user)
+/obj/machinery/particle_accelerator/control_box/multitool_act(mob/living/user, obj/item/I)
 	. = ..()
-	if(.)
-		return
-	if(construction_state == PA_CONSTRUCTION_COMPLETE)
-		interact(user)
-	else if(construction_state == PA_CONSTRUCTION_PANEL_OPEN)
+	if(construction_state == PA_CONSTRUCTION_PANEL_OPEN)
 		wires.interact(user)
+		return TRUE
 
 /obj/machinery/particle_accelerator/control_box/proc/update_state()
 	if(construction_state < PA_CONSTRUCTION_COMPLETE)
 		use_power = NO_POWER_USE
-		assembled = 0
-		active = 0
+		assembled = FALSE
+		active = FALSE
 		for(var/CP in connected_parts)
 			var/obj/structure/particle_accelerator/part = CP
 			part.strength = null
-			part.powered = 0
+			part.powered = FALSE
 			part.update_icon()
 		connected_parts.Cut()
 		return
 	if(!part_scan())
 		use_power = IDLE_POWER_USE
-		active = 0
+		active = FALSE
 		connected_parts.Cut()
 
 /obj/machinery/particle_accelerator/control_box/update_icon_state()
@@ -78,36 +77,6 @@
 				else
 					icon_state = "control_boxc"
 
-/obj/machinery/particle_accelerator/control_box/Topic(href, href_list)
-	if(..())
-		return
-
-	if(!interface_control)
-		to_chat(usr, "<span class='error'>ERROR: Request timed out. Check wire contacts.</span>")
-		return
-
-	if(href_list["close"])
-		usr << browse(null, "window=pacontrol")
-		usr.unset_machine()
-		return
-	if(href_list["togglep"])
-		if(!wires.is_cut(WIRE_POWER))
-			toggle_power()
-
-	else if(href_list["scan"])
-		part_scan()
-
-	else if(href_list["strengthup"])
-		if(!wires.is_cut(WIRE_STRENGTH))
-			add_strength()
-
-	else if(href_list["strengthdown"])
-		if(!wires.is_cut(WIRE_STRENGTH))
-			remove_strength()
-
-	updateDialog()
-	update_icon()
-
 /obj/machinery/particle_accelerator/control_box/proc/strength_change()
 	for(var/CP in connected_parts)
 		var/obj/structure/particle_accelerator/part = CP
@@ -123,7 +92,6 @@
 		log_game("PA Control Computer increased to [strength] by [key_name(usr)] in [AREACOORD(src)]")
 		investigate_log("increased to <font color='red'>[strength]</font> by [key_name(usr)] at [AREACOORD(src)]", INVESTIGATE_SINGULO)
 
-
 /obj/machinery/particle_accelerator/control_box/proc/remove_strength(s)
 	if(assembled && (strength > 0))
 		strength--
@@ -133,11 +101,10 @@
 		log_game("PA Control Computer decreased to [strength] by [key_name(usr)] in [AREACOORD(src)]")
 		investigate_log("decreased to <font color='green'>[strength]</font> by [key_name(usr)] at [AREACOORD(src)]", INVESTIGATE_SINGULO)
 
-
 /obj/machinery/particle_accelerator/control_box/power_change()
-	..()
+	. = ..()
 	if(stat & NOPOWER)
-		active = 0
+		active = FALSE
 		use_power = NO_POWER_USE
 	else if(!stat && construction_state == PA_CONSTRUCTION_COMPLETE)
 		use_power = IDLE_POWER_USE
@@ -160,49 +127,48 @@
 	var/odir = turn(dir,180)
 	var/turf/T = loc
 
-	assembled = 0
+	assembled = FALSE
 	critical_machine = FALSE
 
 	var/obj/structure/particle_accelerator/fuel_chamber/F = locate() in orange(1,src)
 	if(!F)
-		return 0
+		return FALSE
 
 	setDir(F.dir)
 	connected_parts.Cut()
 
 	T = get_step(T,rdir)
 	if(!check_part(T, /obj/structure/particle_accelerator/fuel_chamber))
-		return 0
+		return FALSE
 	T = get_step(T,odir)
 	if(!check_part(T, /obj/structure/particle_accelerator/end_cap))
-		return 0
+		return FALSE
 	T = get_step(T,dir)
 	T = get_step(T,dir)
 	if(!check_part(T, /obj/structure/particle_accelerator/power_box))
-		return 0
+		return FALSE
 	T = get_step(T,dir)
 	if(!check_part(T, /obj/structure/particle_accelerator/particle_emitter/center))
-		return 0
+		return FALSE
 	T = get_step(T,ldir)
 	if(!check_part(T, /obj/structure/particle_accelerator/particle_emitter/left))
-		return 0
+		return FALSE
 	T = get_step(T,rdir)
 	T = get_step(T,rdir)
 	if(!check_part(T, /obj/structure/particle_accelerator/particle_emitter/right))
-		return 0
+		return FALSE
 
-	assembled = 1
+	assembled = TRUE
 	critical_machine = TRUE	//Only counts if the PA is actually assembled.
-	return 1
+	return TRUE
 
 /obj/machinery/particle_accelerator/control_box/proc/check_part(turf/T, type)
 	var/obj/structure/particle_accelerator/PA = locate(/obj/structure/particle_accelerator) in T
 	if(istype(PA, type) && (PA.construction_state == PA_CONSTRUCTION_COMPLETE))
 		if(PA.connect_master(src))
 			connected_parts.Add(PA)
-			return 1
-	return 0
-
+			return TRUE
+	return FALSE
 
 /obj/machinery/particle_accelerator/control_box/proc/toggle_power()
 	active = !active
@@ -214,47 +180,16 @@
 		for(var/CP in connected_parts)
 			var/obj/structure/particle_accelerator/part = CP
 			part.strength = strength
-			part.powered = 1
+			part.powered = TRUE
 			part.update_icon()
 	else
 		use_power = IDLE_POWER_USE
 		for(var/CP in connected_parts)
 			var/obj/structure/particle_accelerator/part = CP
 			part.strength = null
-			part.powered = 0
+			part.powered = FALSE
 			part.update_icon()
-	return 1
-
-
-/obj/machinery/particle_accelerator/control_box/ui_interact(mob/user)
-	. = ..()
-	if((get_dist(src, user) > 1) || (stat & (BROKEN|NOPOWER)))
-		if(!issilicon(user))
-			user.unset_machine()
-			user << browse(null, "window=pacontrol")
-			return
-
-	var/dat = ""
-	dat += "<A href='?src=[REF(src)];close=1'>Close</A><BR><BR>"
-	dat += "<h3>Status</h3>"
-	if(!assembled)
-		dat += "Unable to detect all parts!<BR>"
-		dat += "<A href='?src=[REF(src)];scan=1'>Run Scan</A><BR><BR>"
-	else
-		dat += "All parts in place.<BR><BR>"
-		dat += "Power:"
-		if(active)
-			dat += "On<BR>"
-		else
-			dat += "Off <BR>"
-		dat += "<A href='?src=[REF(src)];togglep=1'>Toggle Power</A><BR><BR>"
-		dat += "Particle Strength: [strength] "
-		dat += "<A href='?src=[REF(src)];strengthdown=1'>--</A>|<A href='?src=[REF(src)];strengthup=1'>++</A><BR><BR>"
-
-	var/datum/browser/popup = new(user, "pacontrol", name, 420, 300)
-	popup.set_content(dat)
-	popup.set_title_image(user.browse_rsc_icon(icon, icon_state))
-	popup.open()
+	return TRUE
 
 /obj/machinery/particle_accelerator/control_box/examine(mob/user)
 	. = ..()
@@ -266,49 +201,48 @@
 		if(PA_CONSTRUCTION_PANEL_OPEN)
 			. += "The panel is open."
 
-
 /obj/machinery/particle_accelerator/control_box/attackby(obj/item/W, mob/user, params)
 	var/did_something = FALSE
 
 	switch(construction_state)
 		if(PA_CONSTRUCTION_UNSECURED)
-			if(istype(W, /obj/item/wrench) && !isinspace())
+			if(W.tool_behaviour == TOOL_WRENCH && !isinspace())
 				W.play_tool_sound(src, 75)
 				anchored = TRUE
-				user.visible_message("[user.name] secures the [name] to the floor.", \
-					"You secure the external bolts.")
+				user.visible_message("<span class='notice'>[user.name] secures the [name] to the floor.</span>", \
+					"<span class='notice'>You secure the external bolts.</span>")
 				construction_state = PA_CONSTRUCTION_UNWIRED
 				did_something = TRUE
 		if(PA_CONSTRUCTION_UNWIRED)
-			if(istype(W, /obj/item/wrench))
+			if(W.tool_behaviour == TOOL_WRENCH)
 				W.play_tool_sound(src, 75)
 				anchored = FALSE
-				user.visible_message("[user.name] detaches the [name] from the floor.", \
-					"You remove the external bolts.")
+				user.visible_message("<span class='notice'>[user.name] detaches the [name] from the floor.</span>", \
+					"<span class='notice'>You remove the external bolts.</span>")
 				construction_state = PA_CONSTRUCTION_UNSECURED
 				did_something = TRUE
 			else if(istype(W, /obj/item/stack/cable_coil))
 				var/obj/item/stack/cable_coil/CC = W
 				if(CC.use(1))
-					user.visible_message("[user.name] adds wires to the [name].", \
-						"You add some wires.")
+					user.visible_message("<span class='notice'>[user.name] adds wires to the [name].</span>", \
+						"<span class='notice'>You add some wires.</span>")
 					construction_state = PA_CONSTRUCTION_PANEL_OPEN
 					did_something = TRUE
 		if(PA_CONSTRUCTION_PANEL_OPEN)
-			if(istype(W, /obj/item/wirecutters))//TODO:Shock user if its on?
-				user.visible_message("[user.name] removes some wires from the [name].", \
-					"You remove some wires.")
+			if(W.tool_behaviour == TOOL_WIRECUTTER)//TODO:Shock user if its on?
+				user.visible_message("<span class='notice'>[user.name] removes some wires from the [name].</span>", \
+					"<span class='notice'>You remove some wires.</span>")
 				construction_state = PA_CONSTRUCTION_UNWIRED
 				did_something = TRUE
-			else if(istype(W, /obj/item/screwdriver))
-				user.visible_message("[user.name] closes the [name]'s access panel.", \
-					"You close the access panel.")
+			else if(W.tool_behaviour == TOOL_SCREWDRIVER)
+				user.visible_message("<span class='notice'>[user.name] closes the [name]'s access panel.</span>", \
+					"<span class='notice'>You close the access panel.</span>")
 				construction_state = PA_CONSTRUCTION_COMPLETE
 				did_something = TRUE
 		if(PA_CONSTRUCTION_COMPLETE)
-			if(istype(W, /obj/item/screwdriver))
-				user.visible_message("[user.name] opens the [name]'s access panel.", \
-					"You open the access panel.")
+			if(W.tool_behaviour == TOOL_SCREWDRIVER)
+				user.visible_message("<span class='notice'>[user.name] opens the [name]'s access panel.</span>", \
+					"<span class='notice'>You open the access panel.</span>")
 				construction_state = PA_CONSTRUCTION_PANEL_OPEN
 				did_something = TRUE
 
@@ -324,6 +258,65 @@
 	if(prob(50))
 		qdel(src)
 
+/obj/machinery/particle_accelerator/control_box/interact(mob/user)
+	if(construction_state == PA_CONSTRUCTION_PANEL_OPEN)
+		wires.interact(user)
+	else
+		..()
+
+/obj/machinery/particle_accelerator/control_box/proc/is_interactive(mob/user)
+	if(!interface_control)
+		to_chat(user, "<span class='alert'>ERROR: Request timed out. Check wire contacts.</span>")
+		return FALSE
+	if(construction_state != PA_CONSTRUCTION_COMPLETE)
+		return FALSE
+	return TRUE
+
+/obj/machinery/particle_accelerator/control_box/ui_status(mob/user)
+	if(is_interactive(user))
+		return ..()
+	return UI_CLOSE
+
+/obj/machinery/particle_accelerator/control_box/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
+									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "ParticleAccelerator", name, ui_x, ui_y, master_ui, state)
+		ui.open()
+
+/obj/machinery/particle_accelerator/control_box/ui_data(mob/user)
+	var/list/data = list()
+	data["assembled"] = assembled
+	data["power"] = active
+	data["strength"] = strength
+	return data
+
+/obj/machinery/particle_accelerator/control_box/ui_act(action, params)
+	if(..())
+		return
+
+	switch(action)
+		if("power")
+			if(wires.is_cut(WIRE_POWER))
+				return
+			toggle_power()
+			. = TRUE
+		if("scan")
+			part_scan()
+			. = TRUE
+		if("add_strength")
+			if(wires.is_cut(WIRE_STRENGTH))
+				return
+			add_strength()
+			. = TRUE
+		if("remove_strength")
+			if(wires.is_cut(WIRE_STRENGTH))
+				return
+			remove_strength()
+			. = TRUE
+
+	update_icon()
+
 #undef PA_CONSTRUCTION_UNSECURED
 #undef PA_CONSTRUCTION_UNWIRED
 #undef PA_CONSTRUCTION_PANEL_OPEN

code/modules/power/smes.dm

@@ -313,7 +313,7 @@
 										datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "smes", name, 340, 440, master_ui, state)
+		ui = new(user, src, ui_key, "Smes", name, 340, 440, master_ui, state)
 		ui.open()
 
 /obj/machinery/power/smes/ui_data()

code/modules/power/solar.dm

@@ -352,7 +352,7 @@
 												datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "solar_control", name, 380, 230, master_ui, state)
+		ui = new(user, src, ui_key, "SolarControl", name, 380, 230, master_ui, state)
 		ui.open()
 
 /obj/machinery/power/solar_control/ui_data()

code/modules/power/turbine.dm

@@ -41,6 +41,11 @@
 	var/comp_id = 0
 	var/efficiency
 
+/obj/machinery/power/compressor/Destroy()
+	if(turbine && turbine.compressor == src)
+		turbine.compressor = null
+	turbine = null
+	return ..()
 
 /obj/machinery/power/turbine
 	name = "gas turbine generator"
@@ -51,12 +56,20 @@
 	resistance_flags = FIRE_PROOF
 	CanAtmosPass = ATMOS_PASS_DENSITY
 	circuit = /obj/item/circuitboard/machine/power_turbine
+	ui_x = 310
+	ui_y = 150
 	var/opened = 0
 	var/obj/machinery/power/compressor/compressor
 	var/turf/outturf
 	var/lastgen
 	var/productivity = 1
 
+/obj/machinery/power/turbine/Destroy()
+	if(compressor && compressor.turbine == src)
+		compressor.turbine = null
+	compressor = null
+	return ..()
+
 // the inlet stage of the gas turbine electricity generator
 
 /obj/machinery/power/compressor/Initialize()
@@ -66,12 +79,10 @@
 	inturf = get_step(src, dir)
 	locate_machinery()
 	if(!turbine)
-		stat |= BROKEN
-
+		obj_break()
 
 #define COMPFRICTION 5e5
 
-
 /obj/machinery/power/compressor/locate_machinery()
 	if(turbine)
 		return
@@ -103,7 +114,7 @@
 			stat &= ~BROKEN
 		else
 			to_chat(user, "<span class='alert'>Turbine not connected.</span>")
-			stat |= BROKEN
+			obj_break()
 		return
 
 	default_deconstruction_crowbar(I)
@@ -129,9 +140,9 @@
 
 // RPM function to include compression friction - be advised that too low/high of a compfriction value can make things screwy
 
+	rpm = min(rpm, (COMPFRICTION*efficiency)/2)
 	rpm = max(0, rpm - (rpm*rpm)/(COMPFRICTION*efficiency))
 
-
 	if(starter && !(stat & NOPOWER))
 		use_power(2800)
 		if(rpm<1000)
@@ -140,8 +151,6 @@
 		if(rpm<1000)
 			rpmtarget = 0
 
-
-
 	if(rpm>50000)
 		add_overlay(mutable_appearance(icon, "comp-o4", FLY_LAYER))
 	else if(rpm>10000)
@@ -164,7 +173,7 @@
 	outturf = get_step(src, dir)
 	locate_machinery()
 	if(!compressor)
-		stat |= BROKEN
+		obj_break()
 	connect_to_network()
 
 /obj/machinery/power/turbine/RefreshParts()
@@ -222,8 +231,6 @@
 	if(lastgen > 100)
 		add_overlay(mutable_appearance(icon, "turb-o", FLY_LAYER))
 
-	updateDialog()
-
 /obj/machinery/power/turbine/attackby(obj/item/I, mob/user, params)
 	if(default_deconstruction_screwdriver(user, initial(icon_state), initial(icon_state), I))
 		return
@@ -237,53 +244,42 @@
 			stat &= ~BROKEN
 		else
 			to_chat(user, "<span class='alert'>Compressor not connected.</span>")
-			stat |= BROKEN
+			obj_break()
 		return
 
 	default_deconstruction_crowbar(I)
 
-/obj/machinery/power/turbine/ui_interact(mob/user)
+/obj/machinery/power/turbine/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
+									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "TurbineComputer", name, ui_x, ui_y, master_ui, state)
+		ui.open()
 
-	if(!Adjacent(user)  || (stat & (NOPOWER|BROKEN)) && !issilicon(user))
-		user.unset_machine(src)
-		user << browse(null, "window=turbine")
-		return
+/obj/machinery/power/turbine/ui_data(mob/user)
+	var/list/data = list()
+	data["compressor"] = compressor ? TRUE : FALSE
+	data["compressor_broke"] = (!compressor || (compressor.stat & BROKEN)) ? TRUE : FALSE
+	data["turbine"] = compressor?.turbine ? TRUE : FALSE
+	data["turbine_broke"] = (!compressor || !compressor.turbine || (compressor.turbine.stat & BROKEN)) ? TRUE : FALSE
+	data["online"] = compressor?.starter
+	data["power"] = DisplayPower(compressor?.turbine?.lastgen)
+	data["rpm"] = compressor?.rpm
+	data["temp"] = compressor?.gas_contained.temperature
+	return data
 
-	var/t = "<TT><B>Gas Turbine Generator</B><HR><PRE>"
-
-	t += "Generated power : [DisplayPower(lastgen)]<BR><BR>"
-
-	t += "Turbine: [round(compressor.rpm)] RPM<BR>"
-
-	t += "Starter: [ compressor.starter ? "<A href='?src=[REF(src)];str=1'>Off</A> <B>On</B>" : "<B>Off</B> <A href='?src=[REF(src)];str=1'>On</A>"]"
-
-	t += "</PRE><HR><A href='?src=[REF(src)];close=1'>Close</A>"
-
-	t += "</TT>"
-	var/datum/browser/popup = new(user, "turbine", name)
-	popup.set_content(t)
-	popup.open()
-
-	return
-
-/obj/machinery/power/turbine/Topic(href, href_list)
+/obj/machinery/power/turbine/ui_act(action, params)
 	if(..())
 		return
 
-	if( href_list["close"] )
-		usr << browse(null, "window=turbine")
-		usr.unset_machine(src)
-		return
-
-	else if( href_list["str"] )
-		if(compressor)
-			compressor.starter = !compressor.starter
-
-	updateDialog()
-
-
-
-
+	switch(action)
+		if("toggle_power")
+			if(compressor && compressor.turbine)
+				compressor.starter = !compressor.starter
+				. = TRUE
+		if("reconnect")
+			locate_machinery()
+			. = TRUE
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -296,6 +292,8 @@
 	icon_screen = "turbinecomp"
 	icon_keyboard = "tech_key"
 	circuit = /obj/item/circuitboard/computer/turbine_computer
+	ui_x = 310
+	ui_y = 150
 	var/obj/machinery/power/compressor/compressor
 	var/id = 0
 
@@ -319,27 +317,25 @@
 									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "turbine_computer", name, 300, 200, master_ui, state)
+		ui = new(user, src, ui_key, "TurbineComputer", name, ui_x, ui_y, master_ui, state)
 		ui.open()
 
 /obj/machinery/computer/turbine_computer/ui_data(mob/user)
 	var/list/data = list()
-
 	data["compressor"] = compressor ? TRUE : FALSE
 	data["compressor_broke"] = (!compressor || (compressor.stat & BROKEN)) ? TRUE : FALSE
 	data["turbine"] = compressor?.turbine ? TRUE : FALSE
 	data["turbine_broke"] = (!compressor || !compressor.turbine || (compressor.turbine.stat & BROKEN)) ? TRUE : FALSE
 	data["online"] = compressor?.starter
-
 	data["power"] = DisplayPower(compressor?.turbine?.lastgen)
 	data["rpm"] = compressor?.rpm
 	data["temp"] = compressor?.gas_contained.temperature
-
 	return data
 
 /obj/machinery/computer/turbine_computer/ui_act(action, params)
 	if(..())
 		return
+
 	switch(action)
 		if("toggle_power")
 			if(compressor && compressor.turbine)

code/modules/reagents/chemistry/machinery/chem_dispenser.dm

@@ -182,7 +182,7 @@
 											datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "chem_dispenser", name, 565, 550, master_ui, state)
+		ui = new(user, src, ui_key, "ChemDispenser", name, 565, 550, master_ui, state)
 		if(user.hallucinating())
 			ui.set_autoupdate(FALSE) //to not ruin the immersion by constantly changing the fake chemicals
 		ui.open()

code/modules/reagents/chemistry/machinery/chem_heater.dm

@@ -103,7 +103,7 @@
 										datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "chem_heater", name, 275, 400, master_ui, state)
+		ui = new(user, src, ui_key, "ChemHeater", name, 275, 400, master_ui, state)
 		ui.open()
 
 /obj/machinery/chem_heater/ui_data()
@@ -155,4 +155,4 @@
 		if("eject")
 			on = FALSE
 			replace_beaker(usr)
-			. = TRUE
+			. = TRUE

code/modules/reagents/chemistry/machinery/chem_master.dm

@@ -160,7 +160,8 @@
 	if(!ui)
 		var/datum/asset/assets = get_asset_datum(/datum/asset/spritesheet/simple/pills)
 		assets.send(user)
-		ui = new(user, src, ui_key, "chem_master", name, 500, 550, master_ui, state)
+
+		ui = new(user, src, ui_key, "ChemMaster", name, 500, 550, master_ui, state)
 		ui.open()
 
 //Insert our custom spritesheet css link into the html

code/modules/reagents/chemistry/machinery/chem_synthesizer.dm

@@ -16,7 +16,7 @@
 											datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "chem_synthesizer", name, 390, 330, master_ui, state)
+		ui = new(user, src, ui_key, "ChemDebugSynthesizer", name, 390, 330, master_ui, state)
 		ui.open()
 
 /obj/machinery/chem_dispenser/chem_synthesizer/ui_act(action, params)

code/modules/reagents/chemistry/machinery/pandemic.dm

@@ -123,7 +123,7 @@
 /obj/machinery/computer/pandemic/ui_interact(mob/user, ui_key = "main", datum/tgui/ui, force_open = FALSE, datum/tgui/master_ui, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "pandemic", name, 520, 550, master_ui, state)
+		ui = new(user, src, ui_key, "Pandemic", name, 520, 550, master_ui, state)
 		ui.open()
 
 /obj/machinery/computer/pandemic/ui_data(mob/user)

code/modules/reagents/chemistry/machinery/smoke_machine.dm

@@ -104,7 +104,7 @@
 										datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "smoke_machine", name, 350, 350, master_ui, state)
+		ui = new(user, src, ui_key, "SmokeMachine", name, 350, 350, master_ui, state)
 		ui.open()
 
 /obj/machinery/smoke_machine/ui_data(mob/user)

code/modules/recycling/disposal/bin.dm

@@ -305,7 +305,7 @@
 		return
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "disposal_unit", name, ui_x, ui_y, master_ui, state)
+		ui = new(user, src, ui_key, "DisposalUnit", name, ui_x, ui_y, master_ui, state)
 		ui.open()
 
 /obj/machinery/disposal/bin/ui_data(mob/user)

code/modules/research/nanites/nanite_chamber_computer.dm

@@ -3,8 +3,8 @@
 	desc = "Controls a connected nanite chamber. Can inoculate nanites, load programs, and analyze existing nanite swarms."
 	var/obj/machinery/nanite_chamber/chamber
 	var/obj/item/disk/nanite_program/disk
-	circuit = /obj/item/circuitboard/computer/nanite_chamber_control
 	icon_screen = "nanite_chamber_control"
+	circuit = /obj/item/circuitboard/computer/nanite_chamber_control
 	ui_x = 380
 	ui_y = 570
 
@@ -28,7 +28,7 @@
 /obj/machinery/computer/nanite_chamber_control/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "nanite_chamber_control", name, ui_x, ui_y, master_ui, state)
+		ui = new(user, src, ui_key, "NaniteChamberControl", name, ui_x, ui_y, master_ui, state)
 		ui.open()
 
 /obj/machinery/computer/nanite_chamber_control/ui_data()
@@ -72,14 +72,14 @@
 		if("set_safety")
 			var/threshold = text2num(params["value"])
 			if(!isnull(threshold))
-				chamber.set_safety(CLAMP(round(threshold, 1),0,500))
+				chamber.set_safety(clamp(round(threshold, 1),0,500))
 				playsound(src, "terminal_type", 25, FALSE)
 				chamber.occupant.investigate_log("'s nanites' safety threshold was set to [threshold] by [key_name(usr)] via [src] at [AREACOORD(src)].", INVESTIGATE_NANITES)
 			. = TRUE
 		if("set_cloud")
 			var/cloud_id = text2num(params["value"])
 			if(!isnull(cloud_id))
-				chamber.set_cloud(CLAMP(round(cloud_id, 1),0,100))
+				chamber.set_cloud(clamp(round(cloud_id, 1),0,100))
 				playsound(src, "terminal_type", 25, FALSE)
 				chamber.occupant.investigate_log("'s nanites' cloud id was set to [cloud_id] by [key_name(usr)] via [src] at [AREACOORD(src)].", INVESTIGATE_NANITES)
 			. = TRUE

code/modules/research/nanites/nanite_cloud_controller.dm

@@ -56,7 +56,7 @@
 /obj/machinery/computer/nanite_cloud_controller/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "nanite_cloud_control", name, ui_x, ui_y, master_ui, state)
+		ui = new(user, src, ui_key, "NaniteCloudControl", name, ui_x, ui_y, master_ui, state)
 		ui.open()
 
 /obj/machinery/computer/nanite_cloud_controller/ui_data()

code/modules/research/nanites/nanite_program_hub.dm

@@ -50,7 +50,7 @@
 /obj/machinery/nanite_program_hub/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "nanite_program_hub", name, ui_x, ui_y, master_ui, state)
+		ui = new(user, src, ui_key, "NaniteProgramHub", name, ui_x, ui_y, master_ui, state)
 		ui.open()
 
 /obj/machinery/nanite_program_hub/ui_data()

code/modules/research/nanites/nanite_programmer.dm

@@ -37,7 +37,7 @@
 /obj/machinery/nanite_programmer/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "nanite_programmer", name, ui_x, ui_y, master_ui, state)
+		ui = new(user, src, ui_key, "NaniteProgrammer", name, ui_x, ui_y, master_ui, state)
 		ui.open()
 
 /obj/machinery/nanite_programmer/ui_data()

code/modules/research/nanites/nanite_remote.dm

@@ -83,7 +83,7 @@
 /obj/item/nanite_remote/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.hands_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "nanite_remote", name, 420, 500, master_ui, state)
+		ui = new(user, src, ui_key, "NaniteRemote", name, 420, 500, master_ui, state)
 		ui.open()
 
 /obj/item/nanite_remote/ui_data()

code/modules/ruins/spaceruin_code/TheDerelict.dm

@@ -17,3 +17,196 @@
 	desc = "Looks like someone started shakily writing a will in space common, but were interrupted by something bloody..."
 	info = "I, Victor Belyakov, do hereby leave my _- "
 
+
+/// Vault controller for use on the derelict/KS13.
+/obj/machinery/computer/vaultcontroller
+	name = "vault controller"
+	desc = "It seems to be powering and controlling the vault locks."
+	icon_screen = "power"
+	icon_keyboard = "power_key"
+	light_color = LIGHT_COLOR_YELLOW
+	use_power = NO_POWER_USE
+	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+
+	var/obj/structure/cable/attached_cable
+	var/obj/machinery/door/airlock/vault/derelict/door1
+	var/obj/machinery/door/airlock/vault/derelict/door2
+	var/locked = TRUE
+	var/siphoned_power = 0
+	var/siphon_max = 1e7
+
+	ui_x = 300
+	ui_y = 120
+
+
+/obj/machinery/computer/monitor/examine(mob/user)
+	. = ..()
+	. += "<span class='notice'>It appears to be powered via a cable connector.</span>"
+
+
+//Checks for cable connection, charges if possible.
+/obj/machinery/computer/vaultcontroller/process()
+	if(siphoned_power >= siphon_max)
+		return
+	update_cable()
+	if(attached_cable)
+		attempt_siphon()
+
+
+///Looks for a cable connection beneath the machine.
+/obj/machinery/computer/vaultcontroller/proc/update_cable()
+	var/turf/T = get_turf(src)
+	attached_cable = locate(/obj/structure/cable) in T
+
+
+///Initializes airlock links.
+/obj/machinery/computer/vaultcontroller/proc/find_airlocks()
+	for(var/obj/machinery/door/airlock/A in GLOB.airlocks)
+		if(A.id_tag == "derelictvault")
+			if(!door1)
+				door1 = A
+				continue
+			if(door1 && !door2)
+				door2 = A
+				break
+
+
+///Tries to charge from powernet excess, no upper limit except max charge.
+/obj/machinery/computer/vaultcontroller/proc/attempt_siphon()
+	var/surpluspower = clamp(attached_cable.surplus(), 0, (siphon_max - siphoned_power))
+	if(surpluspower)
+		attached_cable.add_load(surpluspower)
+		siphoned_power += surpluspower
+
+
+///Handles the doors closing
+/obj/machinery/computer/vaultcontroller/proc/cycle_close(obj/machinery/door/airlock/A)
+	A.safe = FALSE //Make sure its forced closed, always
+	A.unbolt()
+	A.close()
+	A.bolt()
+
+
+///Handles the doors opening
+/obj/machinery/computer/vaultcontroller/proc/cycle_open(obj/machinery/door/airlock/A)
+	A.unbolt()
+	A.open()
+	A.bolt()
+
+
+///Attempts to lock the vault doors
+/obj/machinery/computer/vaultcontroller/proc/lock_vault()
+	if(door1 && !door1.density)
+		cycle_close(door1)
+	if(door2 && !door2.density)
+		cycle_close(door2)
+	if(door1.density && door1.locked && door2.density && door2.locked)
+		locked = TRUE
+
+
+///Attempts to unlock the vault doors
+/obj/machinery/computer/vaultcontroller/proc/unlock_vault()
+	if(door1 && door1.density)
+		cycle_open(door1)
+	if(door2 && door2.density)
+		cycle_open(door2)
+	if(!door1.density && door1.locked && !door2.density && door2.locked)
+		locked = FALSE
+
+
+///Attempts to lock/unlock vault doors, if machine is charged.
+/obj/machinery/computer/vaultcontroller/proc/activate_lock()
+	if(siphoned_power < siphon_max)
+		return
+	if(!door1 || !door2)
+		find_airlocks()
+	if(locked)
+		unlock_vault()
+	else
+		lock_vault()
+
+
+/obj/machinery/computer/vaultcontroller/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
+											datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "VaultController", name, ui_x, ui_y, master_ui, state)
+		ui.open()
+
+
+/obj/machinery/computer/vaultcontroller/ui_act(action, params)
+	if(..())
+		return
+	switch(action)
+		if("togglelock")
+			activate_lock()
+
+
+/obj/machinery/computer/vaultcontroller/ui_data()
+	var/list/data = list()
+	data["stored"] = siphoned_power
+	data["max"] = siphon_max
+	data["doorstatus"] = locked
+	return data
+
+
+///Airlock that can't be deconstructed, broken or hacked.
+/obj/machinery/door/airlock/vault/derelict
+	locked = TRUE
+	move_resist = INFINITY
+	use_power = NO_POWER_USE
+	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+	id_tag = "derelictvault"
+
+
+///Overrides screwdriver attack to prevent all deconstruction and hacking.
+/obj/machinery/door/airlock/vault/derelict/attackby(obj/item/C, mob/user, params)
+	if(C.tool_behaviour == TOOL_SCREWDRIVER)
+		return
+	..()
+
+
+// So drones can teach borgs and AI dronespeak. For best effect, combine with mother drone lawset.
+/obj/item/dronespeak_manual
+	name = "dronespeak manual"
+	desc = "The book's cover reads: \"Understanding Dronespeak - An exercise in futility.\""
+	icon = 'icons/obj/library.dmi'
+	icon_state = "book2"
+
+/obj/item/dronespeak_manual/attack_self(mob/living/user)
+	..()
+	if(isdrone(user) || issilicon(user))
+		if(user.has_language(/datum/language/drone))
+			to_chat(user, "<span class='boldannounce'>You start skimming through [src], but you already know dronespeak.</span>")
+		else
+			to_chat(user, "<span class='boldannounce'>You start skimming through [src], and suddenly the drone chittering makes sense.</span>")
+			user.grant_language(/datum/language/drone, TRUE, TRUE, LANGUAGE_MIND)
+		return
+
+	if(user.has_language(/datum/language/drone))
+		to_chat(user, "<span class='boldannounce'>You start skimming through [src], but you already know dronespeak.</span>")
+	else
+		to_chat(user, "<span class='boldannounce'>You start skimming through [src], but you can't make any sense of the contents.</span>")
+
+/obj/item/dronespeak_manual/attack(mob/living/M, mob/living/user)
+	if(!istype(M) || !istype(user))
+		return
+	if(M == user)
+		attack_self(user)
+		return
+
+	playsound(loc, "punch", 25, TRUE, -1)
+	if(isdrone(M) || issilicon(M))
+		if(M.has_language(/datum/language/drone))
+			M.visible_message("<span class='danger'>[user] beats [M] over the head with [src]!</span>", "<span class='userdanger'>[user] beats you over the head with [src]!</span>", "<span class='hear'>You hear smacking.</span>")
+		else
+			M.visible_message("<span class='notice'>[user] teaches [M] by beating [M.p_them()] over the head with [src]!</span>", "<span class='boldnotice'>As [user] hits you with [src], chitters resonate in your mind.</span>", "<span class='hear'>You hear smacking.</span>")
+			M.grant_language(/datum/language/drone, TRUE, TRUE, LANGUAGE_MIND)
+		return
+
+/obj/structure/fluff/oldturret
+	name = "broken turret"
+	desc = "An obsolete model of turret, long non-functional."
+	icon = 'icons/obj/turrets.dmi'
+	icon_state = "turretCover"
+	density = TRUE

code/modules/security_levels/keycard_authentication.dm

@@ -15,6 +15,9 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new)
 	power_channel = ENVIRON
 	req_access = list(ACCESS_KEYCARD_AUTH)
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+	ui_x = 375
+	ui_y = 125
+
 	var/datum/callback/ev
 	var/event = ""
 	var/obj/machinery/keycard_auth/event_source
@@ -34,7 +37,7 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new)
 					datum/tgui/master_ui = null, datum/ui_state/state = GLOB.physical_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "keycard_auth", name, 375, 125, master_ui, state)
+		ui = new(user, src, ui_key, "KeycardAuth", name, ui_x, ui_y, master_ui, state)
 		ui.open()
 
 /obj/machinery/keycard_auth/ui_data()
@@ -99,13 +102,13 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new)
 
 /obj/machinery/keycard_auth/proc/trigger_event(confirmer)
 	log_game("[key_name(triggerer)] triggered and [key_name(confirmer)] confirmed event [event]")
-	message_admins("[key_name(triggerer)] triggered and [key_name(confirmer)] confirmed event [event]")
+	message_admins("[ADMIN_LOOKUPFLW(triggerer)] triggered and [ADMIN_LOOKUPFLW(confirmer)] confirmed event [event]")
 
 	var/area/A1 = get_area(triggerer)
-	deadchat_broadcast("<span class='deadsay'><span class='name'>[triggerer]</span> triggered [event] at <span class='name'>[A1.name]</span>.</span>", triggerer)
+	deadchat_broadcast(" triggered [event] at <span class='name'>[A1.name]</span>.", "<span class='name'>[triggerer]</span>", triggerer, message_type=DEADCHAT_ANNOUNCEMENT)
 
 	var/area/A2 = get_area(confirmer)
-	deadchat_broadcast("<span class='deadsay'><span class='name'>[confirmer]</span> confirmed [event] at <span class='name'>[A2.name]</span>.</span>", confirmer)
+	deadchat_broadcast(" confirmed [event] at <span class='name'>[A2.name]</span>.", "<span class='name'>[confirmer]</span>", confirmer, message_type=DEADCHAT_ANNOUNCEMENT)
 	switch(event)
 		if(KEYCARD_RED_ALERT)
 			set_security_level(SEC_LEVEL_RED)

code/modules/shuttle/emergency.dm

@@ -49,8 +49,7 @@
 
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "emergency_shuttle_console", name,
-			400, 350, master_ui, state)
+		ui = new(user, src, ui_key, "EmergencyShuttleConsole", name, ui_x, ui_y, master_ui, state)
 		ui.open()
 
 /obj/machinery/computer/emergency_shuttle/ui_data()

code/modules/station_goals/bsa.dm

@@ -223,7 +223,7 @@
 										datum/tgui/master_ui = null, datum/ui_state/state = GLOB.physical_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "bsa", name, 400, 220, master_ui, state)
+		ui = new(user, src, ui_key, "BluespaceArtillery", name, ui_x, ui_y, master_ui, state)
 		ui.open()
 
 /obj/machinery/computer/bsa_control/ui_data()

code/modules/station_goals/dna_vault.dm

@@ -178,7 +178,7 @@
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
 		roll_powers(user)
-		ui = new(user, src, ui_key, "dna_vault", name, 350, 400, master_ui, state)
+		ui = new(user, src, ui_key, "DnaVault", name, ui_x, ui_y, master_ui, state)
 		ui.open()
 
 

code/modules/station_goals/shield.dm

@@ -45,7 +45,7 @@
 /obj/machinery/computer/sat_control/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "sat_control", name, 400, 305, master_ui, state)
+		ui = new(user, src, ui_key, "SatelliteControl", name, ui_x, ui_y, master_ui, state)
 		ui.open()
 
 /obj/machinery/computer/sat_control/ui_act(action, params)

code/modules/tgui/external.dm

@@ -1,133 +1,142 @@
- /**
-  * tgui external
-  *
-  * Contains all external tgui declarations.
- **/
+/**
+ * tgui external
+ *
+ * Contains all external tgui declarations.
+ */
 
- /**
-  * public
-  *
-  * Used to open and update UIs.
-  * If this proc is not implemented properly, the UI will not update correctly.
-  *
-  * required user mob The mob who opened/is using the UI.
-  * optional ui_key string The ui_key of the UI.
-  * optional ui datum/tgui The UI to be updated, if it exists.
-  * optional force_open bool If the UI should be re-opened instead of updated.
-  * optional master_ui datum/tgui The parent UI.
-  * optional state datum/ui_state The state used to determine status.
- **/
+/**
+ * public
+ *
+ * Used to open and update UIs.
+ * If this proc is not implemented properly, the UI will not update correctly.
+ *
+ * required user mob The mob who opened/is using the UI.
+ * optional ui_key string The ui_key of the UI.
+ * optional ui datum/tgui The UI to be updated, if it exists.
+ * optional force_open bool If the UI should be re-opened instead of updated.
+ * optional master_ui datum/tgui The parent UI.
+ * optional state datum/ui_state The state used to determine status.
+ */
 /datum/proc/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	return FALSE // Not implemented.
 
- /**
-  * public
-  *
-  * Data to be sent to the UI.
-  * This must be implemented for a UI to work.
-  *
-  * required user mob The mob interacting with the UI.
-  *
-  * return list Data to be sent to the UI.
- **/
+/**
+ * public
+ *
+ * Data to be sent to the UI.
+ * This must be implemented for a UI to work.
+ *
+ * required user mob The mob interacting with the UI.
+ *
+ * return list Data to be sent to the UI.
+ */
 /datum/proc/ui_data(mob/user)
 	return list() // Not implemented.
 
- /**
-  * public
-  *
-  * Static Data to be sent to the UI.
-  * Static data differs from normal data in that it's large data that should be sent infrequently
-  * This is implemented optionally for heavy uis that would be sending a lot of redundant data
-  * frequently.
-  * Gets squished into one object on the frontend side, but the static part is cached.
-  *
-  * required user mob The mob interacting with the UI.
-  *
-  * return list Statuic Data to be sent to the UI.
- **/
+/**
+ * public
+ *
+ * Static Data to be sent to the UI.
+ * Static data differs from normal data in that it's large data that should be sent infrequently
+ * This is implemented optionally for heavy uis that would be sending a lot of redundant data
+ * frequently.
+ * Gets squished into one object on the frontend side, but the static part is cached.
+ *
+ * required user mob The mob interacting with the UI.
+ *
+ * return list Statuic Data to be sent to the UI.
+ */
 /datum/proc/ui_static_data(mob/user)
 	return list()
 
 /**
-  * public
-  *
-  * Forces an update on static data. Should be done manually whenever something happens to change static data.
-  *
-  * required user the mob currently interacting with the ui
-  * optional ui ui to be updated
-  * optional ui_key ui key of ui to be updated
-  *
-**/
+ * public
+ *
+ * Forces an update on static data. Should be done manually whenever something happens to change static data.
+ *
+ * required user the mob currently interacting with the ui
+ * optional ui ui to be updated
+ * optional ui_key ui key of ui to be updated
+ */
 /datum/proc/update_static_data(mob/user, datum/tgui/ui, ui_key = "main")
 	ui = SStgui.try_update_ui(user, src, ui_key, ui)
+	// If there was no ui to update, there's no static data to update either.
 	if(!ui)
-		return //If there was no ui to update, there's no static data to update either.
+		return
 	ui.push_data(null, ui_static_data(), TRUE)
 
- /**
-  * public
-  *
-  * Called on a UI when the UI receieves a href.
-  * Think of this as Topic().
-  *
-  * required action string The action/button that has been invoked by the user.
-  * required params list A list of parameters attached to the button.
-  *
-  * return bool If the UI should be updated or not.
- **/
+/**
+ * public
+ *
+ * Called on a UI when the UI receieves a href.
+ * Think of this as Topic().
+ *
+ * required action string The action/button that has been invoked by the user.
+ * required params list A list of parameters attached to the button.
+ *
+ * return bool If the UI should be updated or not.
+ */
 /datum/proc/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+	// If UI is not interactive or usr calling Topic is not the UI user, bail.
 	if(!ui || ui.status != UI_INTERACTIVE)
-		return 1 // If UI is not interactive or usr calling Topic is not the UI user, bail.
+		return 1
 
- /**
-  * public
-  *
-  * Called on an object when a tgui object is being created, allowing you to customise the html
-  * For example: inserting a custom stylesheet that you need in the head
-  *
-  * For this purpose, some tags are available in the html, to be parsed out with replacetext
-  * (customheadhtml) - Additions to the head tag
-  *
-  * required html the html base text
-  *
- **/
+/**
+ * public
+ *
+ * Called on an object when a tgui object is being created, allowing you to
+ * customise the html
+ * For example: inserting a custom stylesheet that you need in the head
+ *
+ * For this purpose, some tags are available in the html, to be parsed out
+ ^ with replacetext
+ * (customheadhtml) - Additions to the head tag
+ *
+ * required html the html base text
+ */
 /datum/proc/ui_base_html(html)
 	return html
 
- /**
-  * private
-  *
-  * The UI's host object (usually src_object).
-  * This allows modules/datums to have the UI attached to them,
-  * and be a part of another object.
- **/
+/**
+ * private
+ *
+ * The UI's host object (usually src_object).
+ * This allows modules/datums to have the UI attached to them,
+ * and be a part of another object.
+ */
 /datum/proc/ui_host(mob/user)
 	return src // Default src.
 
- /**
-  * global
-  *
-  * Used to track UIs for a mob.
- **/
-/mob/var/list/open_uis = list()
- /**
-  * public
-  *
-  * Called on a UI's object when the UI is closed, not to be confused with client/verb/uiclose(), which closes the ui window
-  *
-  *
- **/
-/datum/proc/ui_close()
+/**
+ * global
+ *
+ * Associative list of JSON-encoded shared states that were set by
+ * tgui clients.
+ */
+/datum/var/list/tgui_shared_states
 
- /**
-  * verb
-  *
-  * Called by UIs when they are closed.
-  * Must be a verb so winset() can call it.
-  *
-  * required uiref ref The UI that was closed.
- **/
+/**
+ * global
+ *
+ * Used to track UIs for a mob.
+ */
+/mob/var/list/open_uis = list()
+/**
+ * public
+ *
+ * Called on a UI's object when the UI is closed, not to be confused with
+ * client/verb/uiclose(), which closes the ui window
+ */
+/datum/proc/ui_close(mob/user)
+
+/**
+ * verb
+ *
+ * Called by UIs when they are closed.
+ * Must be a verb so winset() can call it.
+ *
+ * required uiref ref The UI that was closed.
+ */
 /client/verb/uiclose(ref as text)
 	// Name the verb, and hide it from the user panel.
 	set name = "uiclose"

code/modules/tgui/states.dm

@@ -1,19 +1,19 @@
- /**
-  * tgui states
-  *
-  * Base state and helpers for states. Just does some sanity checks, implement a state for in-depth checks.
- **/
+/**
+ * tgui states
+ *
+ * Base state and helpers for states. Just does some sanity checks, implement a state for in-depth checks.
+ */
 
- /**
-  * public
-  *
-  * Checks the UI state for a mob.
-  *
-  * required user mob The mob who opened/is using the UI.
-  * required state datum/ui_state The state to check.
-  *
-  * return UI_state The state of the UI.
- **/
+/**
+ * public
+ *
+ * Checks the UI state for a mob.
+ *
+ * required user mob The mob who opened/is using the UI.
+ * required state datum/ui_state The state to check.
+ *
+ * return UI_state The state of the UI.
+ */
 /datum/proc/ui_status(mob/user, datum/ui_state/state)
 	var/src_object = ui_host(user)
 	. = UI_CLOSE
@@ -34,27 +34,27 @@
 	var/result = state.can_use_topic(src_object, user)
 	. = max(., result)
 
- /**
-  * private
-  *
-  * Checks if a user can use src_object's UI, and returns the state.
-  * Can call a mob proc, which allows overrides for each mob.
-  *
-  * required src_object datum The object/datum which owns the UI.
-  * required user mob The mob who opened/is using the UI.
-  *
-  * return UI_state The state of the UI.
- **/
+/**
+ * private
+ *
+ * Checks if a user can use src_object's UI, and returns the state.
+ * Can call a mob proc, which allows overrides for each mob.
+ *
+ * required src_object datum The object/datum which owns the UI.
+ * required user mob The mob who opened/is using the UI.
+ *
+ * return UI_state The state of the UI.
+ */
 /datum/ui_state/proc/can_use_topic(src_object, mob/user)
 	return UI_CLOSE // Don't allow interaction by default.
 
- /**
-  * public
-  *
-  * Standard interaction/sanity checks. Different mob types may have overrides.
-  *
-  * return UI_state The state of the UI.
- **/
+/**
+ * public
+ *
+ * Standard interaction/sanity checks. Different mob types may have overrides.
+ *
+ * return UI_state The state of the UI.
+ */
 /mob/proc/shared_ui_interaction(src_object)
 	if(!client) // Close UIs if mindless.
 		return UI_CLOSE
@@ -75,31 +75,31 @@
 	return ..()
 
 /**
-  * public
-  *
-  * Check the distance for a living mob.
-  * Really only used for checks outside the context of a mob.
-  * Otherwise, use shared_living_ui_distance().
-  *
-  * required src_object The object which owns the UI.
-  * required user mob The mob who opened/is using the UI.
-  *
-  * return UI_state The state of the UI.
- **/
+ * public
+ *
+ * Check the distance for a living mob.
+ * Really only used for checks outside the context of a mob.
+ * Otherwise, use shared_living_ui_distance().
+ *
+ * required src_object The object which owns the UI.
+ * required user mob The mob who opened/is using the UI.
+ *
+ * return UI_state The state of the UI.
+ */
 /atom/proc/contents_ui_distance(src_object, mob/living/user)
 	return user.shared_living_ui_distance(src_object) // Just call this mob's check.
 
- /**
-  * public
-  *
-  * Distance versus interaction check.
-  *
-  * required src_object atom/movable The object which owns the UI.
-  *
-  * return UI_state The state of the UI.
- **/
-/mob/living/proc/shared_living_ui_distance(atom/movable/src_object)
-	if(!(src_object in view(src))) // If the object is obscured, close it.
+/**
+ * public
+ *
+ * Distance versus interaction check.
+ *
+ * required src_object atom/movable The object which owns the UI.
+ *
+ * return UI_state The state of the UI.
+ */
+/mob/living/proc/shared_living_ui_distance(atom/movable/src_object, viewcheck = TRUE)
+	if(viewcheck && !(src_object in view(src))) // If the object is obscured, close it.
 		return UI_CLOSE
 
 	var/dist = get_dist(src_object, src)

code/modules/tgui/states/admin.dm

@@ -1,8 +1,8 @@
- /**
-  * tgui state: admin_state
-  *
-  * Checks that the user is an admin, end-of-story.
- **/
+/**
+ * tgui state: admin_state
+ *
+ * Checks that the user is an admin, end-of-story.
+ */
 
 GLOBAL_DATUM_INIT(admin_state, /datum/ui_state/admin_state, new)
 

code/modules/tgui/states/always.dm

@@ -1,9 +1,8 @@
-
- /**
-  * tgui state: always_state
-  *
-  * Always grants the user UI_INTERACTIVE. Period.
- **/
+/**
+ * tgui state: always_state
+ *
+ * Always grants the user UI_INTERACTIVE. Period.
+ */
 
 GLOBAL_DATUM_INIT(always_state, /datum/ui_state/always_state, new)
 

code/modules/tgui/states/conscious.dm

@@ -1,8 +1,8 @@
- /**
-  * tgui state: conscious_state
-  *
-  * Only checks if the user is conscious.
- **/
+/**
+ * tgui state: conscious_state
+ *
+ * Only checks if the user is conscious.
+ */
 
 GLOBAL_DATUM_INIT(conscious_state, /datum/ui_state/conscious_state, new)
 

code/modules/tgui/states/contained.dm

@@ -1,8 +1,8 @@
- /**
-  * tgui state: contained_state
-  *
-  * Checks that the user is inside the src_object.
- **/
+/**
+ * tgui state: contained_state
+ *
+ * Checks that the user is inside the src_object.
+ */
 
 GLOBAL_DATUM_INIT(contained_state, /datum/ui_state/contained_state, new)
 

code/modules/tgui/states/deep_inventory.dm

@@ -1,8 +1,8 @@
- /**
-  * tgui state: deep_inventory_state
-  *
-  * Checks that the src_object is in the user's deep (backpack, box, toolbox, etc) inventory.
- **/
+/**
+ * tgui state: deep_inventory_state
+ *
+ * Checks that the src_object is in the user's deep (backpack, box, toolbox, etc) inventory.
+ */
 
 GLOBAL_DATUM_INIT(deep_inventory_state, /datum/ui_state/deep_inventory_state, new)
 

code/modules/tgui/states/default.dm

@@ -1,8 +1,8 @@
- /**
-  * tgui state: default_state
-  *
-  * Checks a number of things -- mostly physical distance for humans and view for robots.
- **/
+/**
+ * tgui state: default_state
+ *
+ * Checks a number of things -- mostly physical distance for humans and view for robots.
+ */
 
 GLOBAL_DATUM_INIT(default_state, /datum/ui_state/default, new)
 

code/modules/tgui/states/hands.dm

@@ -1,8 +1,8 @@
- /**
-  * tgui state: hands_state
-  *
-  * Checks that the src_object is in the user's hands.
- **/
+/**
+ * tgui state: hands_state
+ *
+ * Checks that the src_object is in the user's hands.
+ */
 
 GLOBAL_DATUM_INIT(hands_state, /datum/ui_state/hands_state, new)
 

code/modules/tgui/states/human_adjacent.dm

@@ -1,10 +1,9 @@
-
- /**
-  * tgui state: human_adjacent_state
-  *
-  * In addition to default checks, only allows interaction for a
-  * human adjacent user.
- **/
+/**
+ * tgui state: human_adjacent_state
+ *
+ * In addition to default checks, only allows interaction for a
+ * human adjacent user.
+ */
 
 GLOBAL_DATUM_INIT(human_adjacent_state, /datum/ui_state/human_adjacent_state, new)
 

code/modules/tgui/states/inventory.dm

@@ -1,8 +1,8 @@
- /**
-  * tgui state: inventory_state
-  *
-  * Checks that the src_object is in the user's top-level (hand, ear, pocket, belt, etc) inventory.
- **/
+/**
+ * tgui state: inventory_state
+ *
+ * Checks that the src_object is in the user's top-level (hand, ear, pocket, belt, etc) inventory.
+ */
 
 GLOBAL_DATUM_INIT(inventory_state, /datum/ui_state/inventory_state, new)
 

code/modules/tgui/states/language_menu.dm

@@ -1,6 +1,6 @@
- /**
-  * tgui state: language_menu_state
-  */
+/**
+ * tgui state: language_menu_state
+ */
 
 GLOBAL_DATUM_INIT(language_menu_state, /datum/ui_state/language_menu, new)