From 3becdd1b06675efd4b14a9fa15865d44278e49b6 Mon Sep 17 00:00:00 2001
From: ShiftyRail <31417754+ShiftyRail@users.noreply.github.com>
Date: Wed, 19 Aug 2020 19:17:11 +0200
Subject: [PATCH] Outfit fixes: question marks IDs, backbags (#27583)

* Outfit fixes: question marks IDs, backbags

* nah
---
 code/datums/outfit/civilian.dm | 10 +++++-----
 code/datums/outfit/outfit.dm   |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/code/datums/outfit/civilian.dm b/code/datums/outfit/civilian.dm
index a9ed986a9fe..3592b15bb66 100644
--- a/code/datums/outfit/civilian.dm
+++ b/code/datums/outfit/civilian.dm
@@ -340,7 +340,7 @@
 	associated_job = /datum/job/mime
 
 	backpack_types = list(
-		BACKPACK_STRING = /obj/item/weapon/storage,
+		BACKPACK_STRING = /obj/item/weapon/storage/backpack,
 		SATCHEL_NORM_STRING = /obj/item/weapon/storage/backpack/satchel_norm,
 		SATCHEL_ALT_STRING = /obj/item/weapon/storage/backpack/satchel,
 		MESSENGER_BAG_STRING = /obj/item/weapon/storage/backpack/messenger,
@@ -404,7 +404,7 @@
 	associated_job = /datum/job/janitor
 
 	backpack_types = list(
-		BACKPACK_STRING = /obj/item/weapon/storage,
+		BACKPACK_STRING = /obj/item/weapon/storage/backpack,
 		SATCHEL_NORM_STRING = /obj/item/weapon/storage/backpack/satchel_norm,
 		SATCHEL_ALT_STRING = /obj/item/weapon/storage/backpack/satchel,
 		MESSENGER_BAG_STRING = /obj/item/weapon/storage/backpack/messenger,
@@ -451,7 +451,7 @@
 	associated_job = /datum/job/librarian
 
 	backpack_types = list(
-		BACKPACK_STRING = /obj/item/weapon/storage,
+		BACKPACK_STRING = /obj/item/weapon/storage/backpack,
 		SATCHEL_NORM_STRING = /obj/item/weapon/storage/backpack/satchel_norm,
 		SATCHEL_ALT_STRING = /obj/item/weapon/storage/backpack/satchel,
 		MESSENGER_BAG_STRING = /obj/item/weapon/storage/backpack/messenger,
@@ -517,7 +517,7 @@
 	associated_job = /datum/job/iaa
 
 	backpack_types = list(
-		BACKPACK_STRING = /obj/item/weapon/storage,
+		BACKPACK_STRING = /obj/item/weapon/storage/backpack,
 		SATCHEL_NORM_STRING = /obj/item/weapon/storage/backpack/satchel_norm,
 		SATCHEL_ALT_STRING = /obj/item/weapon/storage/backpack/satchel,
 		MESSENGER_BAG_STRING = /obj/item/weapon/storage/backpack/messenger,
@@ -624,7 +624,7 @@
 	associated_job = /datum/job/chaplain
 
 	backpack_types = list(
-		BACKPACK_STRING = /obj/item/weapon/storage,
+		BACKPACK_STRING = /obj/item/weapon/storage/backpack,
 		SATCHEL_NORM_STRING = /obj/item/weapon/storage/backpack/satchel_norm,
 		SATCHEL_ALT_STRING = /obj/item/weapon/storage/backpack/satchel,
 		MESSENGER_BAG_STRING = /obj/item/weapon/storage/backpack/messenger,
diff --git a/code/datums/outfit/outfit.dm b/code/datums/outfit/outfit.dm
index e4f30b17527..2505d553dca 100644
--- a/code/datums/outfit/outfit.dm
+++ b/code/datums/outfit/outfit.dm
@@ -229,7 +229,7 @@
 		H.species.final_equip(H)
 
 // -- Spawn correct ID and PDA
-/datum/outfit/proc/spawn_id(var/mob/living/carbon/human/H, rank)
+/datum/outfit/proc/spawn_id(var/mob/living/carbon/human/H)
 	if (!associated_job)
 		CRASH("Outfit [outfit_name] has no associated job, and the proc to spawn the ID is not overriden.")
 	var/datum/job/concrete_job = new associated_job
@@ -238,7 +238,7 @@
 	C = new id_type(H)
 	C.access = concrete_job.get_access()
 	C.registered_name = H.real_name
-	C.rank = rank
+	C.rank = concrete_job.title
 	C.assignment = H.mind ? H.mind.role_alt_title : concrete_job.title
 	C.name = "[C.registered_name]'s ID Card ([C.assignment])"
 	C.associated_account_number = H?.mind?.initial_account?.account_number