Commit for Nodrak.

See: http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=8107#p96230 for changelist. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3307 316c924e-a436-60f5-8080-3fe189b3f50e
2025-12-10 18:32:03 +00:00 · 2012-03-16 14:58:59 +00:00
parent 597674c671
commit 2c069f8a97
15 changed files with 259 additions and 113 deletions
--- a/code/datums/helper_datums/tension.dm
+++ b/code/datums/helper_datums/tension.dm
@@ -264,9 +264,10 @@ var/global/datum/tension/tension_master
 			if(applicant.stat < 2)
 				if(applicant.mind)
 					if (!applicant.mind.special_role)
-						if(!(applicant.job in temp.restricted_jobs))
-							if(applicant.client)
-								candidates += applicant
+						if(!jobban_isbanned(applicant, "traitor") && !jobban_isbanned(applicant, "Syndicate"))
+							if(!(applicant.job in temp.restricted_jobs))
+								if(applicant.client)
+									candidates += applicant

 		if(candidates.len)
 			var/numTratiors = min(candidates.len, 3)
@@ -294,9 +295,10 @@ var/global/datum/tension/tension_master
 			if(applicant.stat < 2)
 				if(applicant.mind)
 					if (!applicant.mind.special_role)
-						if(!(applicant.job in temp.restricted_jobs))
-							if(applicant.client)
-								candidates += applicant
+						if(!jobban_isbanned(applicant, "changeling") && !jobban_isbanned(applicant, "Syndicate"))
+							if(!(applicant.job in temp.restricted_jobs))
+								if(applicant.client)
+									candidates += applicant

 		if(candidates.len)
 			var/numChanglings = min(candidates.len, 3)
@@ -323,9 +325,10 @@ var/global/datum/tension/tension_master
 			if(applicant.stat < 2)
 				if(applicant.mind)
 					if (!applicant.mind.special_role)
-						if(!(applicant.job in temp.restricted_jobs))
-							if(applicant.client)
-								candidates += applicant
+						if(!jobban_isbanned(applicant, "revolutionary") && !jobban_isbanned(applicant, "Syndicate"))
+							if(!(applicant.job in temp.restricted_jobs))
+								if(applicant.client)
+									candidates += applicant
 		if(candidates.len)
 			var/numRevs = min(candidates.len, 3)

@@ -344,14 +347,15 @@ var/global/datum/tension/tension_master
 		var/time_passed = world.time

 		for(var/mob/dead/observer/G in world)
-			spawn(0)
-				switch(alert(G, "Do you wish to be considered for the position of Space Wizard Foundation 'diplomat'?","Please answer in 30 seconds!","Yes","No"))
-					if("Yes")
-						if((world.time-time_passed)>300)//If more than 30 game seconds passed.
+			if(!jobban_isbanned(G, "wizard") && !jobban_isbanned(G, "Syndicate"))
+				spawn(0)
+					switch(alert(G, "Do you wish to be considered for the position of Space Wizard Foundation 'diplomat'?","Please answer in 30 seconds!","Yes","No"))
+						if("Yes")
+							if((world.time-time_passed)>300)//If more than 30 game seconds passed.
+								return
+							candidates += G
+						if("No")
 							return
-						candidates += G
-					if("No")
-						return


 		spawn(300)
@@ -383,9 +387,10 @@ var/global/datum/tension/tension_master
 			if(applicant.stat < 2)
 				if(applicant.mind)
 					if (!applicant.mind.special_role)
-						if(!(applicant.job in temp.restricted_jobs))
-							if(applicant.client)
-								candidates += applicant
+						if(!jobban_isbanned(applicant, "cultist") && !jobban_isbanned(applicant, "Syndicate"))
+							if(!(applicant.job in temp.restricted_jobs))
+								if(applicant.client)
+									candidates += applicant

 		if(candidates.len)
 			var/numCultists = min(candidates.len, 4)
@@ -409,14 +414,15 @@ var/global/datum/tension/tension_master
 		var/time_passed = world.time

 		for(var/mob/dead/observer/G in world)
-			spawn(0)
-				switch(alert(G,"Do you wish to be considered for a nuke team being sent in?","Please answer in 30 seconds!","Yes","No"))
-					if("Yes")
-						if((world.time-time_passed)>300)//If more than 30 game seconds passed.
+			if(!jobban_isbanned(G, "operative") && !jobban_isbanned(G, "Syndicate"))
+				spawn(0)
+					switch(alert(G,"Do you wish to be considered for a nuke team being sent in?","Please answer in 30 seconds!","Yes","No"))
+						if("Yes")
+							if((world.time-time_passed)>300)//If more than 30 game seconds passed.
+								return
+							candidates += G
+						if("No")
 							return
-						candidates += G
-					if("No")
-						return


 		spawn(300)
--- a/code/defines/obj/storage.dm
+++ b/code/defines/obj/storage.dm
@@ -109,7 +109,6 @@

 	New()
 		..()
-		new /obj/item/weapon/storage/wallet/random(src)

 /obj/item/weapon/storage/backpack/bandolier
 	name = "bandolier"
--- a/code/game/jobs/job/captain.dm
+++ b/code/game/jobs/job/captain.dm
@@ -12,7 +12,8 @@
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
 		H.equip_if_possible(new /obj/item/device/radio/headset/heads/captain(H), H.slot_ears)
-		H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back)
+		if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back)
+		if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back)
 		H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H.back), H.slot_in_backpack)
 		H.equip_if_possible(new /obj/item/clothing/under/rank/captain(H), H.slot_w_uniform)
 		H.equip_if_possible(new /obj/item/device/pda/captain(H), H.slot_belt)
@@ -20,7 +21,10 @@
 		H.equip_if_possible(new /obj/item/clothing/shoes/brown(H), H.slot_shoes)
 		H.equip_if_possible(new /obj/item/clothing/head/caphat(H), H.slot_head)
 		H.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(H), H.slot_glasses)
-		H.equip_if_possible(new /obj/item/weapon/storage/id_kit(H), H.slot_in_backpack)
+		if(H.backbag == 1)
+			H.equip_if_possible(new /obj/item/weapon/storage/id_kit(H), H.slot_r_hand)
+		else
+			H.equip_if_possible(new /obj/item/weapon/storage/id_kit(H.back), H.slot_in_backpack)
 		var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)
 		L.imp_in = H
 		L.implanted = 1
@@ -43,12 +47,16 @@
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
 		H.equip_if_possible(new /obj/item/device/radio/headset/heads/hop(H), H.slot_ears)
-		H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back)
+		if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back)
+		if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back)
 		H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H.back), H.slot_in_backpack)
 		H.equip_if_possible(new /obj/item/clothing/under/rank/head_of_personnel(H), H.slot_w_uniform)
 		H.equip_if_possible(new /obj/item/clothing/shoes/brown(H), H.slot_shoes)
 		H.equip_if_possible(new /obj/item/device/pda/heads/hop(H), H.slot_belt)
 		H.equip_if_possible(new /obj/item/clothing/suit/armor/vest(H), H.slot_wear_suit)
 		H.equip_if_possible(new /obj/item/clothing/head/helmet(H), H.slot_head)
-		H.equip_if_possible(new /obj/item/weapon/storage/id_kit(H), H.slot_in_backpack)
+		if(H.backbag == 1)
+			H.equip_if_possible(new /obj/item/weapon/storage/id_kit(H), H.slot_r_hand)
+		else
+			H.equip_if_possible(new /obj/item/weapon/storage/id_kit(H.back), H.slot_in_backpack)
 		return 1
--- a/code/game/jobs/job/civilian.dm
+++ b/code/game/jobs/job/civilian.dm
@@ -1,8 +1,3 @@
-
-
-
-
-
 //Food
 /datum/job/bartender
 	title = "Bartender"
@@ -17,15 +12,26 @@

 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
-		H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back)
-		H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H.back), H.slot_in_backpack)
-		H.equip_if_possible(new /obj/item/clothing/under/rank/bartender(H), H.slot_w_uniform)
+		if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back)
+		if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back)
 		H.equip_if_possible(new /obj/item/clothing/shoes/black(H), H.slot_shoes)
 		H.equip_if_possible(new /obj/item/clothing/suit/armor/vest(H), H.slot_wear_suit)
-		H.equip_if_possible(new /obj/item/ammo_casing/shotgun/beanbag(H), H.slot_in_backpack)
-		H.equip_if_possible(new /obj/item/ammo_casing/shotgun/beanbag(H), H.slot_in_backpack)
-		H.equip_if_possible(new /obj/item/ammo_casing/shotgun/beanbag(H), H.slot_in_backpack)
-		H.equip_if_possible(new /obj/item/ammo_casing/shotgun/beanbag(H), H.slot_in_backpack)
+		H.equip_if_possible(new /obj/item/clothing/under/rank/bartender(H), H.slot_w_uniform)
+
+		if(H.backbag == 1)
+			var/obj/item/weapon/storage/box/survival/Barpack = new /obj/item/weapon/storage/box/survival(H)
+			H.equip_if_possible(Barpack, H.slot_r_hand)
+			new /obj/item/ammo_casing/shotgun/beanbag(Barpack)
+			new /obj/item/ammo_casing/shotgun/beanbag(Barpack)
+			new /obj/item/ammo_casing/shotgun/beanbag(Barpack)
+			new /obj/item/ammo_casing/shotgun/beanbag(Barpack)
+		else
+			H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H), H.slot_in_backpack)
+			H.equip_if_possible(new /obj/item/ammo_casing/shotgun/beanbag(H), H.slot_in_backpack)
+			H.equip_if_possible(new /obj/item/ammo_casing/shotgun/beanbag(H), H.slot_in_backpack)
+			H.equip_if_possible(new /obj/item/ammo_casing/shotgun/beanbag(H), H.slot_in_backpack)
+			H.equip_if_possible(new /obj/item/ammo_casing/shotgun/beanbag(H), H.slot_in_backpack)
+
 		return 1


@@ -134,13 +140,19 @@
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
 		H.equip_if_possible(new /obj/item/device/radio/headset/headset_mine (H), H.slot_ears)
-		H.equip_if_possible(new /obj/item/weapon/storage/backpack/industrial (H), H.slot_back)
-		H.equip_if_possible(new /obj/item/weapon/storage/box/engineer(H.back), H.slot_in_backpack)
+		if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack/industrial (H), H.slot_back)
+		if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back)
 		H.equip_if_possible(new /obj/item/clothing/under/rank/miner(H), H.slot_w_uniform)
 		H.equip_if_possible(new /obj/item/clothing/shoes/black(H), H.slot_shoes)
 		H.equip_if_possible(new /obj/item/clothing/gloves/black(H), H.slot_gloves)
-		H.equip_if_possible(new /obj/item/weapon/crowbar(H), H.slot_in_backpack)
-		H.equip_if_possible(new /obj/item/weapon/satchel(H), H.slot_in_backpack)
+		if(H.backbag == 1)
+			H.equip_if_possible(new /obj/item/weapon/storage/box/engineer(H), H.slot_r_hand)
+			H.equip_if_possible(new /obj/item/weapon/crowbar(H), H.slot_l_hand)
+			H.equip_if_possible(new /obj/item/weapon/satchel(H), H.slot_l_store)
+		else
+			H.equip_if_possible(new /obj/item/weapon/storage/box/engineer(H.back), H.slot_in_backpack)
+			H.equip_if_possible(new /obj/item/weapon/crowbar(H), H.slot_in_backpack)
+			H.equip_if_possible(new /obj/item/weapon/satchel(H), H.slot_in_backpack)
 		return 1


@@ -188,8 +200,8 @@

 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
-		H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back)
-		H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H.back), H.slot_in_backpack)
+		if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back)
+		if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back)
 		H.equip_if_possible(new /obj/item/clothing/under/mime(H), H.slot_w_uniform)
 		H.equip_if_possible(new /obj/item/clothing/shoes/black(H), H.slot_shoes)
 		H.equip_if_possible(new /obj/item/device/pda/mime(H), H.slot_belt)
@@ -197,8 +209,14 @@
 		H.equip_if_possible(new /obj/item/clothing/mask/gas/mime(H), H.slot_wear_mask)
 		H.equip_if_possible(new /obj/item/clothing/head/beret(H), H.slot_head)
 		H.equip_if_possible(new /obj/item/clothing/suit/suspenders(H), H.slot_wear_suit)
-		H.equip_if_possible(new /obj/item/toy/crayon/mime(H), H.slot_in_backpack)
-		H.equip_if_possible(new /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing(H), H.slot_in_backpack)
+		if(H.backbag == 1)
+			H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H), H.slot_r_hand)
+			H.equip_if_possible(new /obj/item/toy/crayon/mime(H), H.slot_l_store)
+			H.equip_if_possible(new /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing(H), H.slot_l_hand)
+		else
+			H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H.back), H.slot_in_backpack)
+			H.equip_if_possible(new /obj/item/toy/crayon/mime(H), H.slot_in_backpack)
+			H.equip_if_possible(new /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing(H), H.slot_in_backpack)
 		H.verbs += /client/proc/mimespeak
 		H.verbs += /client/proc/mimewall
 		H.mind.special_verbs += /client/proc/mimespeak
@@ -263,8 +281,8 @@ var/global/lawyer = 0//Checks for another lawyer

 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
-		H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back)
-		H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H.back), H.slot_in_backpack)
+		if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back)
+		if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back)
 		if(!lawyer)
 			lawyer = 1
 			H.equip_if_possible(new /obj/item/clothing/under/lawyer/bluesuit(H), H.slot_w_uniform)
@@ -274,8 +292,14 @@ var/global/lawyer = 0//Checks for another lawyer
 			H.equip_if_possible(new /obj/item/clothing/suit/lawyer/purpjacket(H), H.slot_wear_suit)
 		H.equip_if_possible(new /obj/item/clothing/shoes/brown(H), H.slot_shoes)
 		H.equip_if_possible(new /obj/item/device/pda/lawyer(H), H.slot_belt)
-		H.equip_if_possible(new /obj/item/device/detective_scanner(H), H.slot_in_backpack)//Why do they even get this?
 		H.equip_if_possible(new /obj/item/weapon/storage/briefcase(H), H.slot_l_hand)
+		if(H.backbag == 1)
+			H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H), H.slot_r_hand)
+			H.equip_if_possible(new /obj/item/device/detective_scanner(H), H.slot_l_store)//Why do they even get this?
+		else
+			H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H.back), H.slot_in_backpack)
+			H.equip_if_possible(new /obj/item/device/detective_scanner(H), H.slot_in_backpack)//No really.. why do they even get this?
+
 		return 1


--- a/code/game/jobs/job/engineering.dm
+++ b/code/game/jobs/job/engineering.dm
@@ -12,14 +12,18 @@
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
 		H.equip_if_possible(new /obj/item/device/radio/headset/heads/ce(H), H.slot_ears)
-		H.equip_if_possible(new /obj/item/weapon/storage/backpack/industrial (H), H.slot_back)
-		H.equip_if_possible(new /obj/item/weapon/storage/box/engineer(H.back), H.slot_in_backpack)
+		if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack/industrial (H), H.slot_back)
+		if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back)
 		H.equip_if_possible(new /obj/item/clothing/under/rank/chief_engineer(H), H.slot_w_uniform)
 		H.equip_if_possible(new /obj/item/device/pda/heads/ce(H), H.slot_belt)
 		H.equip_if_possible(new /obj/item/clothing/shoes/brown(H), H.slot_shoes)
 		H.equip_if_possible(new /obj/item/clothing/head/helmet/hardhat/white(H), H.slot_head)
 		H.equip_if_possible(new /obj/item/weapon/storage/belt/utility/full(H), H.slot_l_hand)
 		H.equip_if_possible(new /obj/item/clothing/gloves/black(H), H.slot_gloves)
+		if(H.backbag == 1)
+			H.equip_if_possible(new /obj/item/weapon/storage/box/engineer(H), H.slot_r_hand)
+		else
+			H.equip_if_possible(new /obj/item/weapon/storage/box/engineer(H.back), H.slot_in_backpack)
 		return 1


@@ -38,14 +42,18 @@
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
 		H.equip_if_possible(new /obj/item/device/radio/headset/headset_eng(H), H.slot_ears)
-		H.equip_if_possible(new /obj/item/weapon/storage/backpack/industrial(H), H.slot_back)
-		H.equip_if_possible(new /obj/item/weapon/storage/box/engineer(H.back), H.slot_in_backpack)
+		if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack/industrial(H), H.slot_back)
+		if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back)
 		H.equip_if_possible(new /obj/item/clothing/under/rank/engineer(H), H.slot_w_uniform)
 		H.equip_if_possible(new /obj/item/clothing/shoes/orange(H), H.slot_shoes)
 		H.equip_if_possible(new /obj/item/device/pda/engineering(H), H.slot_belt)
 		H.equip_if_possible(new /obj/item/clothing/head/helmet/hardhat(H), H.slot_head)
 		H.equip_if_possible(new /obj/item/weapon/storage/belt/utility/full(H), H.slot_l_hand)
 		H.equip_if_possible(new /obj/item/device/t_scanner(H), H.slot_r_store)
+		if(H.backbag == 1)
+			H.equip_if_possible(new /obj/item/weapon/storage/box/engineer(H), H.slot_r_hand)
+		else
+			H.equip_if_possible(new /obj/item/weapon/storage/box/engineer(H.back), H.slot_in_backpack)
 		return 1


@@ -64,12 +72,16 @@
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
 		H.equip_if_possible(new /obj/item/device/radio/headset/headset_eng(H), H.slot_ears)
-		H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back)
-		H.equip_if_possible(new /obj/item/weapon/storage/box/engineer(H.back), H.slot_in_backpack)
+		if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back)
+		if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back)
 		H.equip_if_possible(new /obj/item/clothing/under/rank/atmospheric_technician(H), H.slot_w_uniform)
 		H.equip_if_possible(new /obj/item/clothing/shoes/black(H), H.slot_shoes)
 		H.equip_if_possible(new /obj/item/device/pda/engineering(H), H.slot_belt)
 		H.equip_if_possible(new /obj/item/weapon/storage/belt/utility/atmostech/(H), H.slot_l_hand)
+		if(H.backbag == 1)
+			H.equip_if_possible(new /obj/item/weapon/storage/box/engineer(H), H.slot_r_hand)
+		else
+			H.equip_if_possible(new /obj/item/weapon/storage/box/engineer(H.back), H.slot_in_backpack)
 		return 1


@@ -87,12 +99,16 @@
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
 		H.equip_if_possible(new /obj/item/device/radio/headset/headset_rob(H), H.slot_ears)
-		H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back)
-		H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H.back), H.slot_in_backpack)
+		if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back)
+		if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back)
 		H.equip_if_possible(new /obj/item/clothing/under/rank/roboticist(H), H.slot_w_uniform)
 		H.equip_if_possible(new /obj/item/clothing/shoes/black(H), H.slot_shoes)
 		H.equip_if_possible(new /obj/item/device/pda/engineering(H), H.slot_belt)
 		H.equip_if_possible(new /obj/item/clothing/suit/labcoat(H), H.slot_wear_suit)
 		H.equip_if_possible(new /obj/item/clothing/gloves/black(H), H.slot_gloves)
 		H.equip_if_possible(new /obj/item/weapon/storage/toolbox/mechanical(H), H.slot_l_hand)
+		if(H.backbag == 1)
+			H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H), H.slot_r_hand)
+		else
+			H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H.back), H.slot_in_backpack)
 		return 1
--- a/code/game/jobs/job/medical.dm
+++ b/code/game/jobs/job/medical.dm
@@ -12,14 +12,18 @@
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
 		H.equip_if_possible(new /obj/item/device/radio/headset/heads/cmo(H), H.slot_ears)
-		H.equip_if_possible(new /obj/item/weapon/storage/backpack/medic (H), H.slot_back)
-		H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H.back), H.slot_in_backpack)
+		if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack/medic (H), H.slot_back)
+		if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back)
 		H.equip_if_possible(new /obj/item/clothing/under/rank/chief_medical_officer(H), H.slot_w_uniform)
 		H.equip_if_possible(new /obj/item/clothing/shoes/brown(H), H.slot_shoes)
 		H.equip_if_possible(new /obj/item/device/pda/heads/cmo(H), H.slot_belt)
 		H.equip_if_possible(new /obj/item/clothing/suit/labcoat/cmo(H), H.slot_wear_suit)
 		H.equip_if_possible(new /obj/item/weapon/storage/firstaid/regular(H), H.slot_l_hand)
 		H.equip_if_possible(new /obj/item/device/flashlight/pen(H), H.slot_s_store)
+		if(H.backbag == 1)
+			H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H), H.slot_r_hand)
+		else
+			H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H.back), H.slot_in_backpack)
 		return 1


@@ -38,14 +42,18 @@
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
 		H.equip_if_possible(new /obj/item/device/radio/headset/headset_med(H), H.slot_ears)
-		H.equip_if_possible(new /obj/item/weapon/storage/backpack/medic (H), H.slot_back)
-		H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H.back), H.slot_in_backpack)
+		if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack/medic (H), H.slot_back)
+		if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back)
 		H.equip_if_possible(new /obj/item/clothing/under/rank/medical(H), H.slot_w_uniform)
 		H.equip_if_possible(new /obj/item/clothing/shoes/white(H), H.slot_shoes)
 		H.equip_if_possible(new /obj/item/device/pda/medical(H), H.slot_belt)
 		H.equip_if_possible(new /obj/item/clothing/suit/labcoat(H), H.slot_wear_suit)
 		H.equip_if_possible(new /obj/item/weapon/storage/firstaid/regular(H), H.slot_l_hand)
 		H.equip_if_possible(new /obj/item/device/flashlight/pen(H), H.slot_s_store)
+		if(H.backbag == 1)
+			H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H), H.slot_r_hand)
+		else
+			H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H.back), H.slot_in_backpack)
 		return 1


@@ -64,13 +72,17 @@
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
 		H.equip_if_possible(new /obj/item/device/radio/headset/headset_medsci(H), H.slot_ears)
-		H.equip_if_possible(new /obj/item/weapon/storage/backpack/medic (H), H.slot_back)
-		H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H.back), H.slot_in_backpack)
+		if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack/medic (H), H.slot_back)
+		if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back)
 		H.equip_if_possible(new /obj/item/clothing/under/rank/geneticist(H), H.slot_w_uniform)
 		H.equip_if_possible(new /obj/item/clothing/shoes/white(H), H.slot_shoes)
 		H.equip_if_possible(new /obj/item/device/pda/medical(H), H.slot_belt)
 		H.equip_if_possible(new /obj/item/clothing/suit/labcoat/genetics(H), H.slot_wear_suit)
 		H.equip_if_possible(new /obj/item/device/flashlight/pen(H), H.slot_s_store)
+		if(H.backbag == 1)
+			H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H), H.slot_r_hand)
+		else
+			H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H.back), H.slot_in_backpack)
 		return 1


@@ -89,14 +101,18 @@
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
 		H.equip_if_possible(new /obj/item/device/radio/headset/headset_medsci(H), H.slot_ears)
-		H.equip_if_possible(new /obj/item/weapon/storage/backpack/medic (H), H.slot_back)
-		H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H.back), H.slot_in_backpack)
+		if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack/medic (H), H.slot_back)
+		if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back)
 		H.equip_if_possible(new /obj/item/clothing/under/rank/virologist(H), H.slot_w_uniform)
 		H.equip_if_possible(new /obj/item/device/pda/medical(H), H.slot_belt)
 		H.equip_if_possible(new /obj/item/clothing/mask/surgical(H), H.slot_wear_mask)
 		H.equip_if_possible(new /obj/item/clothing/shoes/white(H), H.slot_shoes)
 		H.equip_if_possible(new /obj/item/clothing/suit/labcoat/virologist(H), H.slot_wear_suit)
 		H.equip_if_possible(new /obj/item/device/flashlight/pen(H), H.slot_s_store)
+		if(H.backbag == 1)
+			H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H), H.slot_r_hand)
+		else
+			H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H.back), H.slot_in_backpack)
 		return 1


--- a/code/game/jobs/job/science.dm
+++ b/code/game/jobs/job/science.dm
@@ -16,7 +16,7 @@
 		H.equip_if_possible(new /obj/item/clothing/under/rank/research_director(H), H.slot_w_uniform)
 		H.equip_if_possible(new /obj/item/device/pda/heads/rd(H), H.slot_belt)
 		H.equip_if_possible(new /obj/item/clothing/suit/labcoat(H), H.slot_wear_suit)
-		H.equip_if_possible(new /obj/item/weapon/clipboard(H), H.slot_r_hand)
+		H.equip_if_possible(new /obj/item/weapon/clipboard(H), H.slot_l_hand)
 		return 1


--- a/code/game/jobs/job/security.dm
+++ b/code/game/jobs/job/security.dm
@@ -11,8 +11,8 @@

 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
-		H.equip_if_possible(new /obj/item/weapon/storage/backpack/security (H), H.slot_back)
-		H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H.back), H.slot_in_backpack)
+		if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack/security (H), H.slot_back)
+		if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back)
 		H.equip_if_possible(new /obj/item/device/radio/headset/heads/hos(H), H.slot_ears)
 		H.equip_if_possible(new /obj/item/clothing/under/rank/head_of_security(H), H.slot_w_uniform)
 		H.equip_if_possible(new /obj/item/clothing/shoes/jackboots(H), H.slot_shoes)
@@ -22,8 +22,13 @@
 		H.equip_if_possible(new /obj/item/clothing/head/helmet/HoS(H), H.slot_head)
 		H.equip_if_possible(new /obj/item/clothing/mask/gas/emergency(H), H.slot_wear_mask)
 		H.equip_if_possible(new /obj/item/clothing/glasses/sunglasses/sechud(H), H.slot_glasses)
-		H.equip_if_possible(new /obj/item/weapon/handcuffs(H), H.slot_in_backpack)
 		H.equip_if_possible(new /obj/item/weapon/gun/energy/gun(H), H.slot_s_store)
+		if(H.backbag == 1)
+			H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H), H.slot_r_hand)
+			H.equip_if_possible(new /obj/item/weapon/handcuffs(H), H.slot_l_store)
+		else
+			H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H.back), H.slot_in_backpack)
+			H.equip_if_possible(new /obj/item/weapon/handcuffs(H), H.slot_in_backpack)
 		var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)
 		L.imp_in = H
 		L.implanted = 1
@@ -45,8 +50,8 @@
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
 		H.equip_if_possible(new /obj/item/device/radio/headset/headset_sec(H), H.slot_ears)
-		H.equip_if_possible(new /obj/item/weapon/storage/backpack/security(H), H.slot_back)
-		H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H.back), H.slot_in_backpack)
+		if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack/security(H), H.slot_back)
+		if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back)
 		H.equip_if_possible(new /obj/item/clothing/under/rank/warden(H), H.slot_w_uniform)
 		H.equip_if_possible(new /obj/item/clothing/shoes/jackboots(H), H.slot_shoes)
 		H.equip_if_possible(new /obj/item/device/pda/security(H), H.slot_belt)
@@ -55,8 +60,13 @@
 		H.equip_if_possible(new /obj/item/clothing/gloves/black(H), H.slot_gloves)
 		H.equip_if_possible(new /obj/item/clothing/glasses/sunglasses/sechud(H), H.slot_glasses)
 		H.equip_if_possible(new /obj/item/clothing/mask/gas/emergency(H), H.slot_wear_mask)
-		H.equip_if_possible(new /obj/item/weapon/handcuffs(H), H.slot_in_backpack)
 		H.equip_if_possible(new /obj/item/device/flash(H), H.slot_l_store)
+		if(H.backbag == 1)
+			H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H), H.slot_r_hand)
+			H.equip_if_possible(new /obj/item/weapon/handcuffs(H), H.slot_l_hand)
+		else
+			H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H.back), H.slot_in_backpack)
+			H.equip_if_possible(new /obj/item/weapon/handcuffs(H), H.slot_in_backpack)
 		var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)
 		L.imp_in = H
 		L.implanted = 1
@@ -78,8 +88,8 @@
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
 		H.equip_if_possible(new /obj/item/device/radio/headset/headset_sec(H), H.slot_ears)
-		H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back)
-		H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H.back), H.slot_in_backpack)
+		if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back)
+		if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back)
 		H.equip_if_possible(new /obj/item/clothing/under/det(H), H.slot_w_uniform)
 		H.equip_if_possible(new /obj/item/clothing/shoes/brown(H), H.slot_shoes)
 		H.equip_if_possible(new /obj/item/device/pda/detective(H), H.slot_belt)
@@ -88,12 +98,22 @@
 		CIG.light("")
 		H.equip_if_possible(CIG, H.slot_wear_mask)
 		H.equip_if_possible(new /obj/item/clothing/gloves/black(H), H.slot_gloves)
-		H.equip_if_possible(new /obj/item/weapon/storage/box/evidence(H.back), H.slot_in_backpack)
-		H.equip_if_possible(new /obj/item/weapon/fcardholder(H), H.slot_in_backpack)
 		H.equip_if_possible(new /obj/item/clothing/suit/det_suit(H), H.slot_wear_suit)
-		H.equip_if_possible(new /obj/item/device/detective_scanner(H), H.slot_in_backpack)
 		H.equip_if_possible(new /obj/item/weapon/lighter/zippo(H), H.slot_l_store)
 		H.equip_if_possible(new /obj/item/weapon/reagent_containers/food/snacks/candy_corn(H), H.slot_h_store)
+
+		if(H.backbag == 1)//Why cant some of these things spawn in his office?
+			var/obj/item/weapon/storage/box/survival/Evipack = new /obj/item/weapon/storage/box/survival(H)
+			H.equip_if_possible(Evipack, H.slot_r_hand)
+			new /obj/item/weapon/fcardholder(Evipack)
+			H.equip_if_possible(new /obj/item/weapon/storage/box/evidence(H), H.slot_l_hand)
+			H.equip_if_possible(new /obj/item/device/detective_scanner(H), H.slot_r_store)
+		else
+			H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H.back), H.slot_in_backpack)
+			H.equip_if_possible(new /obj/item/weapon/storage/box/evidence(H.back), H.slot_in_backpack)
+			H.equip_if_possible(new /obj/item/weapon/fcardholder(H), H.slot_in_backpack)
+			H.equip_if_possible(new /obj/item/device/detective_scanner(H), H.slot_in_backpack)
+
 		var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)
 		L.imp_in = H
 		L.implanted = 1
@@ -115,16 +135,21 @@
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
 		H.equip_if_possible(new /obj/item/device/radio/headset/headset_sec(H), H.slot_ears)
-		H.equip_if_possible(new /obj/item/weapon/storage/backpack/security(H), H.slot_back)
-		H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H.back), H.slot_in_backpack)
+		if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack/security(H), H.slot_back)
+		if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back)
 		H.equip_if_possible(new /obj/item/clothing/under/rank/security(H), H.slot_w_uniform)
 		H.equip_if_possible(new /obj/item/clothing/shoes/jackboots(H), H.slot_shoes)
 		H.equip_if_possible(new /obj/item/device/pda/security(H), H.slot_belt)
 		H.equip_if_possible(new /obj/item/clothing/suit/armor/vest(H), H.slot_wear_suit)
 		H.equip_if_possible(new /obj/item/clothing/head/helmet(H), H.slot_head)
-		H.equip_if_possible(new /obj/item/weapon/handcuffs(H), H.slot_in_backpack)
 		H.equip_if_possible(new /obj/item/weapon/handcuffs(H), H.slot_s_store)
 		H.equip_if_possible(new /obj/item/device/flash(H), H.slot_l_store)
+		if(H.backbag == 1)
+			H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H), H.slot_r_hand)
+			H.equip_if_possible(new /obj/item/weapon/handcuffs(H), H.slot_l_hand)
+		else
+			H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H.back), H.slot_in_backpack)
+			H.equip_if_possible(new /obj/item/weapon/handcuffs(H), H.slot_in_backpack)
 		var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)
 		L.imp_in = H
 		L.implanted = 1
--- a/code/game/jobs/job_controller.dm
+++ b/code/game/jobs/job_controller.dm
@@ -229,9 +229,22 @@ var/global/datum/controller/occupations/job_master
 			return 1

 		H.equip_if_possible(new /obj/item/device/radio/headset(H), H.slot_ears)
-		var/obj/item/weapon/storage/backpack/BPK = new/obj/item/weapon/storage/backpack(H)
-		new /obj/item/weapon/storage/box/survival(BPK)
-		H.equip_if_possible(BPK, H.slot_back,1)
+
+		if(H.mind && H.mind.assigned_role != "Cyborg" && H.mind.assigned_role != "AI" && H.mind.assigned_role != "Clown")
+			if(H.backbag == 1) //Clown always gets his backbuddy.
+				H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H), H.slot_r_hand)
+
+			if(H.backbag == 2)
+				var/obj/item/weapon/storage/backpack/BPK = new/obj/item/weapon/storage/backpack(H)
+				new /obj/item/weapon/storage/box/survival(BPK)
+				H.equip_if_possible(BPK, H.slot_back,1)
+
+			if(H.backbag == 3)
+				var/obj/item/weapon/storage/backpack/BPK = new/obj/item/weapon/storage/backpack/satchel(H)
+				new /obj/item/weapon/storage/box/survival(BPK)
+				H.equip_if_possible(BPK, H.slot_back,1)
+
+
 		return 1


--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -337,11 +337,11 @@
 		else
 			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=wizard;jobban4=\ref[M]'>[dd_replacetext("Wizard", " ", "&nbsp")]</a></td>"

-		//Malfunctioning AI	//Removed Malf-bans because they're a pain to impliment
-//		if(jobban_isbanned(M, "malf AI") || isbanned_dept)
-//			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=malf AI;jobban4=\ref[M]'><font color=red>[dd_replacetext("Malf AI", " ", "&nbsp")]</font></a></td>"
-//		else
-//			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=malf AI;jobban4=\ref[M]'>[dd_replacetext("Malf AI", " ", "&nbsp")]</a></td>"
+/*		//Malfunctioning AI	//Removed Malf-bans because they're a pain to impliment
+		if(jobban_isbanned(M, "malf AI") || isbanned_dept)
+			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=malf AI;jobban4=\ref[M]'><font color=red>[dd_replacetext("Malf AI", " ", "&nbsp")]</font></a></td>"
+		else
+			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=malf AI;jobban4=\ref[M]'>[dd_replacetext("Malf AI", " ", "&nbsp")]</a></td>"

 		//Alien
 		if(jobban_isbanned(M, "alien candidate") || isbanned_dept)
@@ -354,7 +354,7 @@
 			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=infested monkey;jobban4=\ref[M]'><font color=red>[dd_replacetext("Infested Monkey", " ", "&nbsp")]</font></a></td>"
 		else
 			jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=infested monkey;jobban4=\ref[M]'>[dd_replacetext("Infested Monkey", " ", "&nbsp")]</a></td>"
-
+*/
 		jobs += "</tr></table>"

 		body = "<body>[jobs]</body>"
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1265,7 +1265,7 @@
 		stand_icon.Blend(rgb(-s_tone,  -s_tone,  -s_tone), ICON_SUBTRACT)
 		lying_icon.Blend(rgb(-s_tone,  -s_tone,  -s_tone), ICON_SUBTRACT)

-	if (underwear > 0)
+	if (underwear < 6 && underwear > 0)
 		if(!obese)
 			stand_icon.Blend(new /icon('human.dmi', "underwear[underwear]_[g]_s"), ICON_OVERLAY)
 			lying_icon.Blend(new /icon('human.dmi', "underwear[underwear]_[g]_l"), ICON_OVERLAY)
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -170,6 +170,7 @@
 	var/logged_in = 0

 	var/underwear = 1//Human
+	var/backbag = 2//Human
 	var/be_syndicate = 0//This really should be a client variable.
 	var/be_random_name = 0
 	var/const/blindness = 1//Carbon
--- a/code/modules/mob/new_player/preferences.dm
+++ b/code/modules/mob/new_player/preferences.dm
@@ -60,6 +60,10 @@ datum/preferences
 		//Just like it sounds
 		ooccolor = "#b82e00"
 		underwear = 1
+		list/underwear_m = list("White", "Grey", "Green", "Blue", "Black", "None") //Curse whoever made male/female underwear diffrent colours
+		list/underwear_f = list("Red", "White", "Yellow", "Blue", "Black", "None")
+		backbag = 2
+		list/backbaglist = list("Nothing", "Backpack", "Satchel")

 		//Hair type
 		h_style = "Short Hair"
@@ -106,6 +110,8 @@ datum/preferences
 		job_engsec_low = 0


+
+
 	New()
 		hair_style = new/datum/sprite_accessory/hair/short
 		facial_hair_style = new/datum/sprite_accessory/facial_hair/shaved
@@ -117,7 +123,6 @@ datum/preferences
 		update_preview_icon()
 		user << browse_rsc(preview_icon_front, "previewicon.png")
 		user << browse_rsc(preview_icon_side, "previewicon2.png")
-
 		var/dat = "<html><body>"
 		dat += "<b>Name:</b> "
 		dat += "<a href=\"byond://?src=\ref[user];preferences=1;real_name=input\"><b>[real_name]</b></a> "
@@ -141,13 +146,19 @@ datum/preferences
 		dat += "\t<a href=\"byond://?src=\ref[user];preferences=1;occ=1\"><b>Set Preferences</b></a><br>"

 		dat += "<hr><table><tr><td><b>Body</b> "
-		dat += "(<a href=\"byond://?src=\ref[user];preferences=1;s_tone=random;underwear=random;age=random;b_type=random;hair=random;h_style=random;facial=random;f_style=random;eyes=random\">&reg;</A>)" // Random look
+		dat += "(<a href=\"byond://?src=\ref[user];preferences=1;s_tone=random;underwear=random;backbag_type=random;age=random;b_type=random;hair=random;h_style=random;facial=random;f_style=random;eyes=random\">&reg;</A>)" // Random look
 		dat += "<br>"
 		dat += "Blood Type: <a href='byond://?src=\ref[user];preferences=1;b_type=input'>[b_type]</a><br>"
 		dat += "Skin Tone: <a href='byond://?src=\ref[user];preferences=1;s_tone=input'>[-s_tone + 35]/220<br></a>"

 	//	if(!IsGuestKey(user.key))//Seeing as it doesn't do anything, it may as well not show up.
-	//		dat += "Underwear: <a href =\"byond://?src=\ref[user];preferences=1;underwear=1\"><b>[underwear == 1 ? "Yes" : "No"]</b></a><br>"
+		if(gender == MALE)
+			dat += "Underwear: <a href =\"byond://?src=\ref[user];preferences=1;underwear=inputmale\"><b>[underwear_m[underwear]]</b></a><br>"
+		else
+			dat += "Underwear: <a href =\"byond://?src=\ref[user];preferences=1;underwear=inputfemale\"><b>[underwear_f[underwear]]</b></a><br>"
+
+		dat += "Backpack Type:<br><a href =\"byond://?src=\ref[user];preferences=1;backbag_type=input\"><b>[backbaglist[backbag]]</b></a><br>"
+
 		dat += "</td><td><b>Preview</b><br><img src=previewicon.png height=64 width=64><img src=previewicon2.png height=64 width=64></td></tr></table>"	//Carn: Now with profile!

 		dat += "<hr><b>Hair</b><br>"
@@ -548,18 +559,30 @@ datum/preferences
 			ghost_ears = !ghost_ears

 		if(link_tags["underwear"])
-			if(!IsGuestKey(user.key))
-				switch(link_tags["underwear"])
-					if("random")
-						if(prob (75))
-							underwear = 1
-						else
-							underwear = 0
-					if("input")
-						if(underwear == 1)
-							underwear = 0
-						else
-							underwear = 1
+			switch(link_tags["underwear"])
+				if("inputmale")
+					var/tempUnderwear = input(user, "Please select your underwear colour:", "Character Generation")  as null|anything in underwear_m
+					if(tempUnderwear)
+						underwear = underwear_m.Find(tempUnderwear)
+				if("inputfemale")
+					var/tempUnderwear = input(user, "Please select your underwear colour:", "Character Generation")  as null|anything in underwear_f
+					if(tempUnderwear)
+						underwear = underwear_f.Find(tempUnderwear)
+				if("random")
+					if(prob (75))
+						underwear = pick(1,2,3,4,5)
+					else
+						underwear = 6
+
+		if(link_tags["backbag_type"])
+			switch(link_tags["backbag_type"])
+				if("input")
+					var/tempBag = input(user, "Please pick a backpack type:", "Character Generation")  as null|anything in backbaglist
+					if(tempBag)
+						backbag = backbaglist.Find(tempBag)
+				if("random")
+					backbag = pick(1,2,3)
+

 		if(link_tags["be_special"])
 			src.be_special^=(1<<text2num(link_tags["be_special"])) //bitwize magic, sorry for that. --rastaf0
@@ -590,6 +613,7 @@ datum/preferences
 			job_engsec_med = 0
 			job_engsec_low = 0
 			underwear = 1
+			backbag = 2
 			be_special = 0
 			be_random_name = 0
 			r_hair = 0.0
@@ -647,7 +671,13 @@ datum/preferences
 		character.hair_style = hair_style
 		character.facial_hair_style = facial_hair_style

-		character.underwear = underwear == 1 ? pick(1,2,3,4,5) : 0
+		if(underwear > 5 || underwear < 1)
+			underwear = 1 //I'm sure this is 100% unnecessary, but I'm paranoid... sue me.
+		character.underwear = underwear
+
+		if(backbag > 3 || backbag < 1)
+			backbag = 1 //Same as above
+		character.backbag = backbag

 		character.update_face()
 		character.update_body()
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -13,6 +13,7 @@ datum/preferences
 			randomize_hair_color("facial")
 		randomize_eyes_color()
 		underwear = 1
+		backbag = 2
 		b_type = pick("A+", "A-", "B+", "B-", "AB+", "AB-", "O+", "O-")
 		age = rand(19,35)
 		copy_to(H,1)
@@ -218,7 +219,7 @@ datum/preferences
 		else
 			preview_icon.Blend(rgb(-s_tone,  -s_tone,  -s_tone), ICON_SUBTRACT)

-		if (underwear > 0)
+		if (underwear < 6)
 			preview_icon.Blend(new /icon('human.dmi', "underwear[underwear]_[g]_s"), ICON_OVERLAY)

 		var/icon/eyes_s = new/icon("icon" = 'human_face.dmi', "icon_state" = "eyes_s")
@@ -242,7 +243,7 @@ datum/preferences
 		preview_icon.Blend(eyes_s, ICON_OVERLAY)
 		preview_icon_front = new(preview_icon, dir = SOUTH)
 		preview_icon_side = new(preview_icon, dir = WEST)
-		
+
 		del(preview_icon)
 		del(mouth_s)
 		del(facial_s)
--- a/code/modules/mob/new_player/savefile.dm
+++ b/code/modules/mob/new_player/savefile.dm
@@ -48,6 +48,10 @@ datum/preferences/proc/savefile_save(mob/user)
 	F["eyes_blue"] << src.b_eyes
 	F["blood_type"] << src.b_type
 	F["underwear"] << src.underwear
+	F["backbag"] << src.backbag
+	F["backbag"] << src.backbag
+
+

 	F["be_special"] << src.be_special
 	F["UI"] << src.UI
@@ -97,6 +101,9 @@ datum/preferences/proc/savefile_load(mob/user)
 	F["eyes_blue"] >> src.b_eyes
 	F["blood_type"] >> src.b_type
 	F["underwear"] >> src.underwear
+	if(underwear == 0) underwear = 6 //For old players who have 0 in their savefile
+	F["backbag"] >> src.backbag
+	if(isnull(backbag)) backbag = 2
 	F["name_is_always_random"] >> src.be_random_name
 	F["midis"] >> src.midis
 	F["ghost_ears"] >> src.ghost_ears