Merge pull request #3378 from Donkie/jobrefactor

Jobcode refactoring TAKE TWO

code/modules/admin/verbs/debug.dm

@@ -470,7 +470,7 @@ var/global/list/g_fancy_list_of_safe_types = null
 			id.access = get_all_accesses()+get_all_centcom_access()+get_all_syndicate_access()
 			id.registered_name = H.real_name
 			id.assignment = "Captain"
-			id.name = "[id.registered_name]'s ID Card ([id.assignment])"
+			id.update_label()
 
 			if(worn)
 				if(istype(worn,/obj/item/device/pda))
@@ -665,14 +665,14 @@ var/global/list/g_fancy_list_of_safe_types = null
 			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(M), slot_shoes)
 
 			var/obj/item/weapon/card/id/W = new(M)
-			W.name = "[M.real_name]'s ID Card (Assistant)"
 			W.assignment = "Assistant"
 			W.registered_name = M.real_name
+			W.update_label()
 			M.equip_to_slot_or_del(W, slot_wear_id)
 			var/obj/item/device/pda/P = new(M)
 			P.owner = M.real_name
 			P.ownjob = "Assistant"
-			P.name = "PDA-[M.real_name] (Assistant)"
+			P.update_label()
 			M.equip_to_slot_or_del(P, slot_belt)
 
 
@@ -805,10 +805,10 @@ var/global/list/g_fancy_list_of_safe_types = null
 			M.equip_to_slot_or_del(new /obj/item/weapon/bikehorn(M), slot_r_store)
 
 			var/obj/item/weapon/card/id/W = new(M)
-			W.name = "[M.real_name]'s ID Card"
 			W.access = get_all_accesses()
 			W.assignment = "Tunnel Clown!"
 			W.registered_name = M.real_name
+			W.update_label(M.real_name)
 			M.equip_to_slot_or_del(W, slot_wear_id)
 
 			var/obj/item/weapon/twohanded/fireaxe/fire_axe = new(M)
@@ -856,15 +856,15 @@ var/global/list/g_fancy_list_of_safe_types = null
 			var/obj/item/device/pda/heads/pda = new(M)
 			pda.owner = M.real_name
 			pda.ownjob = "Reaper"
-			pda.name = "PDA-[M.real_name] ([pda.ownjob])"
+			pda.update_label()
 
 			M.equip_to_slot_or_del(pda, slot_belt)
 
 			var/obj/item/weapon/card/id/syndicate/W = new(M)
-			W.name = "[M.real_name]'s ID Card"
 			W.access = get_all_accesses()
 			W.assignment = "Reaper"
 			W.registered_name = M.real_name
+			W.update_label(M.real_name)
 			M.equip_to_slot_or_del(W, slot_wear_id)
 // DEATH SQUADS
 		if("death commando")//Was looking to add this for a while.
@@ -904,12 +904,12 @@ var/global/list/g_fancy_list_of_safe_types = null
 			L.implanted = 1
 
 			var/obj/item/weapon/card/id/W = new(M)
-			W.name = "[M.real_name]'s ID Card"
 			W.icon_state = "centcom"
 			W.access = get_all_accesses()//They get full station access.
 			W.access += get_centcom_access("Death Commando")//Let's add their alloted Centcom access.
 			W.assignment = "Death Commando"
 			W.registered_name = M.real_name
+			W.update_label(M.real_name)
 			M.equip_to_slot_or_del(W, slot_wear_id)
 /*
 		if("syndicate commando")
@@ -927,18 +927,18 @@ var/global/list/g_fancy_list_of_safe_types = null
 			var/obj/item/device/pda/heads/pda = new(M)
 			pda.owner = M.real_name
 			pda.ownjob = "Centcom Official"
-			pda.name = "PDA-[M.real_name] ([pda.ownjob])"
+			pda.update_label()
 
 			M.equip_to_slot_or_del(pda, slot_r_store)
 
 			M.equip_to_slot_or_del(new /obj/item/weapon/clipboard(M), slot_l_hand)
 
 			var/obj/item/weapon/card/id/W = new(M)
-			W.name = "[M.real_name]'s ID Card (Centcom Official)"
 			W.icon_state = "centcom"
 			W.access = get_centcom_access("Centcom Official")
 			W.assignment = "Centcom Official"
 			W.registered_name = M.real_name
+			W.update_label()
 			M.equip_to_slot_or_del(W, slot_wear_id)
 
 		if("centcom commander")
@@ -955,12 +955,12 @@ var/global/list/g_fancy_list_of_safe_types = null
 			M.equip_to_slot_or_del(new /obj/item/ammo_box/a357(M), slot_l_store)
 
 			var/obj/item/weapon/card/id/W = new(M)
-			W.name = "[M.real_name]'s ID Card (Centcom Commander)"
 			W.icon_state = "centcom"
 			W.access = get_all_accesses()
 			W.access += get_centcom_access("Centcom Commander")
 			W.assignment = "Centcom Commander"
 			W.registered_name = M.real_name
+			W.update_label()
 			M.equip_to_slot_or_del(W, slot_wear_id)
 
 		if("special ops officer")
@@ -980,12 +980,12 @@ var/global/list/g_fancy_list_of_safe_types = null
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(M), slot_back)
 
 			var/obj/item/weapon/card/id/W = new(M)
-			W.name = "[M.real_name]'s ID Card (Special Ops Officer)"
 			W.icon_state = "centcom"
 			W.access = get_all_accesses()
 			W.access += get_centcom_access("Special Ops Officer")
 			W.assignment = "Special Ops Officer"
 			W.registered_name = M.real_name
+			W.update_label()
 			M.equip_to_slot_or_del(W, slot_wear_id)
 
 		if("blue wizard")
@@ -1023,6 +1023,7 @@ var/global/list/g_fancy_list_of_safe_types = null
 			M.equip_to_slot_or_del(new /obj/item/weapon/staff(M), slot_l_hand)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(M), slot_back)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/box(M), slot_in_backpack)
+
 		if("soviet admiral")
 			M.equip_to_slot_or_del(new /obj/item/clothing/head/hgpiratecap(M), slot_head)
 			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/swat/combat(M), slot_shoes)
@@ -1033,14 +1034,16 @@ var/global/list/g_fancy_list_of_safe_types = null
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(M), slot_back)
 			M.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/revolver/mateba(M), slot_belt)
 			M.equip_to_slot_or_del(new /obj/item/clothing/under/soviet(M), slot_w_uniform)
+
 			var/obj/item/weapon/card/id/W = new(M)
-			W.name = "[M.real_name]'s ID Card (Admiral)"
 			W.icon_state = "centcom"
 			W.access = get_all_accesses()
 			W.access += get_centcom_access("Admiral")
 			W.assignment = "Admiral"
 			W.registered_name = M.real_name
+			W.update_label()
 			M.equip_to_slot_or_del(W, slot_wear_id)
+
 		if("mobster")
 			M.equip_to_slot_or_del(new /obj/item/clothing/head/fedora(M), slot_head)
 			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(M), slot_shoes)
@@ -1049,10 +1052,11 @@ var/global/list/g_fancy_list_of_safe_types = null
 			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(M), slot_glasses)
 			M.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/automatic/tommygun(M), slot_r_hand)
 			M.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket/really_black(M), slot_w_uniform)
+
 			var/obj/item/weapon/card/id/W = new(M)
-			W.name = "[M.real_name]'s ID Card"
 			W.assignment = "Assistant"
 			W.registered_name = M.real_name
+			W.update_label()
 			M.equip_to_slot_or_del(W, slot_wear_id)
 
 

code/modules/admin/verbs/onlyone.dm

@@ -38,12 +38,12 @@
 		H.equip_to_slot_or_del(new /obj/item/weapon/pinpointer(H.loc), slot_l_store)
 
 		var/obj/item/weapon/card/id/W = new(H)
-		W.name = "[H.real_name]'s ID Card"
 		W.icon_state = "centcom"
 		W.access = get_all_accesses()
 		W.access += get_all_centcom_access()
 		W.assignment = "Highlander"
 		W.registered_name = H.real_name
+		W.update_label(H.real_name)
 		H.equip_to_slot_or_del(W, slot_wear_id)
 
 	message_admins("\blue [key_name_admin(usr)] used THERE CAN BE ONLY ONE!", 1)

code/modules/awaymissions/corpse.dm

@@ -66,7 +66,6 @@
 		M.equip_to_slot_or_del(new src.corpseback(M), slot_back)
 	if(src.corpseid == 1)
 		var/obj/item/weapon/card/id/W = new(M)
-		W.name = "[M.real_name]'s ID Card ([corpseidjob])"
 		var/datum/job/jobdatum
 		for(var/jobtype in typesof(/datum/job))
 			var/datum/job/J = new jobtype
@@ -83,6 +82,7 @@
 		if(corpseidjob)
 			W.assignment = corpseidjob
 		W.registered_name = M.real_name
+		W.update_label()
 		M.equip_to_slot_or_del(W, slot_wear_id)
 	qdel(src)
 

code/modules/mob/living/simple_animal/corpse.dm

@@ -60,7 +60,6 @@
 		M.equip_to_slot_or_del(new src.corpseback(M), slot_back)
 	if(src.corpseid == 1)
 		var/obj/item/weapon/card/id/W = new(M)
-		W.name = "[M.real_name]'s ID Card"
 		var/datum/job/jobdatum
 		for(var/jobtype in typesof(/datum/job))
 			var/datum/job/J = new jobtype
@@ -77,6 +76,7 @@
 		if(corpseidjob)
 			W.assignment = corpseidjob
 		W.registered_name = M.real_name
+		W.update_label()
 		M.equip_to_slot_or_del(W, slot_wear_id)
 	qdel(src)