From 5d8d5854f9f737d345fe96f9375d40d7ecac8de0 Mon Sep 17 00:00:00 2001
From: KazeEspada <madkirstein@yahoo.com>
Date: Tue, 16 Feb 2016 14:03:35 -0700
Subject: [PATCH] Bag tweaks.

Department Backpacks are now the default(instead of grey backpacks).

Fixed an error on humans where new humans would have an integer for their backpack.

This will not affect current preferences.
---
 code/_globalvars/lists/flavor_misc.dm                 | 2 +-
 code/modules/client/preferences.dm                    | 2 +-
 code/modules/client/preferences_savefile.dm           | 4 ++--
 code/modules/jobs/job_types/job.dm                    | 7 +++----
 code/modules/mob/living/carbon/human/human_defines.dm | 2 +-
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm
index 72831cff075..6c968640473 100644
--- a/code/_globalvars/lists/flavor_misc.dm
+++ b/code/_globalvars/lists/flavor_misc.dm
@@ -36,7 +36,7 @@ var/global/list/animated_spines_list = list()
 #define DBACKPACK "Department Backpack"
 #define DSATCHEL "Department Satchel"
 #define DDUFFLEBAG "Department Dufflebag"
-var/global/list/backbaglist = list(GBACKPACK, GSATCHEL, GDUFFLEBAG, LSATCHEL, DBACKPACK, DSATCHEL, DDUFFLEBAG)
+var/global/list/backbaglist = list(DBACKPACK, DSATCHEL, DDUFFLEBAG, GBACKPACK, GSATCHEL, GDUFFLEBAG, LSATCHEL)
 	//Female Uniforms
 var/global/list/female_clothing_icons = list()
 
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 0f86df990ba..efcaa9bbbb6 100644
--- a/code/modules/client/preferences.dm
+++ b/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
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index d45a8fca139..5b14f2a5e04 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/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")
diff --git a/code/modules/jobs/job_types/job.dm b/code/modules/jobs/job_types/job.dm
index bef2b0d0daa..0bc5c56ac1f 100644
--- a/code/modules/jobs/job_types/job.dm
+++ b/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
 
diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm
index e3a142f0e8c..9076f4afcfb 100644
--- a/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/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