fuuck

shiptest-ss13 · Mar 9, 2024 · 316c0eb · 316c0eb
1 parent e6a2bfe
commit 316c0eb
Show file tree

Hide file tree

Showing 18 changed files with 124 additions and 49 deletions.
diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm
@@ -168,6 +168,7 @@
 	if(mapload && access_txt)
 		access = text2access(access_txt)
 	update_label()
+	update_appearance()
 	RegisterSignal(src, COMSIG_ATOM_UPDATED_ICON, PROC_REF(update_in_wallet))
 
 /obj/item/card/id/Destroy()
@@ -421,7 +422,6 @@ update_label()
 /obj/item/card/id/proc/update_label()
 	var/blank = !registered_name
 	name = "[blank ? initial(name) : "[registered_name]'s ID Card"][(!assignment) ? "" : " ([assignment])"]"
-	update_appearance()
 
 /obj/item/card/id/silver
 	name = "silver identification card"

diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
@@ -206,6 +206,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			id.registered_name = H.real_name
 			id.assignment = "Captain"
 			id.update_label()
+			id.update_appearance()
 
 			if(worn)
 				if(istype(worn, /obj/item/pda))

diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm
@@ -148,8 +148,9 @@
 		card.job_icon = outfit.job_icon
 		card.faction_icon = outfit.faction_icon
 		card.assignment = J.name
+		card.update_appearance()
+		card.assignment = old_assignment
 		card.update_label()
-		card.name = "[!card.registered_name ? initial(card.name) : "[card.registered_name]'s ID Card"][" ([old_assignment])"]" // this is terrible, but whatever
 		H.sec_hud_set_ID()
 
 	qdel(outfit)

diff --git a/code/modules/clothing/outfits/ert/inteq_ert.dm b/code/modules/clothing/outfits/ert/inteq_ert.dm
@@ -1,5 +1,6 @@
 /datum/outfit/job/inteq/ert
 	name = "ERT - Inteq Rifleman"
+	id_assignment = "Enforcer"
 	jobtype = /datum/job/officer
 	job_icon = "securityofficer"
 
@@ -22,6 +23,7 @@
 
 /datum/outfit/job/inteq/ert/shotgun
 	name = "ERT - Inteq Shotgunner"
+	id_assignment = "Enforcer"
 
 	suit_store = /obj/item/gun/ballistic/shotgun/automatic/combat/compact
 	belt = /obj/item/storage/belt/security/webbing/inteq/alt
@@ -30,6 +32,7 @@
 
 /datum/outfit/job/inteq/ert/medic
 	name = "ERT - Inteq Corpsman"
+	id_assignment = "Corpsman"
 	jobtype = /datum/job/paramedic
 	job_icon = "paramedic"
 
@@ -43,6 +46,7 @@
 
 /datum/outfit/job/inteq/ert/leader
 	name = "ERT - Inteq Vanguard"
+	id_assignment = "Vanguard"
 	jobtype = /datum/job/hos
 	job_icon = "headofsecurity"
 

diff --git a/code/modules/clothing/outfits/ert/minutemen_ert.dm b/code/modules/clothing/outfits/ert/minutemen_ert.dm
@@ -1,5 +1,6 @@
 /datum/outfit/job/clip/minutemen/grunt/dressed/bard
 	name = "ERT - CLIP Minuteman BARD Specialist"
+	id_assignment = "Biohazard Assessment Specialist"
 	job_icon = "clip_cmm2"
 
 	suit = /obj/item/clothing/suit/armor/vest/marine/heavy
@@ -18,6 +19,7 @@
 
 /datum/outfit/job/clip/minutemen/grunt/dressed/bard/medic
 	name = "ERT - CLIP Minuteman BARD Medical Specialist"
+	id_assignment = "Corpsman"
 
 	suit = /obj/item/clothing/suit/armor/vest/marine
 	suit_store = /obj/item/gun/ballistic/automatic/smg/cm5
@@ -50,6 +52,7 @@
 
 /datum/outfit/job/clip/minutemen/grunt/dressed/bard/leader
 	name = "ERT - CLIP Minuteman BARD Specialist Sergeant"
+	id_assignment = "Biohazard Assessment Sergeant"
 	job_icon = "clip_cmm3"
 
 	belt = /obj/item/storage/belt/military/clip/e50
@@ -87,6 +90,7 @@
 
 /datum/outfit/job/clip/minutemen/grunt/dressed/riot/leader
 	name = "ERT - CLIP Minutemen Riot Officer Sergeant"
+	id_assignment = "Security Sergeant"
 	job_icon = "lieutenant"
 
 	ears = /obj/item/radio/headset/clip/alt/captain

diff --git a/code/modules/clothing/outfits/ert/solgov_ert.dm b/code/modules/clothing/outfits/ert/solgov_ert.dm
@@ -1,5 +1,6 @@
 /datum/outfit/job/solgov/ert
 	name = "ERT - SolGov Sonnensöldner"
+	id_assignment = "Sonnensöldner"
 	jobtype = /datum/job/officer
 	job_icon = "sonnensoldner"
 
@@ -19,6 +20,7 @@
 
 /datum/outfit/job/solgov/ert/inspector
 	name = "ERT - Inspector (SolGov)"
+	id_assignment = "Inspector"
 	jobtype = /datum/job/head_of_personnel
 	job_icon = "solgovrepresentative"
 

diff --git a/code/modules/clothing/outfits/ert/syndicate_ert.dm b/code/modules/clothing/outfits/ert/syndicate_ert.dm
@@ -32,7 +32,7 @@
 // gorlex loyalist/2nd battlegroup
 
 /datum/outfit/job/syndicate/ert/gorlex
-	name = "ERT - Syndicate Gorlex Loyalist Trooper"
+	name = "ERT - New Gorlex Republic Trooper"
 
 	head = /obj/item/clothing/head/helmet/swat
 	uniform = /obj/item/clothing/under/syndicate/combat
@@ -42,13 +42,13 @@
 	suit_store = /obj/item/gun/ballistic/automatic/smg/m90
 
 /datum/outfit/job/syndicate/ert/gorlex/pointman
-	name = "ERT - Syndicate Gorlex Loyalist Pointman"
+	name = "ERT - New Gorlex Republic Pointman"
 
 	suit_store = /obj/item/gun/ballistic/shotgun/bulldog
 	belt = /obj/item/storage/belt/security/webbing/bulldog
 
 /datum/outfit/job/syndicate/ert/gorlex/medic
-	name = "ERT - Syndicate Gorlex Loyalist Medic"
+	name = "ERT - New Gorlex Republic Medic"
 	jobtype = /datum/job/paramedic
 	job_icon = "paramedic"
 
@@ -65,7 +65,7 @@
 	backpack_contents = list(/obj/item/ammo_box/magazine/m10mm=2, /obj/item/storage/firstaid/medical=1, /obj/item/defibrillator/compact/combat/loaded=1)
 
 /datum/outfit/job/syndicate/ert/gorlex/sniper
-	name = "ERT - Syndicate Gorlex Loyalist Sniper"
+	name = "ERT - New Gorlex Republic Sniper"
 
 	head = /obj/item/clothing/head/beret/black
 	back = /obj/item/storage/backpack/messenger/sec
@@ -81,7 +81,7 @@
 	backpack_contents = list(/obj/item/ammo_box/magazine/sniper_rounds=2, /obj/item/radio=1)
 
 /datum/outfit/job/syndicate/ert/gorlex/leader
-	name = "ERT - Syndicate Gorlex Loyalist Sergeant"
+	name = "ERT - New Gorlex Republic Sergeant"
 	job_icon = "lieutenant"
 
 	uniform = /obj/item/clothing/under/syndicate/gorlex
@@ -144,6 +144,7 @@
 
 /datum/outfit/job/syndicate/ert/cybersun/medic/leader
 	name = "ERT - Syndicate Cybersun Lead Paramedic"
+	id_assignment = "Lead Paramedic"
 	job_icon = "chiefmedicalofficer"
 
 	head = /obj/item/clothing/head/beret/cmo
@@ -157,6 +158,7 @@
 
 /datum/outfit/job/syndicate/ert/inspector
 	name = "ERT - Inspector (Syndicate)"
+	id_assignment = "Inspector"
 	jobtype = /datum/job/head_of_personnel
 	job_icon = "syndicate"
 
@@ -174,11 +176,3 @@
 	suit_store = null
 
 	backpack_contents = list(/obj/item/stamp/syndicate)
-
-/datum/outfit/job/syndicate/ert/inspector/post_equip(mob/living/carbon/human/H, visualsOnly)
-	. = ..()
-	var/obj/item/card/id/W = H.wear_id
-	if(W)
-		W.registered_name = H.real_name
-		W.assignment = "Inspector"
-		W.update_label()
diff --git a/code/modules/clothing/outfits/factions/frontiersmen.dm b/code/modules/clothing/outfits/factions/frontiersmen.dm
@@ -25,6 +25,7 @@
 
 /datum/outfit/job/frontiersmen/assistant
 	name = "Frontiersmen - Rookie"
+	id_assignment = "Rookie"
 	job_icon = "assistant"
 	jobtype = /datum/job/assistant
 
@@ -71,6 +72,7 @@
 
 /datum/outfit/job/frontiersmen/captain/admiral
 	name = "Frontiersmen - Admiral"
+	id_assignment = "Admiral"
 
 	uniform = /obj/item/clothing/under/rank/security/officer/frontier/admiral
 	head = /obj/item/clothing/head/caphat/frontier/admiral
@@ -83,7 +85,8 @@
 
 // Chief Engineer
 /datum/outfit/job/frontiersmen/ce
-	name = "Frontiersmen - Senior Sapper"
+	name = "Frontiersmen - Senior Mechanic"
+	id_assignment = "Senior Mechanic"
 	job_icon = "chiefengineer"
 	jobtype = /datum/job/chief_engineer
 
@@ -97,7 +100,8 @@
 
 // Engineer
 /datum/outfit/job/frontiersmen/engineer
-	name = "Frontiersmen - Sapper"
+	name = "Frontiersmen - Mechanic"
+	id_assignment = "Mechanic"
 	job_icon = "stationengineer"
 	jobtype = /datum/job/engineer
 
@@ -115,6 +119,7 @@
 
 /datum/outfit/job/frontiersmen/cook
 	name = "Frontiersmen - Steward"
+	id_assignment = "Steward"
 	job_icon = "cook"
 	jobtype = /datum/job/cook
 
@@ -126,6 +131,7 @@
 
 /datum/outfit/job/frontiersmen/hop
 	name = "Frontiersmen - Helmsman"
+	id_assignment = "Helmsman"
 	job_icon = "headofpersonnel"
 	jobtype = /datum/job/head_of_personnel
 
@@ -138,7 +144,8 @@
 
 // Head of Security
 /datum/outfit/job/frontiersmen/hos
-	name = "Frontiersmen - Shipswain"
+	name = "Frontiersmen - Deck Boss"
+	id_assignment = "Deck Boss"
 	job_icon = "headofsecurity"
 	jobtype = /datum/job/hos
 
@@ -155,6 +162,7 @@
 
 /datum/outfit/job/frontiersmen/security
 	name = "Frontiersmen - Boarder"
+	id_assignment = "Boarder"
 	job_icon = "securityofficer"
 	jobtype = /datum/job/officer
 
@@ -173,7 +181,8 @@
 // Medical Doctor
 
 /datum/outfit/job/frontiersmen/doctor
-	name = "Frontiersmen - Aidman"
+	name = "Frontiersmen - Surgeon"
+	id_assignment = "Surgeon"
 	job_icon = "medicaldoctor"
 	jobtype = /datum/job/doctor
 

diff --git a/code/modules/clothing/outfits/factions/gezena.dm b/code/modules/clothing/outfits/factions/gezena.dm
@@ -11,6 +11,7 @@
 //Playable Roles (put in ships):
 /datum/outfit/job/gezena/assistant
 	name = "PGF - Crewman"
+	id_assignment = "Crewman"
 	jobtype = /datum/job/assistant
 	job_icon = "assistant"
 
@@ -20,6 +21,7 @@
 
 /datum/outfit/job/gezena/engineer
 	name = "PGF - Navy Engineer"
+	id_assignment = "Naval Engineer"
 	jobtype = /datum/job/engineer
 	job_icon = "stationengineer"
 
@@ -38,6 +40,7 @@
 
 /datum/outfit/job/gezena/security
 	name = "PGF - Marine"
+	id_assignment = "Marine"
 	jobtype = /datum/job/officer
 	job_icon = "securityofficer"
 
@@ -47,6 +50,7 @@
 
 /datum/outfit/job/gezena/hos
 	name = "PGF - Marine Sergeant"
+	id_assignment = "Sergeant"
 	jobtype = /datum/job/hos
 	job_icon = "headofsecurity"
 

diff --git a/code/modules/clothing/outfits/factions/inteq.dm b/code/modules/clothing/outfits/factions/inteq.dm
@@ -20,6 +20,7 @@
 
 /datum/outfit/job/inteq/assistant
 	name = "IRMG - Recruit"
+	id_assignment = "Recruit"
 	jobtype = /datum/job/assistant
 	job_icon = "assistant"
 
@@ -29,6 +30,7 @@
 
 /datum/outfit/job/inteq/captain
 	name = "IRMG - Vanguard (Naked)"
+	id_assignment = "Vanguard"
 	jobtype = /datum/job/captain
 	job_icon = "captain"
 
@@ -55,6 +57,7 @@
 
 /datum/outfit/job/inteq/captain/honorable
 	name = "IRMG - Honorable Vanguard"
+	id_assignment = "Honorable Vanguard"
 
 	head = /obj/item/clothing/head/beret/sec/hos/inteq/honorable
 	uniform = /obj/item/clothing/under/syndicate/inteq/honorable
@@ -65,19 +68,11 @@
 	belt = /obj/item/storage/belt/military/assault
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
 
-/datum/outfit/job/inteq/captain/honorable/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
-	. = ..()
-	if(visualsOnly)
-		return
-
-	var/obj/item/card/id/W = H.wear_id
-	W.assignment = "Honorable Vanguard"
-	W.update_label()
-
 ///Chief Engineer
 
 /datum/outfit/job/inteq/ce
 	name = "IRMG - Artificer Class II"
+	id_assignment = "Artificer Class II"
 	job_icon = "chiefengineer"
 	jobtype = /datum/job/chief_engineer
 
@@ -101,6 +96,7 @@
 
 /datum/outfit/job/inteq/paramedic
 	name = "IRMG - Corpsman"
+	id_assignment = "Corpsman"
 	job_icon = "paramedic"
 	jobtype = /datum/job/paramedic
 
@@ -115,7 +111,7 @@
 	backpack_contents = list(/obj/item/roller=1)
 
 /datum/outfit/job/inteq/paramedic/empty
-	name = "IRMG Corpsman (Inteq) (Naked)"
+	name = "IRMG - Corpsman (Naked)"
 
 	head = null
 	suit = null
@@ -126,6 +122,7 @@
 
 /datum/outfit/job/inteq/security
 	name = "IRMG - Enforcer"
+	id_assignment = "Enforcer"
 	jobtype = /datum/job/officer
 	job_icon = "securityofficer"
 
@@ -171,6 +168,7 @@
 
 /datum/outfit/job/inteq/engineer
 	name = "IRMG - Artificer"
+	id_assignment = "Artificer"
 	job_icon = "stationengineer"
 	jobtype = /datum/job/engineer
 
@@ -184,6 +182,7 @@
 
 /datum/outfit/job/inteq/warden
 	name = "IRMG - Master At Arms"
+	id_assignment = "Master at Arms"
 	jobtype = /datum/job/warden
 	job_icon = "warden"
 
@@ -205,7 +204,8 @@
 // cmo
 
 /datum/outfit/job/inteq/cmo
-	name = "IRMG Honorable Corpsman (Inteq)"
+	name = "IRMG - Honorable Corpsman"
+	id_assignment = "Honorable Corpsman"
 	jobtype = /datum/job/cmo
 	job_icon = "chiefmedicalofficer"