dog tags are now properly named as dog tags

code/__HELPERS/unsorted.dm

@@ -318,7 +318,7 @@
 				var/obj/item/card/id/ID = A
 				if(ID.registered_name == oldname)
 					ID.registered_name = newname
-					ID.name = "[newname]'s ID Card ([ID.assignment])"
+					ID.name = "[newname]'s [ID.card_name] ([ID.assignment])"
 					if(!search_pda) break
 					search_id = 0
 	return 1

code/game/jobs/job/marine/squads.dm

@@ -360,7 +360,7 @@
 			continue
 
 		marine_card.assignment = "[new_name] [marine.job]"
-		marine_card.name = "[marine_card.registered_name]'s ID Card ([marine_card.assignment])"
+		marine_card.name = "[marine_card.registered_name]'s [marine_card.card_name] ([marine_card.assignment])"
 
 /datum/squad/proc/setup_supply_drop_list()
 	SIGNAL_HANDLER
@@ -607,7 +607,7 @@
 
 	if(paygrade)
 		C.paygrade = paygrade
-	C.name = "[C.registered_name]'s ID Card ([C.assignment])"
+	C.name = "[C.registered_name]'s [C.card_name] ([C.assignment])"
 
 	var/obj/item/device/radio/headset/almayer/marine/headset = locate() in list(M.wear_l_ear, M.wear_r_ear)
 	if(headset && radio_freq)
@@ -629,7 +629,7 @@
 
 	C.access -= src.access
 	C.assignment = M.assigned_equipment_preset.assignment
-	C.name = "[C.registered_name]'s ID Card ([C.assignment])"
+	C.name = "[C.registered_name]'s [C.card_name] ([C.assignment])"
 
 	forget_marine_in_squad(M)
 

code/game/objects/items/cards_ids.dm

@@ -92,6 +92,8 @@
 
 	var/modification_log = list()
 
+	var/card_name = "ID Card"
+
 /obj/item/card/id/Initialize(mapload, ...)
 	. = ..()
 
@@ -132,7 +134,7 @@
 
 /obj/item/card/id/proc/set_assignment(new_assignment)
 	assignment = new_assignment
-	name = "[registered_name]'s ID Card ([assignment])"
+	name = "[registered_name]'s [card_name] ([assignment])"
 
 /obj/item/card/id/GetAccess()
 	return access
@@ -279,7 +281,7 @@
 	else
 		registered_name = "Agent Card"
 	assignment = "Agent"
-	name = "[registered_name]'s ID Card ([assignment])"
+	name = "[registered_name]'s [card_name] ([assignment])"
 
 /obj/item/card/id/syndicate/afterattack(obj/item/O as obj, mob/user as mob, proximity)
 	if(!proximity) return
@@ -304,7 +306,7 @@
 			src.registered_name = ""
 			return
 		src.assignment = u
-		src.name = "[src.registered_name]'s ID Card ([src.assignment])"
+		src.name = "[src.registered_name]'s [card_name] ([src.assignment])"
 		to_chat(user, SPAN_NOTICE(" You successfully forge the ID card."))
 		registered_user = user
 	else if(!registered_user || registered_user == user)
@@ -324,7 +326,7 @@
 					alert("Invalid assignment.")
 					return
 				src.assignment = u
-				src.name = "[src.registered_name]'s ID Card ([src.assignment])"
+				src.name = "[src.registered_name]'s [card_name] ([src.assignment])"
 				to_chat(user, SPAN_NOTICE(" You successfully forge the ID card."))
 				return
 			if("Show")
@@ -387,6 +389,7 @@
 	item_state = "dogtag"
 	pinned_on_uniform = FALSE
 	var/dogtag_taken = FALSE
+	card_name = "dog tags"
 
 
 /obj/item/card/id/dogtag/get_examine_text(mob/user)

code/modules/admin/verbs/select_equipment.dm

@@ -22,7 +22,7 @@
 			I.access = J.get_access()
 			I.rank = J.title
 			I.assignment = J.disp_title
-			I.name = "[I.registered_name]'s ID Card ([I.assignment])"
+			I.name = "[I.registered_name]'s [I.card_name] ([I.assignment])"
 			I.paygrade = J.get_paygrade()
 			if(H.w_uniform)
 				var/obj/item/clothing/C = H.w_uniform
@@ -81,7 +81,7 @@
 
 					I.rank = IDtitle
 					I.assignment = IDtitle
-					I.name = "[I.registered_name]'s ID Card ([I.assignment])"
+					I.name = "[I.registered_name]'s [I.card_name] ([I.assignment])"
 
 				var/new_faction = tgui_input_list(usr, "Select faction.", "Faction Choice", FACTION_LIST_HUMANOID)
 				if(!new_faction)

code/modules/cm_marines/marines_consoles.dm

@@ -137,7 +137,7 @@
 			if(target_id_card)
 				if(target_id_card.registered_name != origin_name || target_id_card.assignment != origin_assignment)
 					GLOB.data_core.manifest_modify(target_id_card.registered_name, target_id_card.registered_ref, target_id_card.assignment, target_id_card.rank)
-					target_id_card.name = text("[target_id_card.registered_name]'s ID Card ([target_id_card.assignment])")
+					target_id_card.name = text("[target_id_card.registered_name]'s [target_id_card.card_name] ([target_id_card.assignment])")
 					if(target_id_card.registered_name != origin_name)
 						log_idmod(target_id_card, "<font color='orange'> [key_name_admin(usr)] changed the registered name of the ID to '[target_id_card.registered_name]'. </font>")
 					if(target_id_card.assignment != origin_assignment)
@@ -451,7 +451,7 @@
 			usr.put_in_hands(target_id_card)
 		if(operable()) // Powered. Make comp proceed ejection
 			GLOB.data_core.manifest_modify(target_id_card.registered_name, target_id_card.registered_ref, target_id_card.assignment, target_id_card.rank)
-			target_id_card.name = text("[target_id_card.registered_name]'s ID Card ([target_id_card.assignment])")
+			target_id_card.name = text("[target_id_card.registered_name]'s [target_id_card.card_name] ([target_id_card.assignment])")
 			visible_message("[SPAN_BOLD("[src]")] states, \"CARD EJECT: Data imprinted. Updating database... Success.\"")
 		else
 			to_chat(usr, "You remove \the [target_id_card] from \the [src].")

code/modules/gear_presets/_select_equipment.dm

@@ -111,7 +111,7 @@
 	if(!idtype)
 		return
 	var/obj/item/card/id/ID = new idtype()
-	ID.name = "[new_human.real_name]'s ID Card"
+	ID.name = "[new_human.real_name]'s [ID.card_name]"
 	if(assignment)
 		ID.name += " ([assignment])"
 	ID.access = access.Copy(1, 0)