Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

code/modules/pda/ai.dm

@@ -26,7 +26,7 @@
 	set name = "Use PDA"
 	set src in usr
 
-	if(!can_use())
+	if(!can_use(usr))
 		return
 	tgui_interact(usr)
 

code/modules/pda/messenger.dm

@@ -109,7 +109,7 @@
 
 // Specifically here for the chat message.
 /datum/data/pda/app/messenger/Topic(href, href_list)
-	if(!pda.can_use())
+	if(!pda.can_use(usr))
 		return
 	unnotify()
 
@@ -140,7 +140,7 @@
 	if(last_text && world.time < last_text + 5)
 		return
 
-	if(!pda.can_use())
+	if(!pda.can_use(usr))
 		return
 
 	last_text = world.time

code/modules/pda/pda.dm

@@ -147,16 +147,8 @@ var/global/list/obj/item/device/pda/PDAs = list()
 			log_debug("Invalid switch for PDA, defaulting to old PDA icons. [pdachoice] chosen.")
 	start_program(find_program(/datum/data/pda/app/main_menu))
 
-/obj/item/device/pda/proc/can_use()
-	if(!ismob(loc))
-		return FALSE
-
-	var/mob/M = loc
-	if(M.incapacitated(INCAPACITATION_ALL))
-		return FALSE
-	if(src in M.contents)
-		return TRUE
-	return FALSE
+/obj/item/device/pda/proc/can_use(mob/user)
+	return (tgui_status(user, GLOB.tgui_inventory_state) == STATUS_INTERACTIVE)
 
 /obj/item/device/pda/GetAccess()
 	if(id)
@@ -169,7 +161,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 
 /obj/item/device/pda/MouseDrop(obj/over_object as obj, src_location, over_location)
 	var/mob/M = usr
-	if((!istype(over_object, /obj/screen)) && can_use())
+	if((!istype(over_object, /obj/screen)) && can_use(usr))
 		return attack_self(M)
 	return
 

code/modules/pda/pda_tgui.dm

@@ -2,11 +2,6 @@
 /obj/item/device/pda/tgui_state(mob/user)
 	return GLOB.tgui_inventory_state
 
-/obj/item/device/pda/tgui_status(mob/user, datum/tgui_state/state)
-	. = ..()
-	if(!can_use())
-		. = min(., STATUS_UPDATE)
-
 /obj/item/device/pda/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui)
 	ui = SStgui.try_update_ui(user, src, ui)
 	if(!ui)
@@ -50,6 +45,7 @@
 	data["idLink"] = (id ? text("[id.registered_name], [id.assignment]") : "--------")
 
 	data["useRetro"] = retro_mode
+	data["touch_silent"] = touch_silent
 
 	data["cartridge_name"] = cartridge ? cartridge.name : ""
 	data["stationTime"] = stationtime2text() //worldtime2stationtime(world.time) // Aaa which fucking one is canonical there's SO MANY
@@ -68,12 +64,6 @@
 	if(..())
 		return TRUE
 
-	if(!can_use())
-		usr.unset_machine()
-		if(ui)
-			ui.close()
-		return FALSE
-
 	add_fingerprint(usr)
 	usr.set_machine(src)
 
@@ -113,6 +103,8 @@
 			id_check(usr, 1)
 		if("Retro")
 			retro_mode = !retro_mode
+		if("TouchSounds")
+			touch_silent = !touch_silent
 		if("Ringtone")
 			return set_ringtone()
 		else