Merge pull request #15574 from KazeEspada/Bagfixes

Bag tweaks.

code/modules/client/preferences.dm

@@ -49,7 +49,7 @@ var/list/preferences_datums = list()
 	var/underwear = "Nude"				//underwear type
 	var/undershirt = "Nude"				//undershirt type
 	var/socks = "Nude"					//socks type
-	var/backbag = GBACKPACK				//backpack type
+	var/backbag = DBACKPACK				//backpack type
 	var/hair_style = "Bald"				//Hair type
 	var/hair_color = "000"				//Hair color
 	var/facial_hair_style = "Shaved"	//Face hair type

code/modules/client/preferences_savefile.dm

@@ -173,9 +173,9 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	if(current_version < 13 || !istext(backbag))
 		switch(backbag)
 			if(2)
-				backbag = GSATCHEL
+				backbag = DSATCHEL
 			else
-				backbag = GBACKPACK
+				backbag = DBACKPACK
 
 
 /datum/preferences/proc/load_path(ckey,filename="preferences.sav")

code/modules/jobs/job_types/job.dm

@@ -149,21 +149,20 @@
 
 /datum/outfit/job/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	switch(H.backbag)
-		//Grey backpacks are handled later.
+		if(GBACKPACK)
+			back = /obj/item/weapon/storage/backpack //Grey backpack
 		if(GSATCHEL)
 			back = /obj/item/weapon/storage/backpack/satchel_norm //Grey satchel
 		if(GDUFFLEBAG)
 			back = /obj/item/weapon/storage/backpack/dufflebag //Grey Dufflebag
 		if(LSATCHEL)
 			back = /obj/item/weapon/storage/backpack/satchel //Leather Satchel
-		if(DBACKPACK)
-			back = backpack //Department backpack
 		if(DSATCHEL)
 			back = satchel //Department satchel
 		if(DDUFFLEBAG)
 			back = dufflebag //Department dufflebag
 		else
-			back = /obj/item/weapon/storage/backpack //Grey backpack
+			back = backpack //Department backpack
 
 	backpack_contents[box] = 1
 

code/modules/mob/living/carbon/human/human_defines.dm

@@ -22,7 +22,7 @@
 	var/underwear = "Nude"	//Which underwear the player wants
 	var/undershirt = "Nude" //Which undershirt the player wants
 	var/socks = "Nude" //Which socks the player wants
-	var/backbag = 1		//Which backpack type the player has chosen. Backpack.or Satchel
+	var/backbag = DBACKPACK		//Which backpack type the player has chosen.
 
 	//Equipment slots
 	var/obj/item/wear_suit = null