Final touches for loadout system.

code/game/jobs/job_controller.dm

@@ -350,6 +350,7 @@ var/global/datum/controller/occupations/job_master
 		if(!H)	return 0
 
 		var/datum/job/job = GetJob(rank)
+		var/list/spawn_in_storage = list()
 
 		if(job)
 
@@ -377,8 +378,8 @@ var/global/datum/controller/occupations/job_master
 						if(G.slot)
 							H.equip_to_slot_or_del(new G.path(H), G.slot)
 						else
-							spawn(1)
-								new G.path(get_turf(H))
+							spawn_in_storage += thing
+
 
 			//Equip job items.
 			job.equip(H)
@@ -460,6 +461,17 @@ var/global/datum/controller/occupations/job_master
 							new /obj/item/weapon/storage/box/survival(BPK)
 							H.equip_to_slot_or_del(BPK, slot_back,1)
 
+					//Deferred item spawning.
+					var/obj/item/weapon/storage/B = locate(/obj/item/weapon/storage/backpack) in H.contents
+
+					if(isnull(B) || istype(B))
+						B = locate(/obj/item/weapon/storage/box) in H.contents
+
+					if(!isnull(B))
+						for(var/thing in spawn_in_storage)
+							var/datum/gear/G = gear_datums[thing]
+							new G.path(B)
+
 		//TODO: Generalize this by-species
 		if(H.species)
 			if(H.species.name == "Tajaran" || H.species.name == "Unathi")

code/modules/client/preferences_gear.dm

@@ -14,6 +14,22 @@ proc/populate_gear_list()
 	var/whitelisted        //Term to check the whitelist for..
 
 //Standard gear datums.
+
+/datum/gear/cards
+	display_name = "deck of cards"
+	path = /obj/item/weapon/deck
+	cost = 2
+
+/datum/gear/dice
+	display_name = "d20"
+	path = /obj/item/weapon/dice/d20
+	cost = 1
+
+/datum/gear/comb
+	display_name = "purple comb"
+	path = /obj/item/weapon/fluff/cado_keppel_1
+	cost = 1
+
 /datum/gear/tie_horrible
 	display_name = "horrible tie"
 	path = /obj/item/clothing/tie/horrible
@@ -347,6 +363,19 @@ proc/populate_gear_list()
 	cost = 3
 	allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer")
 
+/datum/gear/engineer_bandana
+	display_name = "engineering bandana"
+	path = /obj/item/clothing/head/helmet/greenbandana/fluff/taryn_kifer_1
+	cost = 2
+	allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer")
+
+//Science
+/datum/gear/scanning_goggles
+	display_name = "scanning goggles"
+	path = /obj/item/clothing/glasses/fluff/uzenwa_sissra_1
+	cost = 2
+	allowed_roles = list("Roboticist", "Scientist", "Research Director")
+
 //Species-specific gear datums.
 /datum/gear/zhan_furs
 	display_name = "Zhan-Khazan furs"

code/modules/clothing/suits/alien.dm

@@ -23,10 +23,6 @@
 	item_state = "zhan_furs"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 
-	sprite_sheets = list(
-		"Tajaran" = 'icons/mob/species/tajaran/suit.dmi',
-		)
-
 /obj/item/clothing/head/tajaran/scarf
 	name = "headscarf"
 	desc = "A scarf of coarse fabric. Seems to have ear-holes."