Merge branch 'master' of https://github.com/Greenjoe12345/Polaris into swordsandbow

code/datums/datacore.dm

@@ -416,7 +416,8 @@ var/global/list/PDA_Manifest = list()
 	return
 
 /proc/generate_record_id()
-	return add_zero(num2hex(rand(1, 65535)), 4)	//no point generating higher numbers because of the limitations of num2hex
+	return "000[random_hex_text(3, TRUE)]"
+
 
 /datum/datacore/proc/CreateGeneralRecord(var/mob/living/carbon/human/H, var/id, var/hidden)
 	ResetPDAManifest()
@@ -431,7 +432,7 @@ var/global/list/PDA_Manifest = list()
 		side = icon('html/images/no_image32.png')
 
 	if(!id)
-		id = text("[]", add_zero(num2hex(rand(1, 65536)), 4))
+		id = generate_record_id()
 	var/datum/data/record/G = new /datum/data/record()
 	G.name = "Employee Record #[id]"
 	G.fields["name"] = "New Record"

code/datums/outfits/jobs/civilian.dm

@@ -54,6 +54,7 @@
 	backpack = /obj/item/weapon/storage/backpack/hydroponics
 	satchel_one = /obj/item/weapon/storage/backpack/satchel/hyd
 	messenger_bag = /obj/item/weapon/storage/backpack/messenger/hyd
+	sports_bag = /obj/item/weapon/storage/backpack/sport/hyd
 	id_type = /obj/item/weapon/card/id/civilian/botanist
 	pda_type = /obj/item/device/pda/botanist
 

code/datums/outfits/jobs/medical.dm

@@ -65,6 +65,7 @@
 	suit = /obj/item/clothing/suit/storage/toggle/labcoat/chemist
 	backpack = /obj/item/weapon/storage/backpack/chemistry
 	satchel_one = /obj/item/weapon/storage/backpack/satchel/chem
+	sports_bag = /obj/item/weapon/storage/backpack/sport/chem
 	id_type = /obj/item/weapon/card/id/medical/chemist
 	pda_type = /obj/item/device/pda/chemist
 

code/datums/outfits/jobs/science.dm

@@ -7,6 +7,7 @@
 	backpack = /obj/item/weapon/storage/backpack/toxins
 	satchel_one = /obj/item/weapon/storage/backpack/satchel/tox
 	messenger_bag = /obj/item/weapon/storage/backpack/messenger/tox
+	sports_bag = /obj/item/weapon/storage/backpack/sport/tox
 
 /decl/hierarchy/outfit/job/science/rd
 	name = OUTFIT_JOB_NAME("Research Director")

code/datums/outfits/jobs/security.dm

@@ -8,6 +8,7 @@
 	satchel_one = /obj/item/weapon/storage/backpack/satchel/sec
 	backpack_contents = list(/obj/item/weapon/handcuffs = 1)
 	messenger_bag = /obj/item/weapon/storage/backpack/messenger/sec
+	sports_bag = /obj/item/weapon/storage/backpack/sport/sec
 
 /decl/hierarchy/outfit/job/security/hos
 	name = OUTFIT_JOB_NAME("Head of security")

code/datums/outfits/outfit.dm

@@ -41,7 +41,7 @@ var/list/outfits_decls_by_type_
 	var/l_hand = null
 	// In the list(path=count,otherpath=count) format
 	var/list/uniform_accessories = list() // webbing, armbands etc - fits in slot_tie
-	var/list/backpack_contents = list() 
+	var/list/backpack_contents = list()
 
 	var/id_type
 	var/id_desc
@@ -56,6 +56,7 @@ var/list/outfits_decls_by_type_
 	var/satchel_one  = /obj/item/weapon/storage/backpack/satchel/norm
 	var/satchel_two  = /obj/item/weapon/storage/backpack/satchel
 	var/messenger_bag = /obj/item/weapon/storage/backpack/messenger
+	var/sports_bag = /obj/item/weapon/storage/backpack/sport
 
 	var/flags // Specific flags
 
@@ -76,6 +77,7 @@ var/list/outfits_decls_by_type_
 			if(3) back = satchel_one
 			if(4) back = satchel_two
 			if(5) back = messenger_bag
+			if(6) back = sports_bag
 			else back = null
 
 /decl/hierarchy/outfit/proc/post_equip(mob/living/carbon/human/H)

code/datums/wires/explosive.dm

@@ -31,4 +31,5 @@
 
 /datum/wires/explosive/c4/explode()
 	var/obj/item/weapon/plastique/P = holder
-	P.explode(get_turf(P))
+	P.set_target(get_turf(P))
+	P.detonate()