Role Adjustments (some major some minor)

code/modules/jobs/job_types/bos.dm

@@ -40,7 +40,10 @@
 	H.mind.teach_crafting_recipe(/datum/crafting_recipe/gate_bos)
 
 /*
-Elder
+Elder 
+I fucking hate you this is an admin role
+don't re-add it you goblins
+admin role fuckers use it.
 */
 
 /datum/job/bos/f13elder
@@ -50,8 +53,8 @@ Elder
 	exp_type = EXP_TYPE_BROTHERHOODCOMMAND
 	head_announce = list("Security")
 	req_admin_notify = 1
-	total_positions = 1
-	spawn_positions = 1
+	total_positions = 0
+	spawn_positions = 0
 	description = "You are the Elder of this local chapter of the Brotherhood of Steel. You may be a veteran of warfare, an experienced commander or even a genius Scribe, and you command all the men within this bunker. Your main goals are to lead the Brotherhood, to solve conflicts inbetween castes and to manage the Head Paladin, Head Knight and Head Scribe."
 	supervisors = "the High Elders"
 	exp_requirements = 1200
@@ -92,7 +95,7 @@ Head Paladin
 	exp_requirements = 600
 
 	loadout_options = list(
-	/datum/outfit/loadout/hpa, //Laser Gatling, Super Sledge
+	/datum/outfit/loadout/hpa, //Laser Gatling, 
 	/datum/outfit/loadout/hpb, //Tribeam, Powerfist
 	/datum/outfit/loadout/hpc //14mm pistol, Shield, Pre-war Ripper
 	)
@@ -124,17 +127,15 @@ Head Paladin
 /datum/outfit/loadout/hpa
 	name = "Heavy Weapons Head Paladin"
 	backpack_contents = list(
-		/obj/item/gun/ballistic/automatic/m72 = 1,
-		/obj/item/ammo_box/magazine/m2mm = 2,
-		/obj/item/gun/energy/laser/wattz/magneto = 1,
-		/obj/item/stock_parts/cell/ammo/ec = 2
+		/obj/item/minigunpack = 1,
+		/obj/item/stock_parts/cell/ammo/ecp = 2
 		)
 
 /datum/outfit/loadout/hpb
 	name = "Refined Head Paladin"
 	backpack_contents = list(
-		/obj/item/gun/ballistic/automatic/bozar = 1,
-		/obj/item/ammo_box/magazine/m556/rifle = 2,
+		/obj/item/gun/energy/laser/scatter = 1,
+		/obj/item/stock_parts/cell/ammo/mfc = 3,
 		/obj/item/gun/energy/laser/wattz/magneto = 1,
 		/obj/item/stock_parts/cell/ammo/ec = 2
 		)
@@ -265,10 +266,11 @@ Head Knight
 		)
 
 /datum/outfit/loadout/hkc
-	name = "Backliner Head Knight"
+	name = "Explosives Head Knight"
 	backpack_contents = list(
-		/obj/item/gun/energy/laser/rcw = 1,
-		/obj/item/stock_parts/cell/ammo/ecp = 3
+		/obj/item/book/granter/trait/explosives_advanced = 1,
+		/obj/item/gun/ballistic/shotgun/automatic/combat/neostead = 1,
+		/obj/item/ammo_box/shotgun/buck = 3
 		)
 
 /datum/outfit/job/bos/f13headknight/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -301,10 +303,12 @@ Paladin
 	exp_requirements = 300
 
 	loadout_options = list(
-	/datum/outfit/loadout/paladina, //Frontline P
-	/datum/outfit/loadout/paladinb,	//Frontline SP
-	/datum/outfit/loadout/paladinc, //Heavy P
-	/datum/outfit/loadout/paladind	//Heavy SP
+	/datum/outfit/loadout/paladina, // AER12
+	/datum/outfit/loadout/paladinb,	// AER12 SP
+	/datum/outfit/loadout/paladinc, // RCW
+	/datum/outfit/loadout/paladind,	// RCW SP
+	/datum/outfit/loadout/paladine, // Pre-war Ripper
+	/datum/outfit/loadout/paladinf, // Pre-war Ripper SP
 	)
 
 	outfit = /datum/outfit/job/bos/f13paladin
@@ -332,7 +336,6 @@ Paladin
 	neck =	/obj/item/clothing/neck/mantle/bos/paladin
 	backpack_contents = list(
 		/obj/item/reagent_containers/hypospray/medipen/stimpak = 3,
-		/obj/item/melee/powered/ripper = 1,
 	)
 
 /datum/outfit/loadout/paladina
@@ -362,8 +365,8 @@ Paladin
 /datum/outfit/loadout/paladinc
 	name = "Heavy Paladin"
 	backpack_contents = list(
-		/obj/item/gun/energy/laser/scatter = 1,
-		/obj/item/stock_parts/cell/ammo/mfc = 3,
+		/obj/item/gun/energy/laser/rcw = 1,
+		/obj/item/stock_parts/cell/ammo/ecp = 3,
 		/obj/item/gun/energy/laser/wattz/magneto = 1,
 		/obj/item/stock_parts/cell/ammo/ec = 2,
 		/obj/item/clothing/suit/armor/f13/power_armor/t51b/bos = 1,
@@ -374,15 +377,38 @@ Paladin
 /datum/outfit/loadout/paladind
 	name = "Heavy Senior Paladin"
 	backpack_contents = list(
-		/obj/item/gun/energy/laser/scatter = 1,
-		/obj/item/stock_parts/cell/ammo/mfc = 3,
+		/obj/item/gun/energy/laser/rcw = 1,
+		/obj/item/stock_parts/cell/ammo/ecp = 3,
 		/obj/item/gun/energy/laser/wattz/magneto = 1,
 		/obj/item/stock_parts/cell/ammo/ec = 2,
 		/obj/item/clothing/suit/armor/f13/power_armor/t51b/bos = 1,
 		/obj/item/clothing/head/helmet/f13/power_armor/t51b/bos = 1,
 		/obj/item/clothing/accessory/bos/seniorpaladin = 1
 		)
 
+/datum/outfit/loadout/paladine
+	name = "CQC Paladin"
+	backpack_contents = list(
+		/obj/item/melee/powered/ripper/prewar = 1,
+		/obj/item/shield/riot/bullet_proof = 1,
+		/obj/item/gun/energy/laser/wattz/magneto = 1,
+		/obj/item/stock_parts/cell/ammo/ec = 2,
+		/obj/item/clothing/suit/armor/f13/power_armor/t51b/bos = 1,
+		/obj/item/clothing/head/helmet/f13/power_armor/t51b/bos = 1,
+		/obj/item/clothing/accessory/bos/paladin = 1
+		)	
+
+/datum/outfit/loadout/paladinf
+	name = "Senior CQC Paladin"
+	backpack_contents = list(
+		/obj/item/melee/powered/ripper/prewar = 1,
+		/obj/item/shield/riot/bullet_proof = 1,
+		/obj/item/gun/energy/laser/wattz/magneto = 1,
+		/obj/item/stock_parts/cell/ammo/ec = 2,
+		/obj/item/clothing/suit/armor/f13/power_armor/t51b/bos = 1,
+		/obj/item/clothing/head/helmet/f13/power_armor/t51b/bos = 1,
+		/obj/item/clothing/accessory/bos/paladin = 1
+		)		
 
 /datum/outfit/job/bos/f13paladin/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	..()
@@ -479,7 +505,7 @@ Senior Knight
 	supervisors = "the Head Knight"
 
 	loadout_options = list(
-	/datum/outfit/loadout/ska,	//AER9, MK23 pistol
+	/datum/outfit/loadout/ska,	//wattz2k, MK23 pistol
 	/datum/outfit/loadout/skb,	//Marksman Rifle, Sig pistol
 	/datum/outfit/loadout/skc	//Auto-5 Shotgun, MK23 pistol
 	)
@@ -517,9 +543,9 @@ Senior Knight
 		)
 
 /datum/outfit/loadout/ska
-	name = "Senior Knight-Footman"
+	name = "Senior Knight-Sniper"
 	backpack_contents = list(
-		/obj/item/gun/energy/laser/aer9 = 1,
+		/obj/item/gun/energy/laser/wattz2k = 1,
 		/obj/item/stock_parts/cell/ammo/mfc = 3,
 		/obj/item/gun/ballistic/automatic/pistol/mk23 = 1,
 		/obj/item/ammo_box/magazine/m45exp = 2
@@ -539,8 +565,8 @@ Senior Knight
 	name = "Senior Knight-Engineer"
 	backpack_contents = list(
 		/obj/item/storage/belt/utility/full/engi = 1,
-		/obj/item/gun/ballistic/shotgun/automatic/combat/auto5 = 1,
-		/obj/item/ammo_box/shotgun/buck = 2,
+		/obj/item/gun/ballistic/automatic/shotgun/riot = 1,
+		/obj/item/ammo_box/magazine/d12g = 2,
 		/obj/item/gun/ballistic/automatic/pistol/mk23 = 1,
 		/obj/item/ammo_box/magazine/m45exp = 2
 		)
@@ -607,7 +633,7 @@ Knight
 	head = 			/obj/item/clothing/head/helmet/f13/combat/brotherhood
 	backpack_contents = list(
 		/obj/item/melee/onehanded/knife/survival  = 1,
-		/obj/item/reagent_containers/hypospray/medipen/stimpak = 1,
+		/obj/item/reagent_containers/hypospray/medipen/stimpak = 1
 		)
 
 /datum/outfit/loadout/knighta