ID Name and Guest Pass Terminal Tweaks (#15392)

code/modules/modular_computers/NTNet/NTNRC/user.dm

@@ -15,7 +15,7 @@
 /datum/ntnet_user/proc/generateUsernameIdCard(var/obj/item/card/id/card)
 	if(!card)
 		return "Unknown"
-	return "[card.registered_name] ([card.assignment])"
+	return "[card.registered_name], [card.assignment]"
 
 /datum/ntnet_user/proc/generateUsernameSilicon(var/mob/living/silicon/silicon)
 	return silicon.name

code/modules/modular_computers/computers/subtypes/dev_pda.dm

@@ -1,12 +1,12 @@
 /obj/item/modular_computer/handheld/pda
-	name = "PDA"
+	name = "\improper PDA"
 	lexical_name = "tablet"
-	desc = "The latest in portable microcomputer solutions from Thinktronic Systems, LTD."
+	desc = "A personal data assistant. The latest in portable microcomputer solutions from Thinktronic Systems LTD."
 	icon = 'icons/obj/pda.dmi'
 	item_icons = list(
 		slot_l_hand_str = 'icons/mob/items/device/lefthand_device.dmi',
 		slot_r_hand_str = 'icons/mob/items/device/righthand_device.dmi',
-		)
+	)
 	icon_state = "pda"
 	item_state = "electronic"
 	icon_state_screensaver = "off"
@@ -30,4 +30,4 @@
 	icon = 'icons/obj/pda_slate.dmi'
 
 /obj/item/modular_computer/handheld/pda/smart
-	icon = 'icons/obj/pda_smart.dmi'
+	icon = 'icons/obj/pda_smart.dmi'

code/modules/modular_computers/hardware/card_slot.dm

@@ -1,7 +1,7 @@
 /obj/item/computer_hardware/card_slot
 	name = "RFID card slot"
 	desc = "Slot that allows this computer to write data on RFID cards. Necessary for some programs to run properly."
-	power_usage = 10 //W
+	power_usage = 10 // W
 	critical = FALSE
 	icon_state = "cardreader"
 	hardware_size = 1
@@ -9,13 +9,14 @@
 
 	var/obj/item/card/id/stored_card
 
-	// Storing items (We PDAs now boys)
-	var/list/allowed_items = list(/obj/item/pen,
-								   /obj/item/lipstick,
-								   /obj/item/device/flashlight/pen,
-								   /obj/item/clothing/mask/smokable/cigarette
-								   )
-	var/obj/item/stored_item //Used for pen, crayon, and lipstick insertion/removal
+	// Storing Items
+	var/list/allowed_items = list(
+		/obj/item/pen,
+		/obj/item/lipstick,
+		/obj/item/device/flashlight/pen,
+		/obj/item/clothing/mask/smokable/cigarette
+	)
+	var/obj/item/stored_item // Used for pen insertion and removal.
 
 /obj/item/computer_hardware/card_slot/Destroy()
 	if(parent_computer?.card_slot == src)
@@ -35,7 +36,7 @@
 	if(parent_computer)
 		parent_computer.verbs += /obj/item/modular_computer/proc/eject_id
 		parent_computer.initial_name = parent_computer.name
-		parent_computer.name = "[parent_computer.name] ([id.registered_name] ([id.assignment]))"
+		parent_computer.name = "[parent_computer.name] - [id.registered_name], [id.assignment]"
 
 /obj/item/computer_hardware/card_slot/proc/eject_id(mob/user)
 	if(!stored_card)
@@ -48,4 +49,4 @@
 
 	if(parent_computer)
 		parent_computer.verbs -= /obj/item/modular_computer/proc/eject_id
-		parent_computer.name = parent_computer.initial_name
+		parent_computer.name = parent_computer.initial_name