Merge remote-tracking branch 'upstream/master' into fairylights

2026-08-22 12:16:13 +01:00 · 2022-04-02 18:43:01 -06:00
parent 67f0fb5c19 d5934a58da
commit 784999b48b
910 changed files with 114448 additions and 126508 deletions
@@ -64,12 +64,12 @@
 		SSnetworks.station_network.add_log("Quantum relay switched from overload recovery mode to normal operation mode.")
 	..()

-/obj/machinery/ntnet_relay/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)
+/obj/machinery/ntnet_relay/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)

 	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()


@@ -77,9 +77,10 @@
 		return
 	close_machine(target)

-/obj/machinery/vr_sleeper/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)
+/obj/machinery/vr_sleeper/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
+		// TGUI TODO: do something about this UI
 		ui = new(user, src, ui_key, "vr_sleeper", "VR Sleeper", 475, 340, master_ui, state)
 		ui.open()

@@ -33,10 +33,10 @@

 	borg = to_borg

-/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)
+/datum/borgpanel/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_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)
@@ -13,10 +13,10 @@
 	changeling = null
 	. = ..()

-/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)
+/datum/cellular_emporium/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_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)
@@ -192,12 +192,13 @@
 	ui_interact(user)
 	return TRUE

-/obj/item/clockwork/slab/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.inventory_state)
+/obj/item/clockwork/slab/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_inventory_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
+		// TGUI TODO: do something with this UI
 		ui = new(user, src, ui_key, "clockwork_slab", name, 800, 420, master_ui, state)
 		ui.set_autoupdate(FALSE) //we'll update this occasionally, but not as often as possible
-		ui.set_style("clockwork")
+		// ui.set_style("clockwork")
 		ui.open()

 /obj/item/clockwork/slab/proc/recite_scripture(datum/clockwork_scripture/scripture, mob/living/user)
@@ -260,11 +260,11 @@
 	ui_mode = NUKEUI_AWAIT_TIMER


-/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)
+/obj/machinery/nuclearbomb/ui_interact(mob/user, ui_key="main", datum/tgui/ui=null, force_open=0, datum/tgui/master_ui=null, datum/tgui_state/state=GLOB.tgui_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, 350, 442, master_ui, state)
+		// ui.set_style(ui_style)
 		ui.open()

 /obj/machinery/nuclearbomb/ui_data(mob/user)
@@ -47,14 +47,14 @@
 		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)
+/obj/item/assembly/signaler/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
 	if(!is_secured(user))
 		return
 	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_width, ui_height, master_ui, state)
 		ui.open()

 /obj/item/assembly/signaler/ui_data(mob/user)
@@ -1,27 +1,9 @@
 //DEFINITIONS FOR ASSET DATUMS START HERE.
-/* uncomment this and delete the tgui def bellow this for the new tgui
 /datum/asset/simple/tgui
 	assets = list(
 		"tgui.bundle.js" = 'tgui/packages/tgui/public/tgui.bundle.js',
 		"tgui.bundle.css" = 'tgui/packages/tgui/public/tgui.bundle.css',
 	)
-*/
-/datum/asset/simple/tgui
-	assets = list(
-		// Old TGUI
-		"tgui.css" = 'tgui/assets/tgui.css',
-		"tgui.js" = 'tgui/assets/tgui.js',
-		// tgui-next
-		"tgui-main.html" = 'tgui-next/packages/tgui/public/tgui-main.html',
-		"tgui.bundle.js" = 'tgui-next/packages/tgui/public/tgui.bundle.js',
-		"tgui.bundle.css" = 'tgui-next/packages/tgui/public/tgui.bundle.css',
-		// Old TGUI compatability
-		"tgui-fallback.html" = 'tgui-next/packages/tgui/public/tgui-fallback.html',
-		"shim-html5shiv.js" = 'tgui-next/packages/tgui/public/shim-html5shiv.js',
-		"shim-ie8.js" = 'tgui-next/packages/tgui/public/shim-ie8.js',
-		"shim-dom4.js" = 'tgui-next/packages/tgui/public/shim-dom4.js',
-		"shim-css-om.js" = 'tgui-next/packages/tgui/public/shim-css-om.js',
-	)

 /datum/asset/group/tgui
 	children = list(
@@ -237,10 +237,10 @@
 	return UI_CLOSE

 /obj/machinery/airalarm/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)
+									datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_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)
@@ -88,10 +88,10 @@ Passive gate is similar to the regular pump except:
 	radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)

 /obj/machinery/atmospherics/components/binary/passive_gate/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)
+																		datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_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/passive_gate/ui_data()
@@ -108,10 +108,10 @@
 	radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)

 /obj/machinery/atmospherics/components/binary/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.default_state)
+																datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_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()
@@ -61,10 +61,10 @@
 		open()

 /obj/machinery/atmospherics/components/binary/relief_valve/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)
+																datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "atmos_relief", name, 335, 115, master_ui, state)
+		ui = new(user, src, ui_key, "AtmosRelief", name, 335, 115, master_ui, state)
 		ui.open()

 /obj/machinery/atmospherics/components/binary/relief_valve/ui_data()
@@ -111,10 +111,10 @@
 	radio_connection.post_signal(src, signal)

 /obj/machinery/atmospherics/components/binary/volume_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.default_state)
+																		datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_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()
@@ -135,10 +135,10 @@
 	return ..()

 /obj/machinery/atmospherics/components/trinary/filter/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)
+																	datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_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()
@@ -133,10 +133,10 @@
 	parent3.update = TRUE

 /obj/machinery/atmospherics/components/trinary/mixer/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)
+																	datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_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()
@@ -308,10 +308,10 @@
 	return ..()

 /obj/machinery/atmospherics/components/unary/cryo_cell/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
-																	datum/tgui/master_ui = null, datum/ui_state/state = GLOB.notcontained_state)
+																	datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_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()
@@ -137,10 +137,10 @@


 /obj/machinery/atmospherics/components/unary/outlet_injector/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)
+																		datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_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/unary/outlet_injector/ui_data()
@@ -62,10 +62,10 @@
 			update_parents()

 /obj/machinery/atmospherics/components/unary/relief_valve/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)
+																datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "atmos_relief", name, 335, 115, master_ui, state)
+		ui = new(user, src, ui_key, "AtmosRelief", name, 335, 115, master_ui, state)
 		ui.open()

 /obj/machinery/atmospherics/components/unary/relief_valve/ui_data()
@@ -125,10 +125,10 @@
 	return UI_CLOSE

 /obj/machinery/atmospherics/components/unary/thermomachine/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)
+																	datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_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)
@@ -389,10 +389,10 @@
 	return FALSE

 /obj/machinery/portable_atmospherics/canister/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)
+															datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_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()
@@ -81,10 +81,10 @@


 /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)
+														datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_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, 300, 315, master_ui, state)
 		ui.open()

 /obj/machinery/portable_atmospherics/pump/ui_data()
@@ -64,10 +64,10 @@
 		update_icon()

 /obj/machinery/portable_atmospherics/scrubber/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)
+														datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_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, 320, 335, master_ui, state)
 		ui.open()

 /obj/machinery/portable_atmospherics/scrubber/ui_data()
@@ -107,21 +107,21 @@

 /datum/bounty/item/medical/advhealthscaner
 	name = "Advanced Health Analyzer"
-	description = "A ERT Medical unit needs the new 'advanced health analyzer', for a mission at a Station 4. Can you send some?."
+	description = "An ERT Medical unit needs the new 'advanced health analyzer' for a mission at a Station 4. Can you send some?."
 	reward = 3000
 	required_count = 5
 	wanted_types = list(/obj/item/healthanalyzer/advanced)

 /datum/bounty/item/medical/wallmounts
 	name = "Defibrillator wall mounts"
-	description = "New Space OSHA regulation state that are new cloning medical wing needs a few 'Easy to access defibrillartors'. Can you send a few before we get a lawsuit?"
+	description = "New Safety Review Board regulations state that our new medical wing needs 'easy to access defibrillators'. Can you send a few before we get a lawsuit?"
 	reward = 2000
 	required_count = 3
 	wanted_types = list(/obj/machinery/defibrillator_mount)

 /datum/bounty/item/medical/defibrillator
-	name = "New defibillators"
-	description = "After years of storage are defibrillator units have become more liabilities then we want. Please send us some new ones to replace these old ones."
+	name = "New defibrillators"
+	description = "After years of storage our defibrillator units have become more of a liability then we want. Please send us some new ones to replace them."
 	reward = 2250
 	required_count = 5
 	wanted_types = list(/obj/item/defibrillator)
@@ -51,11 +51,11 @@
 	orderedArea = createOrderedArea(bay) //Order all the turfs in the selected bay (top left to bottom right) to a single list. Used for the "ordered" mode (launchChoice = 1)

 /datum/centcom_podlauncher/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_interact is called when the client verb is called.
+force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_admin_state)//ui_interact is called when the client verb is called.

 	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.
@@ -65,10 +65,10 @@
 	update_static_data(user)

 /obj/machinery/computer/cargo/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)
+											datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_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()
@@ -171,7 +171,6 @@
 				return
 			if((pack.hidden && !(obj_flags & EMAGGED)) || (pack.contraband && !contraband) || pack.DropPodOnly)
 				return
-
 			var/name = "*None Provided*"
 			var/rank = "*None Provided*"
 			var/ckey = usr.ckey
@@ -87,10 +87,10 @@
 			"desc" = P.desc || P.name // If there is a description, use it. Otherwise use the pack's name.
 		))

-/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.
+/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/tgui_state/state = GLOB.tgui_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, 600, 700, master_ui, state)
 		ui.open()

 /obj/machinery/computer/cargo/express/ui_data(mob/user)
@@ -61,7 +61,7 @@

 /datum/supply_pack/security/russianclothing
 	name = "Russian Surplus Clothing"
-	desc = "An old russian crate full of surplus armor that they used to use! Has two sets of bulletproff armor, a few union suits and some warm hats!"
+	desc = "An old russian crate full of surplus armor that they used to use! Has two sets of bulletproof armor, a few union suits and some warm hats!"
 	contraband = TRUE
 	cost = 5750 // Its basicly sec suits, good boots/gloves
 	contains = list(/obj/item/clothing/suit/security/officer/russian,
@@ -312,6 +312,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	dat += "<a href='?_src_=prefs;preference=tab;tab=3' [current_tab == 3 ? "class='linkOn'" : ""]>Loadout</a>"
 	dat += "<a href='?_src_=prefs;preference=tab;tab=1' [current_tab == 1 ? "class='linkOn'" : ""]>Game Preferences</a>"
 	dat += "<a href='?_src_=prefs;preference=tab;tab=4' [current_tab == 4 ? "class='linkOn'" : ""]>Antagonist Preferences</a>"
+	dat += "<a href='?_src_=prefs;preference=tab;tab=5' [current_tab == 5 ? "class='linkOn'" : ""]>Content Preferences</a>"

 	if(!path)
 		dat += "<div class='notice'>Please create an account to save your preferences</div>"
@@ -1013,12 +1014,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)

 			dat +="<td width='300px' height='300px' valign='top'>"
 			dat += "<h2>Citadel Preferences</h2>" //Because fuck me if preferences can't be fucking modularized and expected to update in a reasonable timeframe.
-			dat += "<b>Arousal:</b><a href='?_src_=prefs;preference=arousable'>[arousable == TRUE ? "Enabled" : "Disabled"]</a><BR>"
-			dat += "<b>Exhibitionist:</b><a href='?_src_=prefs;preference=exhibitionist'>[features["exhibitionist"] == TRUE ? "Yes" : "No"]</a><BR>"
-			dat += "<b>Voracious MediHound sleepers:</b> <a href='?_src_=prefs;preference=hound_sleeper'>[(cit_toggles & MEDIHOUND_SLEEPER) ? "Yes" : "No"]</a><br>"
-			dat += "<b>Hear Vore Sounds:</b> <a href='?_src_=prefs;preference=toggleeatingnoise'>[(cit_toggles & EATING_NOISES) ? "Yes" : "No"]</a><br>"
-			dat += "<b>Hear Vore Digestion Sounds:</b> <a href='?_src_=prefs;preference=toggledigestionnoise'>[(cit_toggles & DIGESTION_NOISES) ? "Yes" : "No"]</a><br>"
-			dat += "<b>Lewdchem:</b><a href='?_src_=prefs;preference=lewdchem'>[lewdchem == TRUE ? "Enabled" : "Disabled"]</a><BR>"
 			dat += "<b>Widescreen:</b> <a href='?_src_=prefs;preference=widescreenpref'>[widescreenpref ? "Enabled ([CONFIG_GET(string/default_view)])" : "Disabled (15x15)"]</a><br>"
 			dat += "<b>Auto stand:</b> <a href='?_src_=prefs;preference=autostand'>[autostand ? "Enabled" : "Disabled"]</a><br>"
 			dat += "<b>Screen Shake:</b> <a href='?_src_=prefs;preference=screenshake'>[(screenshake==100) ? "Full" : ((screenshake==0) ? "None" : "[screenshake]")]</a><br>"
@@ -1169,7 +1164,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 				dat += "</td><td><font size=2><i>[gear.description]</i></font></td></tr>"
 			dat += "</table>"

-		if(4)		//Antag Preferences
+		if(4)	//Antag Preferences
 			dat += "<h1>Special Role Settings</h1>"
 			if(jobban_isbanned(user, ROLE_SYNDICATE))
 				dat += "<font color=red><h3><b>You are banned from antagonist roles.</b></h3></font>"
@@ -1191,6 +1186,34 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 						dat += "<b>Be [capitalize(i)]:</b> <a href='?_src_=prefs;preference=be_special;be_special_type=[i]'>[(i in be_special) ? "Enabled" : "Disabled"]</a><br>"
 			dat += "<b>Midround Antagonist:</b> <a href='?_src_=prefs;preference=allow_midround_antag'>[(toggles & MIDROUND_ANTAG) ? "Enabled" : "Disabled"]</a><br>"

+		if(5) //Content Preferences
+			dat += "<table><tr><td width='340px' height='300px' valign='top'>"
+			dat += "<h2>Fetish content prefs</h2>"
+			dat += "<b>Arousal:</b><a href='?_src_=prefs;preference=arousable'>[arousable == TRUE ? "Enabled" : "Disabled"]</a><BR>"
+			dat += "<b>Exhibitionist:</b><a href='?_src_=prefs;preference=exhibitionist'>[features["exhibitionist"] == TRUE ? "Yes" : "No"]</a><BR>"
+			dat += "<b>Genital examine text</b>:<a href='?_src_=prefs;preference=genital_examine'>[(cit_toggles & GENITAL_EXAMINE) ? "Enabled" : "Disabled"]</a><BR>"
+			dat += "<b>Vore examine text</b>:<a href='?_src_=prefs;preference=vore_examine'>[(cit_toggles & VORE_EXAMINE) ? "Enabled" : "Disabled"]</a><BR>"
+			dat += "<b>Voracious MediHound sleepers:</b> <a href='?_src_=prefs;preference=hound_sleeper'>[(cit_toggles & MEDIHOUND_SLEEPER) ? "Yes" : "No"]</a><br>"
+			dat += "<b>Hear Vore Sounds:</b> <a href='?_src_=prefs;preference=toggleeatingnoise'>[(cit_toggles & EATING_NOISES) ? "Yes" : "No"]</a><br>"
+			dat += "<b>Hear Vore Digestion Sounds:</b> <a href='?_src_=prefs;preference=toggledigestionnoise'>[(cit_toggles & DIGESTION_NOISES) ? "Yes" : "No"]</a><br>"
+			dat += "<b>Allow trash forcefeeding (requires Trashcan quirk)</b> <a href='?_src_=prefs;preference=toggleforcefeedtrash'>[(cit_toggles & TRASH_FORCEFEED) ? "Yes" : "No"]</a><br>"
+			dat += "<b>Forced Feminization:</b> <a href='?_src_=prefs;preference=feminization'>[(cit_toggles & FORCED_FEM) ? "Allowed" : "Disallowed"]</a><br>"
+			dat += "<b>Forced Masculinization:</b> <a href='?_src_=prefs;preference=masculinization'>[(cit_toggles & FORCED_MASC) ? "Allowed" : "Disallowed"]</a><br>"
+			dat += "<b>Lewd Hypno:</b> <a href='?_src_=prefs;preference=hypno'>[(cit_toggles & HYPNO) ? "Allowed" : "Disallowed"]</a><br>"
+			dat += "</td>"
+			dat +="<td width='300px' height='300px' valign='top'>"
+			dat += "<h2>Other content prefs</h2>"
+			dat += "<b>Breast Enlargement:</b> <a href='?_src_=prefs;preference=breast_enlargement'>[(cit_toggles & BREAST_ENLARGEMENT) ? "Allowed" : "Disallowed"]</a><br>"
+			dat += "<b>Penis Enlargement:</b> <a href='?_src_=prefs;preference=penis_enlargement'>[(cit_toggles & PENIS_ENLARGEMENT) ? "Allowed" : "Disallowed"]</a><br>"
+			dat += "<b>Ass Enlargement:</b> <a href='?_src_=prefs;preference=ass_enlargement'>[(cit_toggles & ASS_ENLARGEMENT) ? "Allowed" : "Disallowed"]</a><br>"
+			dat += "<b>Hypno:</b> <a href='?_src_=prefs;preference=never_hypno'>[(cit_toggles & NEVER_HYPNO) ? "Disallowed" : "Allowed"]</a><br>"
+			dat += "<b>Aphrodisiacs:</b> <a href='?_src_=prefs;preference=aphro'>[(cit_toggles & NO_APHRO) ? "Disallowed" : "Allowed"]</a><br>"
+			dat += "<b>Ass Slapping:</b> <a href='?_src_=prefs;preference=ass_slap'>[(cit_toggles & NO_ASS_SLAP) ? "Disallowed" : "Allowed"]</a><br>"
+			dat += "<b>Automatic Wagging:</b> <a href='?_src_=prefs;preference=auto_wag'>[(cit_toggles & NO_AUTO_WAG) ? "Disallowed" : "Allowed"]</a><br>"
+			dat += "<b>Forced UwUspeak:</b> <a href='?_src_=prefs;preference=no_uwu'>[(cit_toggles & NO_UWU) ? "Disallowed" : "Allowed"]</a><br>"
+			dat += "</tr></table>"
+			dat += "<br>"
+
 	dat += "<hr><center>"

 	if(!IsGuestKey(user.key))
@@ -2543,8 +2566,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					features["genitals_use_skintone"] = !features["genitals_use_skintone"]
 				if("arousable")
 					arousable = !arousable
-				if("lewdchem")
-					lewdchem = !lewdchem
 				if("noncon")
 					noncon = !noncon
 				if("has_cock")
@@ -2713,6 +2734,12 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 						parent.mob.hud_used.update_parallax_pref(parent.mob)

 				// Citadel edit - Prefs don't work outside of this. :c
+				if("genital_examine")
+					cit_toggles ^= GENITAL_EXAMINE
+
+				if("vore_examine")
+					cit_toggles ^= VORE_EXAMINE
+
 				if("hound_sleeper")
 					cit_toggles ^= MEDIHOUND_SLEEPER

@@ -2721,6 +2748,43 @@ GLOBAL_LIST_EMPTY(preferences_datums)

 				if("toggledigestionnoise")
 					cit_toggles ^= DIGESTION_NOISES
+
+				if("toggleforcefeedtrash")
+					cit_toggles ^= TRASH_FORCEFEED
+
+				if("breast_enlargement")
+					cit_toggles ^= BREAST_ENLARGEMENT
+
+				if("penis_enlargement")
+					cit_toggles ^= PENIS_ENLARGEMENT
+
+				if("ass_enlargement")
+					cit_toggles ^= ASS_ENLARGEMENT
+
+				if("feminization")
+					cit_toggles ^= FORCED_FEM
+
+				if("masculinization")
+					cit_toggles ^= FORCED_MASC
+
+				if("hypno")
+					cit_toggles ^= HYPNO
+
+				if("never_hypno")
+					cit_toggles ^= NEVER_HYPNO
+
+				if("aphro")
+					cit_toggles ^= NO_APHRO
+
+				if("ass_slap")
+					cit_toggles ^= NO_ASS_SLAP
+
+				if("auto_wag")
+					cit_toggles ^= NO_AUTO_WAG
+
+				if("no_uwu")
+					cit_toggles ^= NO_UWU
+
 				//END CITADEL EDIT

 				if("ambientocclusion")
@@ -137,7 +137,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["widescreenpref"]		>> widescreenpref
 	S["autostand"]			>> autostand
 	S["cit_toggles"]		>> cit_toggles
-	S["lewdchem"]			>> lewdchem

 	//Hyper code
 	S["noncon"]             >> noncon
@@ -262,7 +261,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	WRITE_FILE(S["widescreenpref"], widescreenpref)
 	WRITE_FILE(S["autostand"], autostand)
 	WRITE_FILE(S["cit_toggles"], cit_toggles)
-	WRITE_FILE(S["lewdchem"], lewdchem)

 	//Hyper
 	WRITE_FILE(S["noncon"], noncon)
@@ -562,6 +560,21 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	medical_records					= copytext(medical_records, 1, MAX_FLAVOR_LEN)
 	all_quirks = SANITIZE_LIST(all_quirks)

+	for(var/V in all_quirks) // quirk migration
+		switch(V)
+			if("Acute hepatic pharmacokinesis")
+				DISABLE_BITFIELD(cit_toggles, PENIS_ENLARGEMENT)
+				DISABLE_BITFIELD(cit_toggles, BREAST_ENLARGEMENT)
+				ENABLE_BITFIELD(cit_toggles,FORCED_FEM)
+				ENABLE_BITFIELD(cit_toggles,FORCED_MASC)
+				all_quirks -= V
+			if("Crocin Immunity")
+				ENABLE_BITFIELD(cit_toggles,NO_APHRO)
+				all_quirks -= V
+			if("Buns of Steel")
+				ENABLE_BITFIELD(cit_toggles,NO_ASS_SLAP)
+				all_quirks -= V
+
 	cit_character_pref_load(S)

 	return 1
@@ -12,7 +12,7 @@
 	var/removeDontImproveChance = 10 //chance the randomly created law replaces a random law instead of simply being added
 	var/shuffleLawsChance = 10 //chance the AI's laws are shuffled afterwards
 	var/botEmagChance = 10
-	var/announceEvent = ION_RANDOM // -1 means don't announce, 0 means have it randomly announce, 1 means it is announced
+	var/announceEvent = 1 // -1 means don't announce, 0 means have it randomly announce, 1 means it is announced
 	var/ionMessage = null
 	var/ionAnnounceChance = 33
 	announceWhen	= 1
@@ -152,10 +152,10 @@
 		adjust_item_drop_location(O)


-/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)
+/obj/machinery/smartfridge/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_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()

@@ -448,7 +448,7 @@ Since Ramadan is an entire month that lasts 29.5 days on average, the start and
 	return FALSE

 /datum/holiday/ramadan/getStationPrefix()
-	return pick("Harm","Halaal","Jihad","Muslim")
+	return pick("Fasting","Enlightenment","Prayer","Muslim")

 /datum/holiday/ramadan/end
 	name = "End of Ramadan"
@@ -78,10 +78,10 @@
 	. = ..()
 	toggle_power(!stat)

-/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)
+/obj/machinery/computer/holodeck/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_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)
@@ -8,10 +8,10 @@
 	language_holder = null
 	. = ..()

-/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)
+/datum/language_menu/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_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)
@@ -96,10 +96,10 @@
 	return currentSection != oldSection

 /obj/item/book/codex_gigas/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)
+									datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_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)
@@ -206,10 +206,10 @@
 /obj/structure/chisel_message/interact()
 	return

-/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)
+/obj/structure/chisel_message/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_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)
@@ -33,10 +33,10 @@ GLOBAL_LIST(labor_sheet_values)
 	return a["value"] - b["value"]

 /obj/machinery/mineral/labor_claim_console/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)
+									datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_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, 315, 430, master_ui, state)
 		ui.open()

 /obj/machinery/mineral/labor_claim_console/ui_data(mob/user)
@@ -189,10 +189,10 @@
 		to_chat(user, "<span class='notice'>You change [src]'s I/O settings, setting the input to [dir2text(input_dir)] and the output to [dir2text(output_dir)].</span>")
 		return TRUE

-/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)
+/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/tgui_state/state = GLOB.tgui_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)
@@ -55,10 +55,10 @@
 			drop = drop_location()

 /obj/structure/ore_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)
+									datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_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, 335, 415, master_ui, state)
 		ui.open()

 /obj/structure/ore_box/ui_data()
@@ -472,19 +472,6 @@
 	icon_state = "hair_tailhair"
 	ckeys_allowed = list("quotefox")

-/datum/sprite_accessory/hair/mommy
-	name = "(Hyper) Hairfre"
-	icon_state = "hair_hairfre"
-
-/datum/sprite_accessory/hair/sidehair
-	name = "(Hyper) Side Hair"
-	icon_state = "hair_tailhair2"
-	ckeys_allowed = list("quotefox")
-
-/datum/sprite_accessory/hair/curtains
-	name = "(Hyper) Curtains"
-	icon_state = "hair_curtains"
-
 /datum/sprite_accessory/hair_gradient
 	icon = 'icons/mob/hair_gradients.dmi'

@@ -540,14 +540,6 @@
 	name = "Axolotl"
 	icon_state = "axolotl"

-/datum/sprite_accessory/mam_tails/bee
-	name = "Bee"
-	icon_state = "bee"
-
-/datum/sprite_accessory/mam_tails_animated/bee
-	name = "Bee"
-	icon_state = "bee"
-
 /datum/sprite_accessory/mam_tails/cat
 	name = "Cat"
 	icon_state = "cat"
@@ -648,14 +640,6 @@
 	name = "Husky"
 	icon_state = "husky"

-datum/sprite_accessory/mam_tails/insect
-	name = "Insect"
-	icon_state = "insect"
-
-/datum/sprite_accessory/mam_tails_animated/insect
-	name = "Insect"
-	icon_state = "insect"
-
 /datum/sprite_accessory/mam_tails/kangaroo
 	name = "kangaroo"
 	icon_state = "kangaroo"
@@ -21,10 +21,10 @@
 	else
 		src.user = user

-/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)
+/datum/notificationpanel/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_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)
@@ -113,7 +113,6 @@
 /mob/proc/is_holding(obj/item/I)
 	return get_held_index_of_item(I)

-
 //Checks if we're holding an item of type: typepath
 /mob/proc/is_holding_item_of_type(typepath)
 	for(var/obj/item/I in held_items)
@@ -315,7 +315,8 @@
 				else if (mood.sanity >= SANITY_DISTURBED)
 					SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "friendly_hug", /datum/mood_event/betterhug, M)
 			
-			if(HAS_TRAIT(H, TRAIT_DISTANT))
+			if(H.client?.prefs.cit_toggles & NO_AUTO_WAG) //if they don't wanna wag
+				playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) //so the sound plays as expected
 				return
 			else if(H.dna.species.can_wag_tail(H))
 				if("tail_human" in pref_species.default_features)
@@ -40,7 +40,6 @@
 					update_damage_overlays()
 			else
 				adjustStaminaLoss(damage * hit_percent)
-		//citadel code
 		if(AROUSAL)
 			adjustArousalLoss(damage * hit_percent)
 	return TRUE
@@ -62,7 +61,6 @@
 		amount += BP.burn_dam
 	return amount

-
 /mob/living/carbon/adjustBruteLoss(amount, updating_health = TRUE, forced = FALSE)
 	if (!forced && amount < 0 && HAS_TRAIT(src,TRAIT_NONATURALHEAL))
 		return FALSE
@@ -127,14 +127,15 @@
 			. += "<span class='love'>[t_He] [t_is] currently in heat.</span>"

 	//CIT CHANGES START HERE - adds genital details to examine text
-	if(LAZYLEN(internal_organs))
+	if(LAZYLEN(internal_organs) && user.client?.prefs.cit_toggles & GENITAL_EXAMINE)
 		for(var/obj/item/organ/genital/dicc in internal_organs)
 			if(istype(dicc) && dicc.is_exposed())
 				. += "[dicc.desc]"

-	var/cursed_stuff = attempt_vr(src,"examine_bellies",args) //vore Code
-	if(!isnull(cursed_stuff))
-		. += cursed_stuff
+	if(user.client?.prefs.cit_toggles & VORE_EXAMINE)
+		var/cursed_stuff = attempt_vr(src,"examine_bellies",args) //vore Code
+		if(cursed_stuff)
+			. += cursed_stuff
 //END OF CIT CHANGES

 	//Jitters
@@ -331,7 +332,7 @@
 	var/obj/item/organ/vocal_cords/Vc = user.getorganslot(ORGAN_SLOT_VOICE)
 	if(Vc)
 		if(istype(Vc, /obj/item/organ/vocal_cords/velvet))
-			if(client?.prefs.lewdchem)
+			if(client?.prefs.cit_toggles & HYPNO)
 				msg += "<span class='velvet'><i>You feel your chords resonate looking at them.</i></span>\n"


@@ -729,8 +729,19 @@
 	remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, "#000000")
 	cut_overlay(MA)

+//medical scan animation
+/mob/living/carbon/human/proc/scan_animation()
+	var/mutable_appearance/scan_anim
+	scan_anim = mutable_appearance(icon, "mediscan")
+	add_overlay(scan_anim)
+	addtimer(CALLBACK(src, .proc/end_scan_animation, scan_anim), 10)
+	flick(icon,src)
+
+/mob/living/carbon/human/proc/end_scan_animation(mutable_appearance/MA)
+	cut_overlay(MA)
+
 /mob/living/carbon/human/canUseTopic(atom/movable/M, be_close=FALSE, no_dextery=FALSE, no_tk=FALSE)
-	if(incapacitated() || lying )
+	if(incapacitated())
 		to_chat(src, "<span class='warning'>You can't do that right now!</span>")
 		return FALSE
 	if(!Adjacent(M) && (M.loc != src))
@@ -1612,6 +1612,20 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 		user.adjustStaminaLossBuffered(3)
 		return FALSE
 	else if(aim_for_groin && (target == user || target.lying || same_dir) && (target_on_help || target_restrained || target_aiming_for_groin))
+		if(target.client?.prefs.cit_toggles & NO_ASS_SLAP)
+			if(HAS_TRAIT(target, TRAIT_ASSBLASTUSA)) //is their ass ROCK HARD?
+				var/hit_zone = (user.held_index_to_dir(user.active_hand_index) == "l" ? "l_":"r_") + "arm"
+				user.adjustStaminaLoss(20, affected_zone = hit_zone)
+				user.visible_message(\
+					"<span class='danger'>\The [user] slaps \the [target]'s ass, but their hand bounces off like they hit metal!</span>",\
+					"<span class='danger'>You slap [user == target ? "your" : "\the [target]'s"] ass, but feel an intense amount of pain as you realise their buns are harder than steel!</span>",\
+					"You hear a slap."
+				)
+				playsound(target.loc, 'sound/weapons/tap.ogg', 50, 1, -1)
+				user.emote("scream")
+				return FALSE
+			to_chat(user,"A force stays your hand, preventing you from slapping \the [target]'s ass!")
+			return FALSE
 		user.do_attack_animation(target, ATTACK_EFFECT_ASS_SLAP)
 		user.adjustStaminaLossBuffered(3)
 		if(HAS_TRAIT(target, TRAIT_ASSBLASTUSA))
@@ -1625,7 +1639,6 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 			playsound(target.loc, 'sound/weapons/tap.ogg', 50, 1, -1)
 			user.emote("scream")
 			return FALSE
-
 		playsound(target.loc, 'sound/weapons/slap.ogg', 50, 1, -1)
 		user.visible_message(\
 			"<span class='danger'>\The [user] slaps \the [target]'s ass!</span>",\
@@ -270,11 +270,11 @@
 	else
 		ui_interact(owner)

-/datum/action/innate/swap_body/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)
+/datum/action/innate/swap_body/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_always_state)

 	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)
@@ -57,7 +57,6 @@
 		if(STAMINA)
 			return getStaminaLoss()

-
 /mob/living/proc/apply_damages(brute = 0, burn = 0, tox = 0, oxy = 0, clone = 0, def_zone = null, blocked = FALSE, stamina = 0, brain = 0)
 	if(blocked >= 100)
 		return 0
@@ -230,6 +229,9 @@
 /mob/living/proc/setStaminaLoss(amount, updating_stamina = TRUE, forced = FALSE)
 	return

+/mob/living/proc/adjustPainLoss(amount, updating_health = TRUE, forced = FALSE)
+	return
+
 // heal ONE external organ, organ gets randomly selected from damaged ones.
 /mob/living/proc/heal_bodypart_damage(brute = 0, burn = 0, stamina = 0, updating_health = TRUE)
 	adjustBruteLoss(-brute, FALSE) //zero as argument for no instant health update
@@ -160,15 +160,6 @@
 	emote_type = EMOTE_AUDIBLE
 	stat_allowed = UNCONSCIOUS

-/datum/emote/living/gasp/run_emote(mob/user, params)
-	. = ..()
-	if(. && ishuman(user))
-		var/mob/living/carbon/C = user
-		if(user.gender == FEMALE)
-			playsound(C, pick('hyperstation/sound/voice/emotes/gasp_female1.ogg', 'hyperstation/sound/voice/emotes/gasp_female2.ogg', 'hyperstation/sound/voice/emotes/gasp_female3.ogg', 'hyperstation/sound/voice/emotes/gasp_female4.ogg', 'hyperstation/sound/voice/emotes/gasp_female5.ogg', 'hyperstation/sound/voice/emotes/gasp_female6.ogg', 'hyperstation/sound/voice/emotes/gasp_female7.ogg'), 50, 1)
-		else
-			playsound(C, pick('hyperstation/sound/voice/emotes/gasp_male1.ogg', 'hyperstation/sound/voice/emotes/gasp_male2.ogg', 'hyperstation/sound/voice/emotes/gasp_male3.ogg', 'hyperstation/sound/voice/emotes/gasp_male4.ogg', 'hyperstation/sound/voice/emotes/gasp_male5.ogg', 'hyperstation/sound/voice/emotes/gasp_male6.ogg', 'hyperstation/sound/voice/emotes/gasp_male7.ogg'), 50, 1)
-
 /datum/emote/living/giggle
 	key = "giggle"
 	key_third_person = "giggles"
@@ -176,17 +167,6 @@
 	message_mime = "giggles silently!"
 	emote_type = EMOTE_AUDIBLE

-/datum/emote/living/giggle/run_emote(mob/user, params)
-	. = ..()
-	if(. && ishuman(user))
-		var/mob/living/carbon/C = user
-		if(!C.mind || C.mind.miming)
-			return
-		if(user.gender == FEMALE)
-			playsound(C, pick('hyperstation/sound/voice/emotes/female_giggle1.ogg', 'hyperstation/sound/voice/emotes/female_giggle2.ogg'), 50, 1)
-		else
-			playsound(C, pick('hyperstation/sound/voice/emotes/male_laugh3b.ogg'), 50, 1)
-
 /datum/emote/living/glare
 	key = "glare"
 	key_third_person = "glares"
@@ -249,11 +229,6 @@
 			'sound/voice/catpeople/nyahehe.ogg'),
 			50, 1)
 			return
-		if(ishumanbasic(C))
-			if(user.gender == FEMALE)
-				playsound(C, pick('hyperstation/sound/voice/emotes/female_laugh1.ogg', 'hyperstation/sound/voice/emotes/female_laugh2.ogg', 'hyperstation/sound/voice/emotes/female_laugh3.ogg', 'hyperstation/sound/voice/emotes/female_laugh4.ogg'), 50, 1)
-			else
-				playsound(C, pick('hyperstation/sound/voice/emotes/male_laugh1.ogg', 'hyperstation/sound/voice/emotes/male_laugh1b.ogg', 'hyperstation/sound/voice/emotes/male_laugh2.ogg', 'hyperstation/sound/voice/emotes/male_laugh2b.ogg',/*'hyperstation/sound/voice/emotes/male_laugh3.ogg',*/'hyperstation/sound/voice/emotes/male_laugh3b.ogg', 'hyperstation/sound/voice/emotes/male_laugh4.ogg'), 50, 1)

 /datum/emote/living/look
 	key = "look"
@@ -330,11 +305,6 @@
 		var/mob/living/carbon/C = user
 		if(!C.mind || C.mind.miming)
 			return
-		if(ishumanbasic(C))
-			if(user.gender == FEMALE)
-				playsound(C, pick('hyperstation/sound/voice/emotes/sigh_female.ogg'), 50, 1)
-			else
-				playsound(C, pick('hyperstation/sound/voice/emotes/sigh_male.ogg'), 50, 1)

 /datum/emote/living/sit
 	key = "sit"
@@ -364,11 +334,6 @@
 		var/mob/living/carbon/C = user
 		if(!C.mind || C.mind.miming)//mimes can't sneeze because fuck you that's why
 			return
-		if(ishumanbasic(C))
-			if(user.gender == FEMALE)
-				playsound(C, pick('hyperstation/sound/voice/emotes/sneezef1.ogg', 'hyperstation/sound/voice/emotes/sneezef2.ogg'), 50, 1)
-			else
-				playsound(C, pick('hyperstation/sound/voice/emotes/sneezem1.ogg', 'hyperstation/sound/voice/emotes/sneezem2.ogg'), 50, 1)

 /datum/emote/living/smug
 	key = "smug"
@@ -462,11 +427,6 @@
 		var/mob/living/carbon/C = user
 		if(!C.mind || C.mind.miming)
 			return
-		if(ishumanbasic(C))
-			if(user.gender == FEMALE)
-				playsound(C, pick('hyperstation/sound/voice/emotes/whimper_female1.ogg', 'hyperstation/sound/voice/emotes/whimper_female2.ogg', 'hyperstation/sound/voice/emotes/whimper_female3.ogg'), 50, 1)
-			else
-				playsound(C, pick('hyperstation/sound/voice/emotes/whimper_male1.ogg', 'hyperstation/sound/voice/emotes/whimper_male2.ogg', 'hyperstation/sound/voice/emotes/whimper_male3.ogg'), 50, 1)

 /datum/emote/living/wsmile
 	key = "wsmile"
@@ -485,11 +445,6 @@
 		var/mob/living/carbon/C = user
 		if(!C.mind || C.mind.miming)
 			return
-		if(ishumanbasic(C))
-			if(user.gender == FEMALE)
-				playsound(C, pick('hyperstation/sound/voice/emotes/female_yawn1.ogg', 'hyperstation/sound/voice/emotes/female_yawn2.ogg', 'hyperstation/sound/voice/emotes/female_yawn3.ogg'), 50, 1)
-			else
-				playsound(C, pick('hyperstation/sound/voice/emotes/male_yawn1.ogg', 'hyperstation/sound/voice/emotes/male_yawn2.ogg'), 50, 1)

 /datum/emote/living/custom
 	key = "me"
@@ -502,6 +502,10 @@
 				var/obj/effect/proc_holder/spell/spell = S
 				spell.updateButtonIcon()

+		if(iscarbon(src)) //pain cooldown
+			var/mob/living/carbon/C = src
+			C.pain_cooldown = 20
+
 //proc used to completely heal a mob.
 /mob/living/proc/fully_heal(admin_revive = 0)
 	restore_blood()
@@ -542,6 +546,13 @@
 			for(var/organ in C.internal_organs)
 				var/obj/item/organ/O = organ
 				O.setOrganDamage(0)
+	//Heal pain
+	if(iscarbon(src))
+		var/mob/living/carbon/C = src
+		for(var/obj/item/bodypart/X in C.bodyparts)
+			X.pain_dam = 0
+
+
 	SEND_SIGNAL(src, COMSIG_LIVING_FULLY_HEAL, admin_revive)

 //fuck shitcode I hate shitcode
@@ -1086,7 +1097,11 @@
 		lying = 90*buckle_lying
 	else if(!lying)
 		if(resting)
-			lying = pick(90, 270) // Cit change - makes resting not force you to drop your held items
+			if(dir == 2 || dir == 4)
+				lying = 90
+			else
+				lying = 270
+
 			if(has_gravity()) // Cit change - Ditto
 				playsound(src, "bodyfall", 50, 1) // Cit change - Ditto!
 		else if(ko || move_and_fall || (!has_legs && !ignore_legs) || chokehold)
@@ -151,7 +151,7 @@
 				to_chat(src, "Receiving control information from APC.")
 				sleep(2)
 				apc_override = 1
-				theAPC.ui_interact(src, state = GLOB.conscious_state)
+				theAPC.ui_interact(src, state = GLOB.tgui_conscious_state)
 				apc_override = 0
 				aiRestorePowerRoutine = POWER_RESTORATION_APC_FOUND
 		sleep(50)
@@ -25,8 +25,7 @@
 		disabler = FALSE
 		update_icons() //PUT THE GUN AWAY
 	else if(istype(O,/obj/item/dogborg/sleeper))
-		sleeper_g = FALSE
-		sleeper_r = FALSE
+		sleeper_state = BORGBELLY_NONE
 		update_icons()
 		var/obj/item/dogborg/sleeper/S = O
 		S.go_out() //this should stop edgecase deletions
@@ -654,10 +654,14 @@
 	if(disabler)
 		add_overlay("disabler")//ditto

-	if(sleeper_g && module.sleeper_overlay)
-		add_overlay("[module.sleeper_overlay]_g[sleeper_nv ? "_nv" : ""]")
-	if(sleeper_r && module.sleeper_overlay)
-		add_overlay("[module.sleeper_overlay]_r[sleeper_nv ? "_nv" : ""]")
+	if(module.sleeper_overlay)
+		var/sleeper_overlay_state = ""
+		switch(sleeper_state)
+			if(BORGBELLY_NONE) sleeper_overlay_state = ""
+			if(BORGBELLY_GREEN) sleeper_overlay_state = "_g"
+			if(BORGBELLY_RED) sleeper_overlay_state = "_r"
+		add_overlay("[module.sleeper_overlay][sleeper_overlay_state]")
+	
 	if(module.dogborg == TRUE)
 		if(resting)
 			cut_overlays()
@@ -170,10 +170,10 @@
 		ui_interact(user)

 /mob/living/simple_animal/bot/mulebot/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)
+										datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_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)
@@ -3,7 +3,7 @@
 	ui_interact(user)

 // Operates TGUI
-/obj/item/modular_computer/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)
+/obj/item/modular_computer/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
 	if(!enabled)
 		if(ui)
 			ui.close()
@@ -38,8 +38,8 @@
 		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")
+		ui = new(user, src, ui_key, "NtosMain", "NtOS Main menu", 400, 500, master_ui, state)
+		// ui.set_style("ntos")
 		ui.open()
 		ui.set_autoupdate(state = 1)

@@ -138,7 +138,7 @@
 	return TRUE


-/datum/computer_file/program/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)
+/datum/computer_file/program/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui && tgui_id)
 		var/datum/asset/assets = get_asset_datum(/datum/asset/simple/headers)
@@ -146,8 +146,8 @@

 		ui = new(user, src, ui_key, tgui_id, filedesc, ui_x, ui_y, state = state)

-		if(ui_style)
-			ui.set_style(ui_style)
+		// if(ui_style)
+			// ui.set_style(ui_style)
 		ui.set_autoupdate(state = 1)
 		ui.open()

@@ -8,7 +8,7 @@
 	usage_flags = PROGRAM_CONSOLE
 	transfer_access = ACCESS_HEADS
 	available_on_ntnet = 1
-	tgui_id = "ntos_ai_restorer"
+	tgui_id = "NtosAiRestorer"
 	ui_x = 600
 	ui_y = 400

@@ -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

@@ -7,7 +7,7 @@
 	requires_ntnet = 1
 	available_on_ntnet = 0
 	available_on_syndinet = 1
-	tgui_id = "ntos_net_dos"
+	tgui_id = "NtosNetDos"
 	ui_style = "syndicate"
 	ui_x = 400
 	ui_y = 250
@@ -80,17 +80,8 @@
 	else if(target && executed)
 		data["target"] = 1
 		data["speed"] = dos_speed
-
-		// This is mostly visual, generate some strings of 1s and 0s
-		// Probability of 1 is equal of completion percentage of DoS attack on this relay.
-		// Combined with UI updates this adds quite nice effect to the UI
-		var/percentage = target.dos_overload * 100 / target.dos_capacity
-		data["dos_strings"] = list()
-		for(var/j, j<10, j++)
-			var/string = ""
-			for(var/i, i<20, i++)
-				string = "[string][prob(percentage)]"
-			data["dos_strings"] += list(list("nums" = string))
+		data["overload"] = target.dos_overload
+		data["capacity"] = target.dos_capacity
 	else
 		data["relays"] = list()
 		for(var/obj/machinery/ntnet_relay/R in SSnetworks.station_network.relays)
@@ -7,7 +7,7 @@
 	requires_ntnet = 0
 	available_on_ntnet = 0
 	available_on_syndinet = 1
-	tgui_id = "ntos_revelation"
+	tgui_id = "NtosRevelation"
 	ui_style = "syndicate"
 	ui_x = 400
 	ui_y = 250
@@ -6,7 +6,7 @@
 	transfer_access = ACCESS_HEADS
 	requires_ntnet = 0
 	size = 8
-	tgui_id = "ntos_card"
+	tgui_id = "NtosCard"
 	ui_x = 600
 	ui_y = 700

@@ -15,7 +15,7 @@
 	var/show_assignments = 0
 	var/minor = 0
 	var/authenticated = 0
-	var/list/reg_ids = list()
+	var/reg_ids = 1
 	var/list/region_access = null
 	var/list/head_subordinates = null
 	var/target_dept = 0 //Which department this computer has access to. 0=all departments
@@ -94,6 +94,134 @@

 	return formatted

+
+/datum/computer_file/program/card_mod/ui_data(mob/user)
+	var/list/data = get_header_data()
+
+	var/obj/item/computer_hardware/card_slot/card_slot
+	var/obj/item/computer_hardware/printer/printer
+
+	if(computer)
+		card_slot = computer.all_components[MC_CARD]
+		printer = computer.all_components[MC_PRINT]
+
+	data["mmode"] = mod_mode
+
+	var/authed = 0
+	if(computer)
+		if(card_slot)
+			var/obj/item/card/id/auth_card = card_slot.stored_card2
+			data["auth_name"] = auth_card ? strip_html_simple(auth_card.name) : "-----"
+			authed = authorized()
+
+
+	if(mod_mode == 2)
+		data["slots"] = list()
+		var/list/pos = list()
+		for(var/datum/job/job in SSjob.occupations)
+			if(job.title in blacklisted)
+				continue
+
+			var/list/status_open = build_manage(job,1)
+			var/list/status_close = build_manage(job,0)
+
+			pos.Add(list(list(
+				"title" = job.title,
+				"current" = job.current_positions,
+				"total" = job.total_positions,
+				"status_open" = (authed && !minor) ? status_open["enable"]: 0,
+				"status_close" = (authed && !minor) ? status_close["enable"] : 0,
+				"desc_open" = status_open["desc"],
+				"desc_close" = status_close["desc"])))
+		data["slots"] = pos
+
+	data["src"] = "[REF(src)]"
+
+
+	if(!mod_mode)
+		data["manifest"] = list()
+		var/list/crew = list()
+		for(var/datum/data/record/t in sortRecord(GLOB.data_core.general))
+			crew.Add(list(list(
+				"name" = t.fields["name"],
+				"rank" = t.fields["rank"])))
+
+		data["manifest"] = crew
+	data["assignments"] = show_assignments
+	if(computer)
+		data["have_id_slot"] = !!card_slot
+		data["have_printer"] = !!printer
+		if(!card_slot && mod_mode == 1)
+			mod_mode = 0 //We can't modify IDs when there is no card reader
+	else
+		data["have_id_slot"] = 0
+		data["have_printer"] = 0
+	
+	data["authenticated"] = authed
+
+	if(mod_mode == 1 && computer)
+		if(card_slot)
+			var/obj/item/card/id/id_card = card_slot.stored_card
+
+			data["has_id"] = !!id_card
+			data["id_rank"] = id_card && id_card.assignment ? html_encode(id_card.assignment) : "Unassigned"
+			data["id_owner"] = id_card && id_card.registered_name ? html_encode(id_card.registered_name) : "-----"
+			data["id_name"] = id_card ? strip_html_simple(id_card.name) : "-----"
+
+		if(card_slot.stored_card)
+			var/obj/item/card/id/id_card = card_slot.stored_card
+					
+			if(is_centcom)
+				var/list/all_centcom_access = list()
+				for(var/access in get_all_centcom_access())
+					all_centcom_access.Add(list(list(
+						"desc" = replacetext(get_centcom_access_desc(access), "&nbsp", " "),
+						"ref" = access,
+						"allowed" = (access in id_card.access) ? 1 : 0)))
+				data["all_centcom_access"] = all_centcom_access
+			else
+				var/list/accesses = list()
+				for(var/access in get_region_accesses(reg_ids))
+					if (get_access_desc(access))
+						accesses.Add(list(list(
+						"desc" = replacetext(get_access_desc(access), "&nbsp", " "),
+						"ref" = access,
+						"allowed" = (access in id_card.access) ? 1 : 0)))
+
+				var/list/regions = list()
+				for(var/i = 1; i <= 7; i++)
+					if((minor || target_dept) && !(i in region_access))
+						continue
+
+					regions.Add(list(list(
+						"name" = get_region_accesses_name(i),
+						"regid" = i,
+						"selected" = (reg_ids == i) ? 1 : null,
+						"accesses" = (reg_ids == i) ? accesses : null)))
+				data["regions"] = regions
+
+	return data
+
+
+/datum/computer_file/program/card_mod/ui_static_data(mob/user)
+	var/list/data = list()
+
+	data["station_name"] = station_name()
+	data["centcom_access"] = is_centcom
+	data["minor"] = target_dept || minor ? TRUE : FALSE
+
+	if(authenticated)
+		data["engineering_jobs"] = format_jobs(GLOB.engineering_positions)
+		data["medical_jobs"] = format_jobs(GLOB.medical_positions)
+		data["science_jobs"] = format_jobs(GLOB.science_positions)
+		data["security_jobs"] = format_jobs(GLOB.security_positions)
+		data["cargo_jobs"] = format_jobs(GLOB.supply_positions)
+		data["civilian_jobs"] = format_jobs(GLOB.civilian_positions)
+		data["centcom_jobs"] = format_jobs(get_all_centcom_jobs())
+
+	return data
+
+
 /datum/computer_file/program/card_mod/ui_act(action, params)
 	if(..())
 		return 1
@@ -127,11 +255,6 @@
 				mod_mode = 0
 			else if (params["target"] == "manage")
 				mod_mode = 2
-		if("PRG_togglea")
-			if(show_assignments)
-				show_assignments = 0
-			else
-				show_assignments = 1
 		if("PRG_print")
 			if(computer && printer) //This option should never be called if there is no printer
 				if(mod_mode)
@@ -270,13 +393,8 @@
 			j.total_positions--
 			opened_positions[edit_job_target]--
 		if("PRG_regsel")
-			if(!reg_ids)
-				reg_ids = list()
 			var/regsel = text2num(params["region"])
-			if(regsel in reg_ids)
-				reg_ids -= regsel
-			else
-				reg_ids += regsel
+			reg_ids = regsel

 	if(id_card)
 		id_card.name = text("[id_card.registered_name]'s ID Card ([id_card.assignment])")
@@ -290,133 +408,6 @@
 /datum/computer_file/program/card_mod/proc/apply_access(obj/item/card/id/id_card, list/accesses)
 	id_card.access |= accesses

-/datum/computer_file/program/card_mod/ui_data(mob/user)
-
-	var/list/data = get_header_data()
-
-	var/obj/item/computer_hardware/card_slot/card_slot
-	var/obj/item/computer_hardware/printer/printer
-
-	if(computer)
-		card_slot = computer.all_components[MC_CARD]
-		printer = computer.all_components[MC_PRINT]
-
-	data["mmode"] = mod_mode
-
-	var/authed = 0
-	if(computer)
-		if(card_slot)
-			var/obj/item/card/id/auth_card = card_slot.stored_card2
-			data["auth_name"] = auth_card ? strip_html_simple(auth_card.name) : "-----"
-			authed = authorized()
-
-
-	if(mod_mode == 2)
-		data["slots"] = list()
-		var/list/pos = list()
-		for(var/datum/job/job in SSjob.occupations)
-			if(job.title in blacklisted)
-				continue
-
-			var/list/status_open = build_manage(job,1)
-			var/list/status_close = build_manage(job,0)
-
-			pos.Add(list(list(
-				"title" = job.title,
-				"current" = job.current_positions,
-				"total" = job.total_positions,
-				"status_open" = (authed && !minor) ? status_open["enable"]: 0,
-				"status_close" = (authed && !minor) ? status_close["enable"] : 0,
-				"desc_open" = status_open["desc"],
-				"desc_close" = status_close["desc"])))
-		data["slots"] = pos
-
-	data["src"] = "[REF(src)]"
-	data["station_name"] = station_name()
-
-
-	if(!mod_mode)
-		data["manifest"] = list()
-		var/list/crew = list()
-		for(var/datum/data/record/t in sortRecord(GLOB.data_core.general))
-			crew.Add(list(list(
-				"name" = t.fields["name"],
-				"rank" = t.fields["rank"])))
-
-		data["manifest"] = crew
-	data["assignments"] = show_assignments
-	if(computer)
-		data["have_id_slot"] = !!card_slot
-		data["have_printer"] = !!printer
-		if(!card_slot && mod_mode == 1)
-			mod_mode = 0 //We can't modify IDs when there is no card reader
-	else
-		data["have_id_slot"] = 0
-		data["have_printer"] = 0
-
-	data["centcom_access"] = is_centcom
-
-
-	data["authenticated"] = authed
-
-
-	if(mod_mode == 1 && computer)
-		if(card_slot)
-			var/obj/item/card/id/id_card = card_slot.stored_card
-
-			data["has_id"] = !!id_card
-			data["id_rank"] = id_card && id_card.assignment ? html_encode(id_card.assignment) : "Unassigned"
-			data["id_owner"] = id_card && id_card.registered_name ? html_encode(id_card.registered_name) : "-----"
-			data["id_name"] = id_card ? strip_html_simple(id_card.name) : "-----"
-
-			if(show_assignments)
-				data["engineering_jobs"] = format_jobs(GLOB.engineering_positions)
-				data["medical_jobs"] = format_jobs(GLOB.medical_positions)
-				data["science_jobs"] = format_jobs(GLOB.science_positions)
-				data["security_jobs"] = format_jobs(GLOB.security_positions)
-				data["cargo_jobs"] = format_jobs(GLOB.supply_positions)
-				data["civilian_jobs"] = format_jobs(GLOB.civilian_positions)
-				data["centcom_jobs"] = format_jobs(get_all_centcom_jobs())
-
-
-		if(card_slot.stored_card)
-			var/obj/item/card/id/id_card = card_slot.stored_card
-			if(is_centcom)
-				var/list/all_centcom_access = list()
-				for(var/access in get_all_centcom_access())
-					all_centcom_access.Add(list(list(
-						"desc" = replacetext(get_centcom_access_desc(access), "&nbsp", " "),
-						"ref" = access,
-						"allowed" = (access in id_card.access) ? 1 : 0)))
-				data["all_centcom_access"] = all_centcom_access
-			else
-				var/list/regions = list()
-				for(var/i = 1; i <= 7; i++)
-					if((minor || target_dept) && !(i in region_access))
-						continue
-
-					var/list/accesses = list()
-					if(i in reg_ids)
-						for(var/access in get_region_accesses(i))
-							if (get_access_desc(access))
-								accesses.Add(list(list(
-								"desc" = replacetext(get_access_desc(access), "&nbsp", " "),
-								"ref" = access,
-								"allowed" = (access in id_card.access) ? 1 : 0)))
-
-					regions.Add(list(list(
-						"name" = get_region_accesses_name(i),
-						"regid" = i,
-						"selected" = (i in reg_ids) ? 1 : null,
-						"accesses" = accesses)))
-				data["regions"] = regions
-
-	data["minor"] = target_dept || minor ? 1 : 0
-
-
-	return data
-
-
 /datum/computer_file/program/card_mod/proc/build_manage(datum/job,open = FALSE)
 	var/out = "Denied"
 	var/can_change= 0
@@ -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

@@ -7,10 +7,7 @@
 	requires_ntnet = 0
 	available_on_ntnet = 0
 	undeletable = 1
-	tgui_id = "ntos_file_manager"
-
-	var/open_file
-	var/error
+	tgui_id = "NtosFileManager"

 /datum/computer_file/program/filemanager/ui_act(action, params)
 	if(..())
@@ -18,23 +15,8 @@

 	var/obj/item/computer_hardware/hard_drive/HDD = computer.all_components[MC_HDD]
 	var/obj/item/computer_hardware/hard_drive/RHDD = computer.all_components[MC_SDD]
-	var/obj/item/computer_hardware/printer/printer = computer.all_components[MC_PRINT]

 	switch(action)
-		if("PRG_openfile")
-			. = 1
-			open_file = params["name"]
-		if("PRG_newtextfile")
-			. = 1
-			var/newname = stripped_input(usr, "Enter file name or leave blank to cancel:", "File rename", max_length=50)
-			if(!newname)
-				return 1
-			if(!HDD)
-				return 1
-			var/datum/computer_file/data/F = new/datum/computer_file/data()
-			F.filename = newname
-			F.filetype = "TXT"
-			HDD.store_file(F)
 		if("PRG_deletefile")
 			. = 1
 			if(!HDD)
@@ -51,19 +33,6 @@
 			if(!file || file.undeletable)
 				return 1
 			RHDD.remove_file(file)
-		if("PRG_closefile")
-			. = 1
-			open_file = null
-			error = null
-		if("PRG_clone")
-			. = 1
-			if(!HDD)
-				return 1
-			var/datum/computer_file/F = HDD.find_file_by_name(params["name"])
-			if(!F || !istype(F))
-				return 1
-			var/datum/computer_file/C = F.clone(1)
-			HDD.store_file(C)
 		if("PRG_rename")
 			. = 1
 			if(!HDD)
@@ -74,47 +43,15 @@
 			var/newname = stripped_input(usr, "Enter new file name:", "File rename", file.filename, max_length=50)
 			if(file && newname)
 				file.filename = newname
-		if("PRG_edit")
-			. = 1
-			if(!open_file)
+		if("PRG_usbrenamefile")
+			if(!RHDD)
 				return 1
-			if(!HDD)
-				return 1
-			var/datum/computer_file/data/F = HDD.find_file_by_name(open_file)
-			if(!F || !istype(F))
-				return 1
-			if(F.do_not_edit && (alert("WARNING: This file is not compatible with editor. Editing it may result in permanently corrupted formatting or damaged data consistency. Edit anyway?", "Incompatible File", "No", "Yes") == "No"))
-				return 1
-			// 16384 is the limit for file length in characters. Currently, papers have value of 2048 so this is 8 times as long, since we can't edit parts of the file independently.
-			var/newtext = stripped_multiline_input(usr, "Editing file [open_file]. You may use most tags used in paper formatting:", "Text Editor", html_decode(F.stored_data), 16384, TRUE)
-			if(!newtext)
-				return
-			if(F)
-				var/datum/computer_file/data/backup = F.clone()
-				HDD.remove_file(F)
-				F.stored_data = newtext
-				F.calculate_size()
-				// We can't store the updated file, it's probably too large. Print an error and restore backed up version.
-				// This is mostly intended to prevent people from losing texts they spent lot of time working on due to running out of space.
-				// They will be able to copy-paste the text from error screen and store it in notepad or something.
-				if(!HDD.store_file(F))
-					error = "I/O error: Unable to overwrite file. Hard drive is probably full. You may want to backup your changes before closing this window:<br><br>[F.stored_data]<br><br>"
-					HDD.store_file(backup)
-		if("PRG_printfile")
-			. = 1
-			if(!open_file)
-				return 1
-			if(!HDD)
-				return 1
-			var/datum/computer_file/data/F = HDD.find_file_by_name(open_file)
-			if(!F || !istype(F))
-				return 1
-			if(!printer)
-				error = "Missing Hardware: Your computer does not have required hardware to complete this operation."
-				return 1
-			if(!printer.print_text("<font face=\"[(computer.obj_flags & EMAGGED) ? CRAYON_FONT : PRINTER_FONT]\">" + prepare_printjob(F.stored_data) + "</font>", open_file))
-				error = "Hardware error: Printer was unable to print the file. It may be out of paper."
+			var/datum/computer_file/file = RHDD.find_file_by_name(params["name"])
+			if(!file || !istype(file))
 				return 1
+			var/newname = stripped_input(usr, "Enter new file name:", "File rename", file.filename, max_length=50)
+			if(file && newname)
+				file.filename = newname
 		if("PRG_copytousb")
 			. = 1
 			if(!HDD || !RHDD)
@@ -190,43 +127,29 @@

 	var/obj/item/computer_hardware/hard_drive/HDD = computer.all_components[MC_HDD]
 	var/obj/item/computer_hardware/hard_drive/portable/RHDD = computer.all_components[MC_SDD]
-	if(error)
-		data["error"] = error
-	if(open_file)
-		var/datum/computer_file/data/file

-		if(!computer || !HDD)
-			data["error"] = "I/O ERROR: Unable to access hard drive."
-		else
-			file = HDD.find_file_by_name(open_file)
-			if(!istype(file))
-				data["error"] = "I/O ERROR: Unable to open file."
-			else
-				data["filedata"] = parse_tags(file.stored_data)
-				data["filename"] = "[file.filename].[file.filetype]"
+	if(!computer || !HDD)
+		data["error"] = "I/O ERROR: Unable to access hard drive."
 	else
-		if(!computer || !HDD)
-			data["error"] = "I/O ERROR: Unable to access hard drive."
-		else
-			var/list/files[0]
-			for(var/datum/computer_file/F in HDD.stored_files)
-				files.Add(list(list(
+		var/list/files[0]
+		for(var/datum/computer_file/F in HDD.stored_files)
+			files.Add(list(list(
+				"name" = F.filename,
+				"type" = F.filetype,
+				"size" = F.size,
+				"undeletable" = F.undeletable
+			)))
+		data["files"] = files
+		if(RHDD)
+			data["usbconnected"] = TRUE
+			var/list/usbfiles[0]
+			for(var/datum/computer_file/F in RHDD.stored_files)
+				usbfiles.Add(list(list(
 					"name" = F.filename,
 					"type" = F.filetype,
 					"size" = F.size,
 					"undeletable" = F.undeletable
 				)))
-			data["files"] = files
-			if(RHDD)
-				data["usbconnected"] = 1
-				var/list/usbfiles[0]
-				for(var/datum/computer_file/F in RHDD.stored_files)
-					usbfiles.Add(list(list(
-						"name" = F.filename,
-						"type" = F.filetype,
-						"size" = F.size,
-						"undeletable" = F.undeletable
-					)))
-				data["usbfiles"] = usbfiles
+			data["usbfiles"] = usbfiles

 	return data
@@ -10,7 +10,7 @@
 	requires_ntnet_feature = NTNET_SOFTWAREDOWNLOAD
 	available_on_ntnet = 0
 	ui_header = "downloader_finished.gif"
-	tgui_id = "ntos_net_downloader"
+	tgui_id = "NtosNetDownloader"

 	var/datum/computer_file/program/downloaded_file = null
 	var/hacked_download = 0
@@ -7,7 +7,7 @@
 	requires_ntnet = 1
 	required_access = ACCESS_NETWORK	//NETWORK CONTROL IS A MORE SECURE PROGRAM.
 	available_on_ntnet = 1
-	tgui_id = "ntos_net_monitor"
+	tgui_id = "NtosNetMonitor"

 /datum/computer_file/program/ntnetmonitor/ui_act(action, params)
 	if(..())
@@ -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

@@ -8,7 +8,7 @@
 	requires_ntnet_feature = NTNET_PEERTOPEER
 	network_destination = "other device via P2P tunnel"
 	available_on_ntnet = 1
-	tgui_id = "ntos_net_transfer"
+	tgui_id = "NtosNetTransfer"

 	var/error = ""										// Error screen
 	var/server_password = ""							// Optional password to download the file.
@@ -11,7 +11,7 @@
 	requires_ntnet = 0
 	network_destination = "power monitoring system"
 	size = 9
-	tgui_id = "ntos_power_monitor"
+	tgui_id = "PowerMonitor"
 	ui_style = "ntos"
 	ui_x = 550
 	ui_y = 700
@@ -8,7 +8,7 @@
 	transfer_access = ACCESS_CONSTRUCTION
 	network_destination = "supermatter monitoring system"
 	size = 5
-	tgui_id = "ntos_supermatter_monitor"
+	tgui_id = "NtosSupermatterMonitor"
 	ui_style = "ntos"
 	ui_x = 600
 	ui_y = 350
@@ -224,7 +224,7 @@
 			return TRUE
 	return FALSE

-/obj/machinery/lapvend/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)
+/obj/machinery/lapvend/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
 	if(stat & (BROKEN | NOPOWER | MAINT))
 		if(ui)
 			ui.close()
@@ -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)
@@ -840,11 +840,11 @@
 		return

 /obj/machinery/power/apc/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)
+										datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
 	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)
@@ -221,10 +221,10 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
 	return ..()

 /obj/machinery/gravity_generator/main/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)
+									datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_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, 400, 200, master_ui, state)
 		ui.open()

 /obj/machinery/gravity_generator/main/ui_data(mob/user)
@@ -197,7 +197,7 @@
 	var/static_power_used = 0
 	var/brightness = 8			// luminosity when on, also used in power calculation
 	var/bulb_power = 1			// basically the alpha of the emitted light source
-	var/bulb_colour = "#FFFFFF"	// befault colour of the light.
+	var/bulb_colour = "#ffefda"	// befault colour of the light.
 	var/status = LIGHT_OK		// LIGHT_OK, _EMPTY, _BURNED or _BROKEN
 	var/flickering = FALSE
 	var/light_type = /obj/item/light/tube		// the type of light item
@@ -212,13 +212,13 @@

 	var/nightshift_enabled = FALSE	//Currently in night shift mode?
 	var/nightshift_allowed = TRUE	//Set to FALSE to never let this light get switched to night mode.
-	var/nightshift_brightness = 8
+	var/nightshift_brightness = 7
 	var/nightshift_light_power = 0.45
-	var/nightshift_light_color = "#FFDDCC"
+	var/nightshift_light_color = "#dafcff"

 	var/emergency_mode = FALSE	// if true, the light is in emergency mode
 	var/no_emergency = FALSE	// if true, this light cannot ever have an emergency mode
-	var/bulb_emergency_brightness_mul = 0.25	// multiplier for this light's base brightness in emergency power mode
+	var/bulb_emergency_brightness_mul = 0.6	// multiplier for this light's base brightness in emergency power mode
 	var/bulb_emergency_colour = "#FF3232"	// determines the colour of the light while it's in emergency mode
 	var/bulb_emergency_pow_mul = 0.75	// the multiplier for determining the light's power in emergency mode
 	var/bulb_emergency_pow_min = 0.5	// the minimum value for the light's power in emergency mode
@@ -19,7 +19,7 @@
 	var/record_interval = 50
 	var/next_record = 0
 	var/is_secret_monitor = FALSE
-	tgui_id = "power_monitor"
+	tgui_id = "PowerMonitor"
 	ui_style = "ntos"

 /obj/machinery/computer/monitor/secret //Hides the power monitor (such as ones on ruins & CentCom) from PDA's to prevent metagaming.
@@ -84,7 +84,7 @@
 			demand.Cut(1, 2)

 /obj/machinery/computer/monitor/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)
+											datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_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)
@@ -314,10 +314,10 @@


 /obj/machinery/power/smes/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)
+										datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_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()
@@ -344,10 +344,10 @@
 		add_overlay(icon_screen)

 /obj/machinery/power/solar_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)
+												datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_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()
@@ -306,10 +306,10 @@
 		compressor = locate(/obj/machinery/power/compressor) in range(7, src)

 /obj/machinery/computer/turbine_computer/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)
+									datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_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, 300, 200, master_ui, state)
 		ui.open()

 /obj/machinery/computer/turbine_computer/ui_data(mob/user)
@@ -179,10 +179,10 @@
 		update_icon()

 /obj/machinery/chem_dispenser/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)
+											datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_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()
@@ -104,10 +104,10 @@
 	return ..()

 /obj/machinery/chem_heater/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)
+										datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_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()
@@ -153,12 +153,12 @@
 	return ..()

 /obj/machinery/chem_master/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)
+										datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_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/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
@@ -13,10 +13,10 @@
 	)

 /obj/machinery/chem_dispenser/chem_synthesizer/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)
+											datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_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, "ChemSynthesizer", name, 390, 330, master_ui, state)
 		ui.open()

 /obj/machinery/chem_dispenser/chem_synthesizer/ui_act(action, params)
@@ -120,10 +120,10 @@
 	else
 		cut_overlays()

-/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)
+/obj/machinery/computer/pandemic/ui_interact(mob/user, ui_key = "main", datum/tgui/ui, force_open = FALSE, datum/tgui/master_ui, datum/tgui_state/state = GLOB.tgui_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)
@@ -102,10 +102,10 @@
 	return ..()

 /obj/machinery/smoke_machine/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)
+										datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_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)
@@ -36,6 +36,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
 */

 /datum/reagent/consumable/ethanol/on_mob_life(mob/living/carbon/C)
+	C.adjustPainLoss(-0.25*REM, 0) //alchol dulls pain
 	if(C.drunkenness < volume * boozepwr * ALCOHOL_THRESHOLD_MODIFIER)
 		var/booze_power = boozepwr
 		if(HAS_TRAIT(C, TRAIT_ALCOHOL_TOLERANCE)) //we're an accomplished drinker
@@ -391,6 +391,7 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 /datum/reagent/medicine/mine_salve/on_mob_life(mob/living/carbon/C)
 	C.hal_screwyhud = SCREWYHUD_HEALTHY
 	C.adjustBruteLoss(-0.25*REM, 0)
+	C.adjustPainLoss(-1*REM, 0)
 	C.adjustFireLoss(-0.25*REM, 0)
 	C.adjustStaminaLoss(-0.5*REM, 0)
 	..()
@@ -698,7 +699,7 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)

 /datum/reagent/medicine/morphine
 	name = "Morphine"
-	description = "A painkiller that allows the patient to move at full speed even in bulky objects. Causes drowsiness and eventually unconsciousness in high doses. Overdose will cause a variety of effects, ranging from minor to lethal."
+	description = "A painkiller. Causes drowsiness and eventually unconsciousness in high doses. Overdose will cause a variety of effects, ranging from minor to lethal."
 	reagent_state = LIQUID
 	color = "#A9FBFB"
 	metabolization_rate = 0.5 * REAGENTS_METABOLISM
@@ -706,23 +707,8 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 	addiction_threshold = 25
 	pH = 8.96

-/datum/reagent/medicine/morphine/on_mob_metabolize(mob/living/L)
-	..()
-	L.ignore_slowdown(type)
-
-/datum/reagent/medicine/morphine/on_mob_end_metabolize(mob/living/L)
-	L.unignore_slowdown(type)
-	..()
-
 /datum/reagent/medicine/morphine/on_mob_life(mob/living/carbon/M)
-	switch(current_cycle)
-		if(11)
-			to_chat(M, "<span class='warning'>You start to feel tired...</span>" )
-		if(12 to 24)
-			M.drowsyness += 1
-		if(24 to INFINITY)
-			M.Sleeping(40, 0)
-			. = 1
+	M.adjustPainLoss(-3*REM, 0)// very good pain killer.
 	..()

 /datum/reagent/medicine/morphine/overdose_process(mob/living/M)
@@ -1022,6 +1008,7 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)

 /datum/reagent/medicine/bicaridine/on_mob_life(mob/living/carbon/M)
 	M.adjustBruteLoss(-2*REM, 0)
+	M.adjustPainLoss(-1*REM, 0) //stabilize pain at threshold. and bring it down faster if above.
 	..()
 	. = 1

@@ -1,371 +1,432 @@
-/obj/item/reagent_containers/glass
-	name = "glass"
-	amount_per_transfer_from_this = 10
-	possible_transfer_amounts = list(5, 10, 15, 20, 25, 30, 50)
-	volume = 50
-	reagent_flags = OPENCONTAINER
-	spillable = TRUE
-	resistance_flags = ACID_PROOF
-	container_HP = 2
-
-
-/obj/item/reagent_containers/glass/attack(mob/M, mob/user, obj/target)
-	if(!canconsume(M, user))
-		return
-
-	if(!spillable)
-		return
-
-	if(!reagents || !reagents.total_volume)
-		to_chat(user, "<span class='warning'>[src] is empty!</span>")
-		return
-
-	if(istype(M))
-		if(user.a_intent == INTENT_HARM)
-			M.visible_message("<span class='danger'>[user] splashes the contents of [src] onto [M]!</span>", \
-							"<span class='userdanger'>[user] splashes the contents of [src] onto [M]!</span>")
-			var/R = reagents?.log_list()
-			if(isturf(target) && reagents.reagent_list.len && thrownby)
-				log_combat(thrownby, target, "splashed (thrown) [english_list(reagents.reagent_list)]")
-				message_admins("[ADMIN_LOOKUPFLW(thrownby)] splashed (thrown) [english_list(reagents.reagent_list)] on [target] at [ADMIN_VERBOSEJMP(target)].")
-			reagents.reaction(M, TOUCH)
-			log_combat(user, M, "splashed", R)
-			reagents.clear_reagents()
-		else
-			if(M != user)
-				M.visible_message("<span class='danger'>[user] attempts to feed something to [M].</span>", \
-							"<span class='userdanger'>[user] attempts to feed something to you.</span>")
-				if(!do_mob(user, M))
-					return
-				if(!reagents || !reagents.total_volume)
-					return // The drink might be empty after the delay, such as by spam-feeding
-				M.visible_message("<span class='danger'>[user] feeds something to [M].</span>", "<span class='userdanger'>[user] feeds something to you.</span>")
-				log_combat(user, M, "fed", reagents.log_list())
-			else
-				to_chat(user, "<span class='notice'>You swallow a gulp of [src].</span>")
-			var/fraction = min(5/reagents.total_volume, 1)
-			reagents.reaction(M, INGEST, fraction)
-			addtimer(CALLBACK(reagents, /datum/reagents.proc/trans_to, M, 5), 5)
-			playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
-
-/obj/item/reagent_containers/glass/afterattack(obj/target, mob/user, proximity)
-	. = ..()
-	if((!proximity) || !check_allowed_items(target,target_self=1))
-		return
-
-	if(target.is_refillable()) //Something like a glass. Player probably wants to transfer TO it.
-		if(!reagents.total_volume)
-			to_chat(user, "<span class='warning'>[src] is empty!</span>")
-			return
-
-		if(target.reagents.holder_full())
-			to_chat(user, "<span class='warning'>[target] is full.</span>")
-			return
-
-		var/trans = reagents.trans_to(target, amount_per_transfer_from_this)
-		to_chat(user, "<span class='notice'>You transfer [trans] unit\s of the solution to [target].</span>")
-
-	else if(target.is_drainable()) //A dispenser. Transfer FROM it TO us.
-		if(!target.reagents.total_volume)
-			to_chat(user, "<span class='warning'>[target] is empty and can't be refilled!</span>")
-			return
-
-		if(reagents.holder_full())
-			to_chat(user, "<span class='warning'>[src] is full.</span>")
-			return
-
-		var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this)
-		to_chat(user, "<span class='notice'>You fill [src] with [trans] unit\s of the contents of [target].</span>")
-
-	else if(reagents.total_volume)
-		if(user.a_intent == INTENT_HARM)
-			user.visible_message("<span class='danger'>[user] splashes the contents of [src] onto [target]!</span>", \
-								"<span class='notice'>You splash the contents of [src] onto [target].</span>")
-			reagents.reaction(target, TOUCH)
-			reagents.clear_reagents()
-
-/obj/item/reagent_containers/glass/attackby(obj/item/I, mob/user, params)
-	var/hotness = I.is_hot()
-	if(hotness && reagents)
-		reagents.expose_temperature(hotness)
-		to_chat(user, "<span class='notice'>You heat [name] with [I]!</span>")
-
-	if(istype(I, /obj/item/reagent_containers/food/snacks/egg)) //breaking eggs
-		var/obj/item/reagent_containers/food/snacks/egg/E = I
-		if(reagents)
-			if(reagents.total_volume >= reagents.maximum_volume)
-				to_chat(user, "<span class='notice'>[src] is full.</span>")
-			else
-				to_chat(user, "<span class='notice'>You break [E] in [src].</span>")
-				E.reagents.trans_to(src, E.reagents.total_volume)
-				qdel(E)
-			return
-	..()
-
-
-/obj/item/reagent_containers/glass/beaker
-	name = "beaker"
-	desc = "A beaker. It can hold up to 50 units. Unable to withstand extreme pHes"
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "beaker"
-	item_state = "beaker"
-	materials = list(MAT_GLASS=500)
-	beaker_weakness_bitflag = PH_WEAK
-
-/obj/item/reagent_containers/glass/beaker/Initialize()
-	. = ..()
-	update_icon()
-
-/obj/item/reagent_containers/glass/beaker/get_part_rating()
-	return reagents.maximum_volume
-
-/obj/item/reagent_containers/glass/beaker/on_reagent_change(changetype)
-	update_icon()
-
-/obj/item/reagent_containers/glass/beaker/update_icon()
-	if(!cached_icon)
-		cached_icon = icon_state
-	cut_overlays()
-
-	if(reagents.total_volume)
-		var/mutable_appearance/filling = mutable_appearance('icons/obj/reagentfillings.dmi', "[cached_icon]10")
-
-		var/percent = round((reagents.total_volume / volume) * 100)
-		switch(percent)
-			if(0 to 9)
-				filling.icon_state = "[cached_icon]-10"
-			if(10 to 24)
-				filling.icon_state = "[cached_icon]10"
-			if(25 to 49)
-				filling.icon_state = "[cached_icon]25"
-			if(50 to 74)
-				filling.icon_state = "[cached_icon]50"
-			if(75 to 79)
-				filling.icon_state = "[cached_icon]75"
-			if(80 to 90)
-				filling.icon_state = "[cached_icon]80"
-			if(91 to INFINITY)
-				filling.icon_state = "[cached_icon]100"
-
-		filling.color = mix_color_from_reagents(reagents.reagent_list)
-		add_overlay(filling)
-
-/obj/item/reagent_containers/glass/beaker/jar
-	name = "honey jar"
-	desc = "A jar for honey. It can hold up to 50 units of sweet delight. Unable to withstand reagents of an extreme pH."
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "vapour"
-
-/obj/item/reagent_containers/glass/beaker/large
-	name = "large beaker"
-	desc = "A large beaker. Can hold up to 100 units. Unable to withstand reagents of an extreme pH."
-	icon_state = "beakerlarge"
-	materials = list(MAT_GLASS=2500)
-	volume = 100
-	amount_per_transfer_from_this = 10
-	possible_transfer_amounts = list(5,10,15,20,25,30,50,100)
-	container_HP = 3
-
-/obj/item/reagent_containers/glass/beaker/plastic
-	name = "x-large beaker"
-	desc = "An extra-large beaker. Can hold up to 150 units. Is able to resist acid and alkaline solutions, but melts at 444K"
-	icon_state = "beakerwhite"
-	materials = list(MAT_GLASS=2500, MAT_PLASTIC=3000)
-	volume = 150
-	amount_per_transfer_from_this = 10
-	possible_transfer_amounts = list(5,10,15,20,25,30,50,100,150)
-
-/obj/item/reagent_containers/glass/beaker/plastic/Initialize()
-	beaker_weakness_bitflag &= ~PH_WEAK
-	beaker_weakness_bitflag |= TEMP_WEAK
-	. = ..()
-
-/obj/item/reagent_containers/glass/beaker/plastic/update_icon()
-	icon_state = "beakerlarge" // hack to lets us reuse the large beaker reagent fill states
-	..()
-	icon_state = "beakerwhite"
-
-/obj/item/reagent_containers/glass/beaker/meta
-	name = "metamaterial beaker"
-	desc = "A large beaker. Can hold up to 200 units. Is able to withstand all chemical situations."
-	icon_state = "beakergold"
-	materials = list(MAT_GLASS=2500, MAT_PLASTIC=3000, MAT_GOLD=1000, MAT_TITANIUM=1000)
-	volume = 200
-	amount_per_transfer_from_this = 10
-	possible_transfer_amounts = list(5,10,15,20,25,30,50,100,200)
-
-/obj/item/reagent_containers/glass/beaker/meta/Initialize()
-	beaker_weakness_bitflag &= ~PH_WEAK
-	. = ..()
-
-/obj/item/reagent_containers/glass/beaker/noreact
-	name = "cryostasis beaker"
-	desc = "A cryostasis beaker that allows for chemical storage without \
-		reactions. Can hold up to 50 units."
-	icon_state = "beakernoreact"
-	materials = list(MAT_METAL=3000)
-	reagent_flags = OPENCONTAINER | NO_REACT
-	volume = 50
-	amount_per_transfer_from_this = 10
-	container_HP = 10//shouldn't be needed
-
-/obj/item/reagent_containers/glass/beaker/noreact/Initialize()
-	beaker_weakness_bitflag &= ~PH_WEAK
-	. = ..()
-	//reagents.set_reacting(FALSE) was this removed in a recent pr?
-
-/obj/item/reagent_containers/glass/beaker/bluespace
-	name = "bluespace beaker"
-	desc = "A bluespace beaker, powered by experimental bluespace technology \
-		and Element Cuban combined with the Compound Pete. Can hold up to \
-		300 units. Unable to withstand reagents of an extreme pH."
-	icon_state = "beakerbluespace"
-	materials = list(MAT_GLASS=3000)
-	volume = 300
-	amount_per_transfer_from_this = 10
-	possible_transfer_amounts = list(5,10,15,20,25,30,50,100,300)
-	container_HP = 4
-
-/obj/item/reagent_containers/glass/beaker/cryoxadone
-	list_reagents = list(/datum/reagent/medicine/cryoxadone = 30)
-
-/obj/item/reagent_containers/glass/beaker/sulphuric
-	list_reagents = list(/datum/reagent/toxin/acid = 50)
-
-/obj/item/reagent_containers/glass/beaker/slime
-	list_reagents = list(/datum/reagent/toxin/slimejelly = 50)
-
-/obj/item/reagent_containers/glass/beaker/large/styptic
-	name = "styptic reserve tank"
-	list_reagents = list(/datum/reagent/medicine/styptic_powder = 50)
-
-/obj/item/reagent_containers/glass/beaker/large/silver_sulfadiazine
-	name = "silver sulfadiazine reserve tank"
-	list_reagents = list(/datum/reagent/medicine/silver_sulfadiazine = 50)
-
-/obj/item/reagent_containers/glass/beaker/large/charcoal
-	name = "charcoal reserve tank"
-	list_reagents = list(/datum/reagent/medicine/charcoal = 50)
-
-/obj/item/reagent_containers/glass/beaker/large/epinephrine
-	name = "epinephrine reserve tank"
-	list_reagents = list(/datum/reagent/medicine/epinephrine = 50)
-
-/obj/item/reagent_containers/glass/beaker/synthflesh
-	list_reagents = list(/datum/reagent/medicine/synthflesh = 50)
-
-/obj/item/reagent_containers/glass/bucket
-	name = "bucket"
-	desc = "It's a bucket."
-	icon = 'icons/obj/janitor.dmi'
-	icon_state = "bucket"
-	item_state = "bucket"
-	lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi'
-	materials = list(MAT_METAL=200)
-	w_class = WEIGHT_CLASS_NORMAL
-	amount_per_transfer_from_this = 20
-	possible_transfer_amounts = list(5,10,15,20,25,30,50,70)
-	volume = 70
-	flags_inv = HIDEHAIR
-	slot_flags = ITEM_SLOT_HEAD
-	resistance_flags = NONE
-	armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 75, "acid" = 50) //Weak melee protection, because you can wear it on your head
-	slot_equipment_priority = list( \
-		SLOT_BACK, SLOT_WEAR_ID,\
-		SLOT_W_UNIFORM, SLOT_WEAR_SUIT,\
-		SLOT_WEAR_MASK, SLOT_HEAD, SLOT_NECK,\
-		SLOT_SHOES, SLOT_GLOVES,\
-		SLOT_EARS, SLOT_GLASSES,\
-		SLOT_BELT, SLOT_S_STORE,\
-		SLOT_L_STORE, SLOT_R_STORE,\
-		SLOT_GENERC_DEXTROUS_STORAGE
-	)
-	container_HP = 1
-
-/obj/item/reagent_containers/glass/bucket/Initialize()
-	beaker_weakness_bitflag |= TEMP_WEAK
-	. = ..()
-
-/obj/item/reagent_containers/glass/bucket/attackby(obj/O, mob/user, params)
-	if(istype(O, /obj/item/mop))
-		if(reagents.total_volume < 1)
-			to_chat(user, "<span class='warning'>[src] is out of water!</span>")
-		else
-			reagents.trans_to(O, 5)
-			to_chat(user, "<span class='notice'>You wet [O] in [src].</span>")
-			playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
-	else if(isprox(O))
-		to_chat(user, "<span class='notice'>You add [O] to [src].</span>")
-		qdel(O)
-		qdel(src)
-		user.put_in_hands(new /obj/item/bot_assembly/cleanbot)
-	else
-		..()
-
-/obj/item/reagent_containers/glass/bucket/equipped(mob/user, slot)
-	..()
-	if (slot == SLOT_HEAD)
-		if(reagents.total_volume)
-			to_chat(user, "<span class='userdanger'>[src]'s contents spill all over you!</span>")
-			reagents.reaction(user, TOUCH)
-			reagents.clear_reagents()
-		reagent_flags = NONE
-
-/obj/item/reagent_containers/glass/bucket/dropped(mob/user)
-	. = ..()
-	reagent_flags = initial(reagent_flags)
-
-/obj/item/reagent_containers/glass/bucket/equip_to_best_slot(var/mob/M)
-	if(reagents.total_volume) //If there is water in a bucket, don't quick equip it to the head
-		var/index = slot_equipment_priority.Find(SLOT_HEAD)
-		slot_equipment_priority.Remove(SLOT_HEAD)
-		. = ..()
-		slot_equipment_priority.Insert(index, SLOT_HEAD)
-		return
-	return ..()
-
-/obj/item/reagent_containers/glass/beaker/waterbottle
-	name = "bottle of water"
-	desc = "A bottle of water filled at some factory in space."
-	icon = 'icons/obj/drinks.dmi'
-	icon_state = "smallbottle"
-	item_state = "bottle"
-	list_reagents = list(/datum/reagent/water = 50)//see desc, don't think about it too hard
-	materials = list(MAT_GLASS=0)
-	volume = 50
-	amount_per_transfer_from_this = 10
-	container_HP = 1
-	price = 1
-
-/obj/item/reagent_containers/glass/beaker/waterbottle/Initialize()
-	beaker_weakness_bitflag |= TEMP_WEAK
-	. = ..()
-
-/obj/item/reagent_containers/glass/beaker/waterbottle/empty
-	list_reagents = list()
-
-/obj/item/reagent_containers/glass/beaker/waterbottle/large
-	desc = "A fresh commercial-sized bottle of water."
-	icon_state = "largebottle"
-	materials = list(MAT_GLASS=0)
-	list_reagents = list(/datum/reagent/water = 100)
-	volume = 100
-	amount_per_transfer_from_this = 20
-	container_HP = 1
-
-/obj/item/reagent_containers/glass/beaker/waterbottle/large/empty
-	list_reagents = list()
-
-/obj/item/reagent_containers/glass/beaker/waterbottle/wataur
-	name = "Bottled Wataur"
-	desc = "Finally, a bottle as proportionate as you. Incredible!"
-	icon = 'icons/obj/drinks.dmi'
-	icon_state = "wataur"
-	list_reagents = list(/datum/reagent/water = 100) //robust ass wataur
-	volume = 100
-	amount_per_transfer_from_this = 20
-	container_HP = 1
-
-/obj/item/reagent_containers/glass/get_belt_overlay()
-	return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "bottle")
+/obj/item/reagent_containers/glass
+	name = "glass"
+	amount_per_transfer_from_this = 10
+	possible_transfer_amounts = list(5, 10, 15, 20, 25, 30, 50)
+	volume = 50
+	reagent_flags = OPENCONTAINER
+	spillable = TRUE
+	resistance_flags = ACID_PROOF
+	container_HP = 2
+
+
+/obj/item/reagent_containers/glass/attack(mob/M, mob/user, obj/target)
+	if(!canconsume(M, user))
+		return
+
+	if(!spillable)
+		return
+
+	if(!reagents || !reagents.total_volume)
+		to_chat(user, "<span class='warning'>[src] is empty!</span>")
+		return
+
+	if(istype(M))
+		if(user.a_intent == INTENT_HARM)
+			M.visible_message("<span class='danger'>[user] splashes the contents of [src] onto [M]!</span>", \
+							"<span class='userdanger'>[user] splashes the contents of [src] onto [M]!</span>")
+			var/R = reagents?.log_list()
+			if(isturf(target) && reagents.reagent_list.len && thrownby)
+				log_combat(thrownby, target, "splashed (thrown) [english_list(reagents.reagent_list)]")
+				message_admins("[ADMIN_LOOKUPFLW(thrownby)] splashed (thrown) [english_list(reagents.reagent_list)] on [target] at [ADMIN_VERBOSEJMP(target)].")
+			reagents.reaction(M, TOUCH)
+			log_combat(user, M, "splashed", R)
+			reagents.clear_reagents()
+		else
+			if(M != user)
+				M.visible_message("<span class='danger'>[user] attempts to feed something to [M].</span>", \
+							"<span class='userdanger'>[user] attempts to feed something to you.</span>")
+				if(!do_mob(user, M))
+					return
+				if(!reagents || !reagents.total_volume)
+					return // The drink might be empty after the delay, such as by spam-feeding
+				M.visible_message("<span class='danger'>[user] feeds something to [M].</span>", "<span class='userdanger'>[user] feeds something to you.</span>")
+				log_combat(user, M, "fed", reagents.log_list())
+			else
+				to_chat(user, "<span class='notice'>You swallow a gulp of [src].</span>")
+			var/fraction = min(5/reagents.total_volume, 1)
+			reagents.reaction(M, INGEST, fraction)
+			addtimer(CALLBACK(reagents, /datum/reagents.proc/trans_to, M, 5), 5)
+			playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
+
+/obj/item/reagent_containers/glass/afterattack(obj/target, mob/user, proximity)
+	. = ..()
+	if((!proximity) || !check_allowed_items(target,target_self=1))
+		return
+
+	if(target.is_refillable()) //Something like a glass. Player probably wants to transfer TO it.
+		if(!reagents.total_volume)
+			to_chat(user, "<span class='warning'>[src] is empty!</span>")
+			return
+
+		if(target.reagents.holder_full())
+			to_chat(user, "<span class='warning'>[target] is full.</span>")
+			return
+
+		var/trans = reagents.trans_to(target, amount_per_transfer_from_this)
+		to_chat(user, "<span class='notice'>You transfer [trans] unit\s of the solution to [target].</span>")
+
+	else if(target.is_drainable()) //A dispenser. Transfer FROM it TO us.
+		if(!target.reagents.total_volume)
+			to_chat(user, "<span class='warning'>[target] is empty and can't be refilled!</span>")
+			return
+
+		if(reagents.holder_full())
+			to_chat(user, "<span class='warning'>[src] is full.</span>")
+			return
+
+		var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this)
+		to_chat(user, "<span class='notice'>You fill [src] with [trans] unit\s of the contents of [target].</span>")
+
+	else if(reagents.total_volume)
+		if(user.a_intent == INTENT_HARM)
+			user.visible_message("<span class='danger'>[user] splashes the contents of [src] onto [target]!</span>", \
+								"<span class='notice'>You splash the contents of [src] onto [target].</span>")
+			reagents.reaction(target, TOUCH)
+			reagents.clear_reagents()
+
+/obj/item/reagent_containers/glass/attackby(obj/item/I, mob/user, params)
+	var/hotness = I.is_hot()
+	if(hotness && reagents)
+		reagents.expose_temperature(hotness)
+		to_chat(user, "<span class='notice'>You heat [name] with [I]!</span>")
+
+	if(istype(I, /obj/item/reagent_containers/food/snacks/egg)) //breaking eggs
+		var/obj/item/reagent_containers/food/snacks/egg/E = I
+		if(reagents)
+			if(reagents.total_volume >= reagents.maximum_volume)
+				to_chat(user, "<span class='notice'>[src] is full.</span>")
+			else
+				to_chat(user, "<span class='notice'>You break [E] in [src].</span>")
+				E.reagents.trans_to(src, E.reagents.total_volume)
+				qdel(E)
+			return
+	..()
+
+
+/obj/item/reagent_containers/glass/beaker
+	name = "beaker"
+	desc = "A beaker. It can hold up to 50 units. Unable to withstand extreme pHes"
+	icon = 'icons/obj/chemical.dmi'
+	icon_state = "beaker"
+	item_state = "beaker"
+	materials = list(MAT_GLASS=500)
+	beaker_weakness_bitflag = PH_WEAK
+
+/obj/item/reagent_containers/glass/beaker/Initialize()
+	. = ..()
+	update_icon()
+
+/obj/item/reagent_containers/glass/beaker/get_part_rating()
+	return reagents.maximum_volume
+
+/obj/item/reagent_containers/glass/beaker/on_reagent_change(changetype)
+	update_icon()
+
+/obj/item/reagent_containers/glass/beaker/update_icon()
+	if(!cached_icon)
+		cached_icon = icon_state
+	cut_overlays()
+
+	if(reagents.total_volume)
+		var/mutable_appearance/filling = mutable_appearance('icons/obj/reagentfillings.dmi', "[cached_icon]10")
+
+		var/percent = round((reagents.total_volume / volume) * 100)
+		switch(percent)
+			if(0 to 9)
+				filling.icon_state = "[cached_icon]-10"
+			if(10 to 24)
+				filling.icon_state = "[cached_icon]10"
+			if(25 to 49)
+				filling.icon_state = "[cached_icon]25"
+			if(50 to 74)
+				filling.icon_state = "[cached_icon]50"
+			if(75 to 79)
+				filling.icon_state = "[cached_icon]75"
+			if(80 to 90)
+				filling.icon_state = "[cached_icon]80"
+			if(91 to INFINITY)
+				filling.icon_state = "[cached_icon]100"
+
+		filling.color = mix_color_from_reagents(reagents.reagent_list)
+		add_overlay(filling)
+
+/obj/item/reagent_containers/glass/beaker/jar
+	name = "honey jar"
+	desc = "A jar for honey. It can hold up to 50 units of sweet delight. Unable to withstand reagents of an extreme pH."
+	icon = 'icons/obj/chemical.dmi'
+	icon_state = "vapour"
+
+/obj/item/reagent_containers/glass/beaker/large
+	name = "large beaker"
+	desc = "A large beaker. Can hold up to 100 units. Unable to withstand reagents of an extreme pH."
+	icon_state = "beakerlarge"
+	materials = list(MAT_GLASS=2500)
+	volume = 100
+	amount_per_transfer_from_this = 10
+	possible_transfer_amounts = list(5,10,15,20,25,30,50,100)
+	container_HP = 3
+
+/obj/item/reagent_containers/glass/beaker/plastic
+	name = "x-large beaker"
+	desc = "An extra-large beaker. Can hold up to 150 units. Is able to resist acid and alkaline solutions, but melts at 444K"
+	icon_state = "beakerwhite"
+	materials = list(MAT_GLASS=2500, MAT_PLASTIC=3000)
+	volume = 150
+	amount_per_transfer_from_this = 10
+	possible_transfer_amounts = list(5,10,15,20,25,30,50,100,150)
+
+/obj/item/reagent_containers/glass/beaker/plastic/Initialize()
+	beaker_weakness_bitflag &= ~PH_WEAK
+	beaker_weakness_bitflag |= TEMP_WEAK
+	. = ..()
+
+/obj/item/reagent_containers/glass/beaker/plastic/update_icon()
+	icon_state = "beakerlarge" // hack to lets us reuse the large beaker reagent fill states
+	..()
+	icon_state = "beakerwhite"
+
+/obj/item/reagent_containers/glass/beaker/meta
+	name = "metamaterial beaker"
+	desc = "A large beaker. Can hold up to 200 units. Is able to withstand all chemical situations."
+	icon_state = "beakergold"
+	materials = list(MAT_GLASS=2500, MAT_PLASTIC=3000, MAT_GOLD=1000, MAT_TITANIUM=1000)
+	volume = 200
+	amount_per_transfer_from_this = 10
+	possible_transfer_amounts = list(5,10,15,20,25,30,50,100,200)
+
+/obj/item/reagent_containers/glass/beaker/meta/Initialize()
+	beaker_weakness_bitflag &= ~PH_WEAK
+	. = ..()
+
+/obj/item/reagent_containers/glass/beaker/noreact
+	name = "cryostasis beaker"
+	desc = "A cryostasis beaker that allows for chemical storage without \
+		reactions. Can hold up to 50 units."
+	icon_state = "beakernoreact"
+	materials = list(MAT_METAL=3000)
+	reagent_flags = OPENCONTAINER | NO_REACT
+	volume = 50
+	amount_per_transfer_from_this = 10
+	container_HP = 10//shouldn't be needed
+
+/obj/item/reagent_containers/glass/beaker/noreact/Initialize()
+	beaker_weakness_bitflag &= ~PH_WEAK
+	. = ..()
+	//reagents.set_reacting(FALSE) was this removed in a recent pr?
+
+/obj/item/reagent_containers/glass/beaker/bluespace
+	name = "bluespace beaker"
+	desc = "A bluespace beaker, powered by experimental bluespace technology \
+		and Element Cuban combined with the Compound Pete. Can hold up to \
+		300 units. Unable to withstand reagents of an extreme pH."
+	icon_state = "beakerbluespace"
+	materials = list(MAT_GLASS=3000)
+	volume = 300
+	amount_per_transfer_from_this = 10
+	possible_transfer_amounts = list(5,10,15,20,25,30,50,100,300)
+	container_HP = 4
+
+/obj/item/reagent_containers/glass/beaker/cryoxadone
+	list_reagents = list(/datum/reagent/medicine/cryoxadone = 30)
+
+/obj/item/reagent_containers/glass/beaker/sulphuric
+	list_reagents = list(/datum/reagent/toxin/acid = 50)
+
+/obj/item/reagent_containers/glass/beaker/slime
+	list_reagents = list(/datum/reagent/toxin/slimejelly = 50)
+
+/obj/item/reagent_containers/glass/beaker/large/styptic
+	name = "styptic reserve tank"
+	list_reagents = list(/datum/reagent/medicine/styptic_powder = 50)
+
+/obj/item/reagent_containers/glass/beaker/large/silver_sulfadiazine
+	name = "silver sulfadiazine reserve tank"
+	list_reagents = list(/datum/reagent/medicine/silver_sulfadiazine = 50)
+
+/obj/item/reagent_containers/glass/beaker/large/charcoal
+	name = "charcoal reserve tank"
+	list_reagents = list(/datum/reagent/medicine/charcoal = 50)
+
+/obj/item/reagent_containers/glass/beaker/large/epinephrine
+	name = "epinephrine reserve tank"
+	list_reagents = list(/datum/reagent/medicine/epinephrine = 50)
+
+/obj/item/reagent_containers/glass/beaker/synthflesh
+	list_reagents = list(/datum/reagent/medicine/synthflesh = 50)
+
+/obj/item/reagent_containers/glass/bucket
+	name = "bucket"
+	desc = "It's a bucket."
+	icon = 'icons/obj/janitor.dmi'
+	icon_state = "bucket"
+	item_state = "bucket"
+	lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi'
+	materials = list(MAT_METAL=200)
+	w_class = WEIGHT_CLASS_NORMAL
+	amount_per_transfer_from_this = 20
+	possible_transfer_amounts = list(5,10,15,20,25,30,50,70)
+	volume = 70
+	flags_inv = HIDEHAIR
+	slot_flags = ITEM_SLOT_HEAD
+	resistance_flags = NONE
+	armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 75, "acid" = 50) //Weak melee protection, because you can wear it on your head
+	slot_equipment_priority = list( \
+		SLOT_BACK, SLOT_WEAR_ID,\
+		SLOT_W_UNIFORM, SLOT_WEAR_SUIT,\
+		SLOT_WEAR_MASK, SLOT_HEAD, SLOT_NECK,\
+		SLOT_SHOES, SLOT_GLOVES,\
+		SLOT_EARS, SLOT_GLASSES,\
+		SLOT_BELT, SLOT_S_STORE,\
+		SLOT_L_STORE, SLOT_R_STORE,\
+		SLOT_GENERC_DEXTROUS_STORAGE
+	)
+	container_HP = 1
+
+/obj/item/reagent_containers/glass/bucket/Initialize()
+	beaker_weakness_bitflag |= TEMP_WEAK
+	. = ..()
+
+/obj/item/reagent_containers/glass/bucket/attackby(obj/O, mob/user, params)
+	if(istype(O, /obj/item/mop))
+		if(reagents.total_volume < 1)
+			to_chat(user, "<span class='warning'>[src] is out of water!</span>")
+		else
+			reagents.trans_to(O, 5)
+			to_chat(user, "<span class='notice'>You wet [O] in [src].</span>")
+			playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
+	else if(isprox(O))
+		to_chat(user, "<span class='notice'>You add [O] to [src].</span>")
+		qdel(O)
+		qdel(src)
+		user.put_in_hands(new /obj/item/bot_assembly/cleanbot)
+	else
+		..()
+
+/obj/item/reagent_containers/glass/bucket/equipped(mob/user, slot)
+	..()
+	if (slot == SLOT_HEAD)
+		if(reagents.total_volume)
+			to_chat(user, "<span class='userdanger'>[src]'s contents spill all over you!</span>")
+			reagents.reaction(user, TOUCH)
+			reagents.clear_reagents()
+		reagent_flags = NONE
+
+/obj/item/reagent_containers/glass/bucket/dropped(mob/user)
+	. = ..()
+	reagent_flags = initial(reagent_flags)
+
+/obj/item/reagent_containers/glass/bucket/equip_to_best_slot(var/mob/M)
+	if(reagents.total_volume) //If there is water in a bucket, don't quick equip it to the head
+		var/index = slot_equipment_priority.Find(SLOT_HEAD)
+		slot_equipment_priority.Remove(SLOT_HEAD)
+		. = ..()
+		slot_equipment_priority.Insert(index, SLOT_HEAD)
+		return
+	return ..()
+
+/obj/item/reagent_containers/glass/beaker/waterbottle
+	name = "bottle of water"
+	desc = "A bottle of water filled at some factory in space."
+	icon = 'icons/obj/drinks.dmi'
+	icon_state = "smallbottle"
+	item_state = "bottle"
+	list_reagents = list(/datum/reagent/water = 50)//see desc, don't think about it too hard
+	materials = list(MAT_GLASS=0)
+	volume = 50
+	amount_per_transfer_from_this = 10
+	container_HP = 1
+	price = 1
+
+/obj/item/reagent_containers/glass/beaker/waterbottle/Initialize()
+	beaker_weakness_bitflag |= TEMP_WEAK
+	. = ..()
+
+/obj/item/reagent_containers/glass/beaker/waterbottle/empty
+	list_reagents = list()
+
+/obj/item/reagent_containers/glass/beaker/waterbottle/large
+	desc = "A fresh commercial-sized bottle of water."
+	icon_state = "largebottle"
+	materials = list(MAT_GLASS=0)
+	list_reagents = list(/datum/reagent/water = 100)
+	volume = 100
+	amount_per_transfer_from_this = 20
+	container_HP = 1
+
+/obj/item/reagent_containers/glass/beaker/waterbottle/large/empty
+	list_reagents = list()
+
+/obj/item/reagent_containers/glass/beaker/waterbottle/wataur
+	name = "Bottled Wataur"
+	desc = "Finally, a bottle as proportionate as you. Incredible!"
+	icon = 'icons/obj/drinks.dmi'
+	icon_state = "wataur"
+	list_reagents = list(/datum/reagent/water = 100) //robust ass wataur
+	volume = 100
+	amount_per_transfer_from_this = 20
+	container_HP = 1
+
+/obj/item/reagent_containers/glass/get_belt_overlay()
+	return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "bottle")
+
+//Mortar & Pestle
+
+/obj/item/pestle
+	name = "pestle"
+	desc = "An ancient, simple tool used in conjunction with a mortar to grind or juice items."
+	icon = 'icons/obj/chemical.dmi'
+	icon_state = "pestle"
+	force = 4
+
+/obj/item/reagent_containers/glass/mortar
+	name = "mortar"
+	desc = "A specially formed bowl of ancient design. It is possible to crush or juice items placed in it using a pestle; however the process, unlike modern methods, is slow and physically exhausting. Alt click to eject the item."
+	icon_state = "mortar"
+	amount_per_transfer_from_this = 10
+	possible_transfer_amounts = list(5, 10, 15, 20, 25, 30, 50)
+	item_flags = NO_MAT_REDEMPTION
+	reagent_flags = OPENCONTAINER
+	spillable = TRUE
+	var/obj/item/grinded
+
+/obj/item/reagent_containers/glass/mortar/AltClick(mob/user)
+	. = ..()
+	if(grinded)
+		grinded.forceMove(drop_location())
+		grinded = null
+		to_chat(user, "<span class='notice'>You eject the item inside.</span>")
+		return TRUE
+
+/obj/item/reagent_containers/glass/mortar/attackby(obj/item/I, mob/living/carbon/human/user)
+	..()
+	if(istype(I,/obj/item/pestle))
+		if(grinded)
+			to_chat(user, "<span class='notice'>You start grinding...</span>")
+			if((do_after(user, 25, target = src)) && grinded)
+				user.adjustStaminaLoss(20)
+				if(grinded.juice_results) //prioritize juicing
+					grinded.on_juice()
+					reagents.add_reagent_list(grinded.juice_results)
+					to_chat(user, "<span class='notice'>You juice [grinded] into a fine liquid.</span>")
+					QDEL_NULL(grinded)
+					return
+				grinded.on_grind()
+				reagents.add_reagent_list(grinded.grind_results)
+				if(grinded.reagents) //food and pills
+					grinded.reagents.trans_to(src, grinded.reagents.total_volume)
+				to_chat(user, "<span class='notice'>You break [grinded] into powder.</span>")
+				QDEL_NULL(grinded)
+				return
+			return
+		else
+			to_chat(user, "<span class='warning'>There is nothing to grind!</span>")
+			return
+	if(grinded)
+		to_chat(user, "<span class='warning'>There is something inside already!</span>")
+		return
+	if(I.juice_results || I.grind_results)
+		I.forceMove(src)
+		grinded = I
+		return
+	to_chat(user, "<span class='warning'>You can't grind this!</span>")
@@ -299,12 +299,12 @@
 // handle machine interaction

 /obj/machinery/disposal/bin/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
-									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.notcontained_state)
+									datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_notcontained_state)
 	if(stat & BROKEN)
 		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)
@@ -25,10 +25,10 @@
 		find_chamber()
 	..()

-/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)
+/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/tgui_state/state = GLOB.tgui_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()
@@ -53,10 +53,10 @@
 	backup.nanites = cloud_copy
 	investigate_log("[key_name(user)] created a new nanite cloud backup with id #[cloud_id]", INVESTIGATE_NANITES)

-/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)
+/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/tgui_state/state = GLOB.tgui_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()
@@ -47,10 +47,10 @@
 		disk.forceMove(drop_location())
 	disk = null

-/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)
+/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/tgui_state/state = GLOB.tgui_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()
@@ -34,10 +34,10 @@
 	disk = null
 	program = null

-/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)
+/obj/machinery/nanite_programmer/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_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()
@@ -80,10 +80,10 @@
 		var/datum/nanite_program/relay/N = X
 		N.relay_signal(code, relay_code, source)

-/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)
+/obj/item/nanite_remote/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_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()
@@ -31,10 +31,10 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new)
 	return ..()

 /obj/machinery/keycard_auth/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)
+					datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_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, 375, 125, master_ui, state)
 		ui.open()

 /obj/machinery/keycard_auth/ui_data()
@@ -16,11 +16,11 @@
 		say("Please equip your ID card into your ID slot to authenticate.")
 	. = ..()

-/obj/machinery/computer/emergency_shuttle/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.human_adjacent_state)
+/obj/machinery/computer/emergency_shuttle/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_human_adjacent_state)

 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "emergency_shuttle_console", name,
+		ui = new(user, src, ui_key, "EmergencyShuttleConsole", name,
 			400, 350, master_ui, state)
 		ui.open()

@@ -44,10 +44,10 @@
 	// Only admins can use this, but they can use it from anywhere
 	return user.client && check_rights_for(user.client, R_ADMIN)

-/obj/machinery/shuttle_manipulator/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)
+/obj/machinery/shuttle_manipulator/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_admin_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "shuttle_manipulator", name, 800, 600, master_ui, state)
+		ui = new(user, src, ui_key, "ShuttleManipulator", name, 800, 600, master_ui, state)
 		ui.open()

 /proc/shuttlemode2str(mode)
@@ -220,10 +220,10 @@
 	var/area_aim = FALSE //should also show areas for targeting

 /obj/machinery/computer/bsa_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.physical_state)
+										datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_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, 400, 220, master_ui, state)
 		ui.open()

 /obj/machinery/computer/bsa_control/ui_data()
@@ -174,11 +174,11 @@
 	. = ..()


-/obj/machinery/dna_vault/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)
+/obj/machinery/dna_vault/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_physical_state)
 	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, 350, 400, master_ui, state)
 		ui.open()


@@ -42,10 +42,10 @@
 	circuit = /obj/item/circuitboard/computer/sat_control
 	var/notice

-/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)
+/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/tgui_state/state = GLOB.tgui_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, 400, 305, master_ui, state)
 		ui.open()

 /obj/machinery/computer/sat_control/ui_act(action, params)
--- a/Show More
+++ b/Show More