Modular PDAs: The End of an Era (#10319)

PDAs are dead, long live PDAs. All trace of old PDAs has been scoured from the codebase, and in its place are modular computer PDAs that are feature-equivalent. Essentially every PDA function except the Syndicate detonation feature and Notepad has been ported over, and battery life for handheld computers has been boosted alongside the addition of charging cables to make things easier.

code/game/objects/items/devices/PDA/cart.dm

@@ -1,557 +0,0 @@
-/obj/item/cartridge
-	name = "generic cartridge"
-	desc = "A data cartridge for portable microcomputers."
-	icon = 'icons/obj/cartridge.dmi'
-	icon_state = "cart"
-	item_state = "electronic"
-	w_class = ITEMSIZE_TINY
-	drop_sound = 'sound/items/drop/component.ogg'
-	pickup_sound = 'sound/items/pickup/component.ogg'
-
-	var/obj/item/radio/integrated/radio = null
-	var/access_security = 0
-	var/access_engine = 0
-	var/access_atmos = 0
-	var/access_medical = 0
-	var/access_clown = 0
-	var/access_mime = 0
-	var/access_janitor = 0
-//	var/access_flora = 0
-	var/access_reagent_scanner = 0
-	var/access_remote_door = 0 // Control some blast doors remotely!!
-	var/remote_door_id = ""
-	var/access_status_display = 0
-	var/access_quartermaster = 0
-	var/access_detonate_pda = 0
-	var/access_hydroponics = 0
-	var/charges = 0
-	var/mode = null
-	var/menu
-	var/datum/record/general/active = null //General
-	var/list/listify_cache
-	var/selected_sensor = null // Power Sensor
-	var/message1	// used for status_displays
-	var/message2
-	var/list/stored_data = list()
-
-/obj/item/cartridge/Destroy()
-	QDEL_NULL(radio)
-	return ..()
-
-/obj/item/cartridge/engineering
-	name = "\improper Power-ON cartridge"
-	icon_state = "cart-e"
-	access_engine = 1
-
-/obj/item/cartridge/atmos
-	name = "\improper BreatheDeep cartridge"
-	icon_state = "cart-a"
-	access_atmos = 1
-
-/obj/item/cartridge/medical
-	name = "\improper Med-U cartridge"
-	icon_state = "cart-m"
-	access_medical = 1
-
-/obj/item/cartridge/chemistry
-	name = "\improper ChemWhiz cartridge"
-	icon_state = "cart-chem"
-	access_reagent_scanner = 1
-
-/obj/item/cartridge/security
-	name = "\improper R.O.B.U.S.T. cartridge"
-	icon_state = "cart-s"
-	access_security = 1
-
-/obj/item/cartridge/security/Initialize()
-	. = ..()
-	radio = new /obj/item/radio/integrated/beepsky(src)
-
-/obj/item/cartridge/detective
-	name = "\improper D.E.T.E.C.T. cartridge"
-	icon_state = "cart-s"
-	access_security = 1
-	access_medical = 1
-
-
-/obj/item/cartridge/janitor
-	name = "\improper CustodiPRO cartridge"
-	desc = "The ultimate in clean-room design."
-	icon_state = "cart-j"
-	access_janitor = 1
-
-/obj/item/cartridge/lawyer
-	name = "\improper P.R.O.V.E. cartridge"
-	icon_state = "cart-s"
-	access_security = 1
-
-/obj/item/cartridge/clown
-	name = "\improper Honkworks 5.0 cartridge"
-	icon_state = "cart-clown"
-	access_clown = 1
-	charges = 5
-
-/obj/item/cartridge/mime
-	name = "\improper Gestur-O 1000 cartridge"
-	icon_state = "cart-mi"
-	access_mime = 1
-	charges = 5
-/*
-/obj/item/cartridge/botanist
-	name = "Green Thumb v4.20"
-	icon_state = "cart-b"
-	access_flora = 1
-*/
-
-/obj/item/cartridge/signal
-	name = "generic signaler cartridge"
-	desc = "A data cartridge with an integrated radio signaler module."
-
-/obj/item/cartridge/signal/science
-	name = "\improper Signal Ace 2 cartridge"
-	desc = "Complete with integrated radio signaler!"
-	icon_state = "cart-tox"
-	access_reagent_scanner = 1
-	access_atmos = 1
-
-/obj/item/cartridge/signal/Initialize()
-    . = ..()
-    radio = new /obj/item/radio/integrated/signal(src)
-
-/obj/item/cartridge/quartermaster
-	name = "\improper Space Parts & Space Vendors cartridge"
-	desc = "Perfect for the Quartermaster on the go!"
-	icon_state = "cart-q"
-	access_quartermaster = 1
-
-/obj/item/cartridge/quartermaster/Initialize()
-	. = ..()
-	radio = new /obj/item/radio/integrated/mule(src)
-
-/obj/item/cartridge/head
-	name = "\improper Easy-Record DELUXE"
-	icon_state = "cart-h"
-	access_status_display = 1
-
-/obj/item/cartridge/hop
-	name = "\improper HumanResources9001 cartridge"
-	icon_state = "cart-h"
-	access_status_display = 1
-	access_quartermaster = 1
-	access_janitor = 1
-	access_security = 1
-
-/obj/item/cartridge/hop/Initialize()
-	. = ..()
-	radio = new /obj/item/radio/integrated/mule(src)
-
-/obj/item/cartridge/hos
-	name = "\improper R.O.B.U.S.T. DELUXE"
-	icon_state = "cart-hos"
-	access_status_display = 1
-	access_security = 1
-
-/obj/item/cartridge/hos/Initialize()
-	. = ..()
-	radio = new /obj/item/radio/integrated/beepsky(src)
-
-/obj/item/cartridge/ce
-	name = "\improper Power-On DELUXE"
-	icon_state = "cart-ce"
-	access_status_display = 1
-	access_engine = 1
-	access_atmos = 1
-
-/obj/item/cartridge/cmo
-	name = "\improper Med-U DELUXE"
-	icon_state = "cart-cmo"
-	access_status_display = 1
-	access_reagent_scanner = 1
-	access_medical = 1
-
-/obj/item/cartridge/rd
-	name = "\improper Signal Ace DELUXE"
-	icon_state = "cart-rd"
-	access_status_display = 1
-	access_reagent_scanner = 1
-	access_atmos = 1
-
-/obj/item/cartridge/rd/Initialize()
-	. = ..()
-	radio = new /obj/item/radio/integrated/signal(src)
-
-/obj/item/cartridge/captain
-	name = "\improper Value-PAK cartridge"
-	desc = "Now with 200% more value!"
-	icon_state = "cart-c"
-	access_quartermaster = 1
-	access_janitor = 1
-	access_engine = 1
-	access_security = 1
-	access_medical = 1
-	access_reagent_scanner = 1
-	access_status_display = 1
-	access_atmos = 1
-
-/obj/item/cartridge/syndicate
-	name = "\improper Detomatix cartridge"
-	icon_state = "cart"
-	access_remote_door = 1
-	access_detonate_pda = 1
-	remote_door_id = "smindicate" //Make sure this matches the syndicate shuttle's shield/door id!!	//don't ask about the name, testing.
-	charges = 4
-
-/obj/item/cartridge/proc/post_status(var/command, var/data1, var/data2)
-
-	var/datum/radio_frequency/frequency = SSradio.return_frequency(1435)
-	if(!frequency) return
-
-	var/datum/signal/status_signal = new
-	status_signal.source = src
-	status_signal.transmission_method = 1
-	status_signal.data["command"] = command
-
-	switch(command)
-		if("message")
-			status_signal.data["msg1"] = data1
-			status_signal.data["msg2"] = data2
-			if(loc)
-				var/obj/item/PDA = loc
-				var/mob/user = PDA.fingerprintslast
-				if(istype(PDA.loc,/mob/living))
-					name = PDA.loc
-				log_admin("STATUS: [user] set status screen with [PDA]. Message: [data1] [data2]")
-				message_admins("STATUS: [user] set status screen with [PDA]. Message: [data1] [data2]")
-
-		if("alert")
-			status_signal.data["picture_state"] = data1
-
-	frequency.post_signal(src, status_signal)
-
-
-/*
-	This generates the nano values of the cart menus.
-	Because we close the UI when we insert a new cart
-	we don't have to worry about null values on items
-	the user can't access.  Well, unless they are href hacking.
-	But in that case their UI will just lock up.
-*/
-
-
-/obj/item/cartridge/proc/create_NanoUI_values(mob/user as mob)
-	var/values[0]
-
-	/*		Signaler (Mode: 40)				*/
-
-
-	if(istype(radio,/obj/item/radio/integrated/signal) && (mode==40))
-		var/obj/item/radio/integrated/signal/R = radio
-		values["signal_freq"] = format_frequency(R.frequency)
-		values["signal_code"] = R.code
-
-
-	/*		Station Display (Mode: 42)			*/
-
-	if(mode==42)
-		values["message1"] = message1 ? message1 : "(none)"
-		values["message2"] = message2 ? message2 : "(none)"
-
-
-
-	/*		Power Monitor (Mode: 43 / 433)			*/
-
-	if(mode == 43 || mode == 433)
-		var/list/sensors = list()
-		var/obj/machinery/power/sensor/MS = null
-
-		for(var/obj/machinery/power/sensor/S in SSpower.all_sensors)
-			sensors.Add(list(list("name_tag" = S.name_tag)))
-			if(S.name_tag == selected_sensor)
-				MS = S
-		values["power_sensors"] = sensors
-		if(selected_sensor && MS)
-			values["sensor_reading"] = MS.return_reading_data()
-
-
-	/*		General Records (Mode: 44 / 441 / 45 / 451)	*/
-	if(mode == 44 || mode == 441 || mode == 45 || mode ==451)
-		if(istype(active, /datum/record/general) && (active in SSrecords.records))
-			LAZYINITLIST(listify_cache)
-			if(listify_cache["type"] != RECORD_GENERAL)
-				listify_cache["type"] = RECORD_GENERAL
-				listify_cache["data"] = active.Listify()
-			values["general"] = listify_cache["data"]
-			values["general_exists"] = 1
-
-		else
-			values["general_exists"] = 0
-
-
-
-	/*		Medical Records (Mode: 44 / 441)	*/
-
-	if(mode == 44 || mode == 441)
-		var/medData[0]
-		for(var/datum/record/general/R in sortRecord(SSrecords.records))
-			medData += list(list(Name = R.name,"ref" = "\ref[R]"))
-		values["medical_records"] = medData
-
-		if(istype(active, /datum/record/general) && (active in SSrecords.records) && istype(active.medical, /datum/record/medical))
-			LAZYINITLIST(listify_cache)
-			if(listify_cache["type"] != RECORD_MEDICAL)
-				listify_cache["type"] = RECORD_MEDICAL
-				listify_cache["data"] = active.Listify(0)
-				listify_cache["data"] += active.medical.Listify()
-			values["medical"] = listify_cache["data"]
-			values["medical_exists"] = 1
-		else
-			values["medical_exists"] = 0
-
-	/*		Security Records (Mode:45 / 451)	*/
-
-	if(mode == 45 || mode == 451)
-		var/secData[0]
-		for(var/datum/record/general/R in sortRecord(SSrecords.records))
-			secData += list(list(Name = R.name,"ref" = "\ref[R]"))
-		values["security_records"] = secData
-
-		if(istype(active, /datum/record/general) && (active in SSrecords.records) && istype(active.security, /datum/record/security))
-			LAZYINITLIST(listify_cache)
-			if(listify_cache["type"] != RECORD_SECURITY)
-				listify_cache["type"] = RECORD_SECURITY
-				listify_cache["data"] = active.Listify(0)
-				listify_cache["data"] += active.security.Listify()
-			values["security"] = listify_cache["data"]
-			values["security_exists"] = 1
-		else
-			values["security_exists"] = 0
-
-	/*		Security Bot Control (Mode: 46)		*/
-
-	if(mode==46)
-		var/botsData[0]
-		var/beepskyData[0]
-		if(istype(radio,/obj/item/radio/integrated/beepsky))
-			var/obj/item/radio/integrated/beepsky/SC = radio
-			beepskyData["active"] = SC.active
-			if(SC.active && !isnull(SC.botstatus))
-				var/area/loca = SC.botstatus["loca"]
-				var/loca_name = sanitize(loca.name)
-				beepskyData["botstatus"] = list("loca" = loca_name, "mode" = SC.botstatus["mode"])
-			else
-				beepskyData["botstatus"] = list("loca" = null, "mode" = -1)
-			var/botsCount=0
-			if(SC.botlist && SC.botlist.len)
-				for(var/mob/living/bot/B in SC.botlist)
-					botsCount++
-					if(B.loc)
-						botsData[++botsData.len] = list("Name" = sanitize(B.name), "Location" = sanitize(B.loc.loc.name), "ref" = "\ref[B]")
-
-			if(!botsData.len)
-				botsData[++botsData.len] = list("Name" = "No bots found", "Location" = "Invalid", "ref"= null)
-
-			beepskyData["bots"] = botsData
-			beepskyData["count"] = botsCount
-
-		else
-			beepskyData["active"] = 0
-			botsData[++botsData.len] = list("Name" = "No bots found", "Location" = "Invalid", "ref"= null)
-			beepskyData["botstatus"] = list("loca" = null, "mode" = null)
-			beepskyData["bots"] = botsData
-			beepskyData["count"] = 0
-
-		values["beepsky"] = beepskyData
-
-
-	/*		MULEBOT Control	(Mode: 48)		*/
-
-	if(mode==48)
-		var/muleData[0]
-		var/mulebotsData[0]
-		if(istype(radio,/obj/item/radio/integrated/mule))
-			var/obj/item/radio/integrated/mule/QC = radio
-			muleData["active"] = QC.active
-			if(QC.active && !isnull(QC.botstatus))
-				var/area/loca = QC.botstatus["loca"]
-				var/loca_name = sanitize(loca.name)
-				muleData["botstatus"] =  list("loca" = loca_name, "mode" = QC.botstatus["mode"],"home"=QC.botstatus["home"],"powr" = QC.botstatus["powr"],"retn" =QC.botstatus["retn"], "pick"=QC.botstatus["pick"], "load" = QC.botstatus["load"], "dest" = sanitize(QC.botstatus["dest"]))
-
-			else
-				muleData["botstatus"] = list("loca" = null, "mode" = -1,"home"=null,"powr" = null,"retn" =null, "pick"=null, "load" = null, "dest" = null)
-
-
-			var/mulebotsCount=0
-			for(var/obj/machinery/bot/B in QC.botlist)
-				mulebotsCount++
-				if(B.loc)
-					mulebotsData[++mulebotsData.len] = list("Name" = sanitize(B.name), "Location" = sanitize(B.loc.loc.name), "ref" = "\ref[B]")
-
-			if(!mulebotsData.len)
-				mulebotsData[++mulebotsData.len] = list("Name" = "No bots found", "Location" = "Invalid", "ref"= null)
-
-			muleData["bots"] = mulebotsData
-			muleData["count"] = mulebotsCount
-
-		else
-			muleData["botstatus"] =  list("loca" = null, "mode" = -1,"home"=null,"powr" = null,"retn" =null, "pick"=null, "load" = null, "dest" = null)
-			muleData["active"] = 0
-			mulebotsData[++mulebotsData.len] = list("Name" = "No bots found", "Location" = "Invalid", "ref"= null)
-			muleData["bots"] = mulebotsData
-			muleData["count"] = 0
-
-		values["mulebot"] = muleData
-
-
-
-	/*	Supply Shuttle Requests Menu (Mode: 47)		*/
-
-	if(mode==47)
-		var/supplyData[0]
-		var/datum/shuttle/autodock/ferry/supply/shuttle = SScargo.shuttle
-		if (shuttle)
-			supplyData["shuttle_moving"] = shuttle.has_arrive_time()
-			supplyData["shuttle_eta"] = shuttle.eta_minutes()
-			supplyData["shuttle_loc"] = shuttle.at_station() ? "Station" : "Dock"
-		var/list/approved_orders = SScargo.get_orders_by_status("approved",1)
-		supplyData["approved"] = approved_orders
-		supplyData["approved_count"] = approved_orders.len
-
-		var/list/requested_orders = SScargo.get_orders_by_status("submitted",1)
-		supplyData["requests"] = requested_orders
-		supplyData["requests_count"] = requested_orders.len
-
-		values["supply"] = supplyData
-
-
-
-	/* 	Janitor Supplies Locator  (Mode: 49)      */
-	if(mode==49)
-		var/JaniData[0]
-		var/turf/cl = get_turf(src)
-
-		if(cl)
-			JaniData["user_loc"] = list("x" = cl.x, "y" = cl.y)
-		else
-			JaniData["user_loc"] = list("x" = 0, "y" = 0)
-		var/MopData[0]
-		for(var/obj/item/mop/M in global.janitorial_supplies)
-			var/turf/ml = get_turf(M)
-			if(ml)
-				if(ml.z != cl.z)
-					continue
-				var/direction = get_dir(src, M)
-				MopData[++MopData.len] = list ("x" = ml.x, "y" = ml.y, "dir" = uppertext(dir2text(direction)), "status" = M.reagents.total_volume ? "Wet" : "Dry")
-
-		if(!MopData.len)
-			MopData[++MopData.len] = list("x" = 0, "y" = 0, dir=null, status = null)
-
-		var/BucketData[0]
-		for(var/obj/structure/mopbucket/B in global.janitorial_supplies)
-			var/turf/bl = get_turf(B)
-			if(bl)
-				if(bl.z != cl.z)
-					continue
-				var/direction = get_dir(src,B)
-				BucketData[++BucketData.len] = list ("x" = bl.x, "y" = bl.y, "dir" = uppertext(dir2text(direction)), "status" = B.reagents.total_volume/100)
-
-		if(!BucketData.len)
-			BucketData[++BucketData.len] = list("x" = 0, "y" = 0, dir=null, status = null)
-
-		var/CbotData[0]
-		for(var/mob/living/bot/cleanbot/B in global.janitorial_supplies)
-			var/turf/bl = get_turf(B)
-			if(bl)
-				if(bl.z != cl.z)
-					continue
-				var/direction = get_dir(src,B)
-				CbotData[++CbotData.len] = list("x" = bl.x, "y" = bl.y, "dir" = uppertext(dir2text(direction)), "status" = B.on ? "Online" : "Offline")
-
-		if(!CbotData.len)
-			CbotData[++CbotData.len] = list("x" = 0, "y" = 0, dir=null, status = null)
-		var/CartData[0]
-		for(var/obj/structure/janitorialcart/B in global.janitorial_supplies)
-			var/turf/bl = get_turf(B)
-			if(bl)
-				if(bl.z != cl.z)
-					continue
-				var/direction = get_dir(src,B)
-				CartData[++CartData.len] = list("x" = bl.x, "y" = bl.y, "dir" = uppertext(dir2text(direction)), "status" = B.get_short_status())
-		if(!CartData.len)
-			CartData[++CartData.len] = list("x" = 0, "y" = 0, dir=null, status = null)
-
-		JaniData["mops"] = MopData
-		JaniData["buckets"] = BucketData
-		JaniData["cleanbots"] = CbotData
-		JaniData["carts"] = CartData
-		values["janitor"] = JaniData
-
-	return values
-
-
-/obj/item/cartridge/Topic(href, href_list)
-	..()
-
-	if (!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr))
-		usr.unset_machine()
-		usr << browse(null, "window=pda")
-		return
-
-
-
-
-	switch(href_list["choice"])
-		if("Medical Records")
-			var/datum/record/general/R = locate(href_list["target"])
-			loc:mode = 441
-			mode = 441
-			if ((R in SSrecords.records) && istype(R))
-				active = R
-
-		if("Security Records")
-			var/datum/record/general/R = locate(href_list["target"])
-			loc:mode = 451
-			mode = 451
-			if ((R in SSrecords.records) && istype(R))
-				active = R
-
-		if("Send Signal")
-			spawn( 0 )
-				radio:send_signal("ACTIVATE")
-				return
-
-		if("Signal Frequency")
-			var/new_frequency = sanitize_frequency(radio:frequency + text2num(href_list["sfreq"]))
-			radio:set_frequency(new_frequency)
-
-		if("Signal Code")
-			radio:code += text2num(href_list["scode"])
-			radio:code = round(radio:code)
-			radio:code = min(100, radio:code)
-			radio:code = max(1, radio:code)
-
-		if("Status")
-			switch(href_list["statdisp"])
-				if("message")
-					post_status("message", message1, message2)
-				if("alert")
-					post_status("alert", href_list["alert"])
-				if("setmsg1")
-					message1 = reject_bad_text(sanitize(input("Line 1", "Enter Message Text", message1) as text|null, 40), 40)
-					updateSelfDialog()
-				if("setmsg2")
-					message2 = reject_bad_text(sanitize(input("Line 2", "Enter Message Text", message2) as text|null, 40), 40)
-					updateSelfDialog()
-				else
-					post_status(href_list["statdisp"])
-
-		if("Power Select")
-			selected_sensor = href_list["target"]
-			loc:mode = 433
-			mode = 433
-		if("Power Clear")
-			selected_sensor = null
-			loc:mode = 43
-			mode = 43
-
-
-	return 1

code/game/objects/items/devices/PDA/chatroom.dm

@@ -1,16 +0,0 @@
-var/list/chatrooms = list()
-
-/datum/chatroom
-	var/name = "Generic Chatroom"
-	var/list/logged_in = list()
-	var/list/logs = list() // chat logs
-	var/list/banned = list() // banned users
-	var/list/whitelist = list() // whitelisted users
-	var/list/muted = list()
-	var/topic = "" // topic message for the chatroom
-	var/password = "" // blank for no password.
-	var/operator = "" // name of the operator
-
-/datum/chatroom/proc/attempt_connect(var/obj/item/device/pda/device, var/obj/password)
-	if(!device)
-		return

code/game/objects/items/devices/PDA/radio.dm

@@ -3,14 +3,14 @@
 	desc = "An electronic radio system."
 	icon = 'icons/obj/module.dmi'
 	icon_state = "power_mod"
-	var/obj/item/device/pda/hostpda = null
+	var/obj/item/modular_computer/hostpda = null
 
 	var/on = 0 //Are we currently active??
 	var/menu_message = ""
 
 /obj/item/radio/integrated/Initialize()
 	. = ..()
-	if (istype(loc.loc, /obj/item/device/pda))
+	if (istype(loc.loc, /obj/item/modular_computer))
 		hostpda = loc.loc
 
 /obj/item/radio/integrated/Destroy()
@@ -67,7 +67,7 @@
 
 /obj/item/radio/integrated/beepsky/Topic(href, href_list)
 	..()
-	var/obj/item/device/pda/PDA = src.hostpda
+	var/obj/item/modular_computer/PDA = src.hostpda
 
 	switch(href_list["op"])
 

code/game/objects/items/devices/uplink.dm

@@ -51,6 +51,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 	var/active = 0
 	var/datum/uplink_category/category 	= 0		// The current category we are in
 	var/exploit_id								// Id of the current exploit record we are viewing
+	var/pda_code = ""
 
 
 // The hidden uplink MUST be inside an obj/item's contents.

code/game/objects/items/devices/uplink_random_lists.dm

@@ -50,7 +50,6 @@ var/datum/uplink_random_selection/default_uplink_selection = new/datum/uplink_ra
 
 	items += new/datum/uplink_random_item(/datum/uplink_item/item/stealthy_weapons/soap, 5, 100)
 	items += new/datum/uplink_random_item(/datum/uplink_item/item/stealthy_weapons/concealed_cane, 50, 10)
-	items += new/datum/uplink_random_item(/datum/uplink_item/item/stealthy_weapons/detomatix, 20, 10)
 	items += new/datum/uplink_random_item(/datum/uplink_item/item/stealthy_weapons/parapen)
 	items += new/datum/uplink_random_item(/datum/uplink_item/item/stealthy_weapons/cigarette_kit)
 

code/game/objects/items/weapons/cards_ids.dm

@@ -127,6 +127,7 @@ var/const/NO_EMAG_ACT = -50
 	var/assignment = null	//can be alt title or the actual job
 	var/rank = null			//actual job
 	var/dorm = 0			// determines if this ID has claimed a dorm already
+	var/chat_registered = FALSE // registration for NTNET chat
 
 /obj/item/card/id/Destroy()
 	mob = null

code/game/objects/items/weapons/storage/belt.dm

@@ -159,7 +159,7 @@
 		/obj/item/clothing/glasses/hud/security,
 		/obj/item/device/flashlight/maglight,
 		/obj/item/device/flashlight/flare,
-		/obj/item/device/pda,
+		/obj/item/modular_computer/handheld,
 		/obj/item/device/radio/headset,
 		/obj/item/device/hailer,
 		/obj/item/device/megaphone,
@@ -222,7 +222,7 @@
 		/obj/item/ammo_magazine,
 		/obj/item/melee/baton,
 		/obj/item/device/flashlight,
-		/obj/item/device/pda,
+		/obj/item/modular_computer/handheld,
 		/obj/item/device/radio/headset,
 		/obj/item/melee,
 		/obj/item/shield/energy,
@@ -390,7 +390,7 @@
 		/obj/item/ammo_magazine,
 		/obj/item/melee/baton,
 		/obj/item/device/flashlight,
-		/obj/item/device/pda,
+		/obj/item/modular_computer/handheld,
 		/obj/item/device/radio/headset,
 		/obj/item/melee,
 		/obj/item/crowbar,

code/game/objects/items/weapons/storage/boxes.dm

@@ -11,7 +11,7 @@
  *		Prescription glasses and drinking glass boxes,
  *		Condiment bottle and silly cup boxes,
  *		Donkpocket and monkeycube boxes,
- *		ID and security PDA cart boxes,
+ *		ID boxes,
  *		Handcuff, mousetrap, and pillbottle boxes,
  *		Snap-pops,
  *		Replacement light boxes.
@@ -471,12 +471,6 @@
 	icon_state = "id"
 	starts_with = list(/obj/item/card/id = 7)
 
-/obj/item/storage/box/seccarts
-	name = "box of spare R.O.B.U.S.T. Cartridges"
-	desc = "A box full of R.O.B.U.S.T. Cartridges, used by Security."
-	icon_state = "pda"
-	starts_with = list(/obj/item/cartridge/security = 7)
-
 /obj/item/storage/box/handcuffs
 	name = "box of spare handcuffs"
 	desc = "A box full of handcuffs."

code/game/objects/items/weapons/tanks/tanks.dm

@@ -30,7 +30,7 @@
 	var/integrity = 3
 	var/volume = 70
 	var/manipulated_by = null		//Used by _onclick/hud/screen_objects.dm internals to determine if someone has messed with our tank or not.
-						//If they have and we haven't scanned it with the PDA or gas analyzer then we might just breath whatever they put in it.
+						//If they have and we haven't scanned it with a computer or handheld gas analyzer then we might just breath whatever they put in it.
 /obj/item/tank/Initialize()
 	. = ..()