diff --git a/code/modules/jobs/job_types/bos.dm b/code/modules/jobs/job_types/bos.dm
index b3bf6995..477cf8ac 100644
--- a/code/modules/jobs/job_types/bos.dm
+++ b/code/modules/jobs/job_types/bos.dm
@@ -389,8 +389,8 @@ Paladin
title = "Paladin"
flag = F13PALADIN
faction = "BOS"
- total_positions = 1
- spawn_positions = 1
+ total_positions = 2
+ spawn_positions = 2
description = "You answer directly to the Sentinel. You are this Chapter's main line of defense and offense; highly trained in combat and weaponry though with little practical field experience, you are eager to prove your worth to the Brotherhood. Your primary duties are defense and surface operations. You may also be assigned a trainee Initiate."
forbids = "The Brotherhood of Steel Forbids: Unethical human experimentation. Violence beyond what is needed to accomplish Brotherhood goals."
enforces = "The Brotherhood of Steel Expects: Obeying the Chain That - Binds your direct superior. Collection and safeguarding of technology from the wasteland. Experimentation and research."
@@ -445,8 +445,16 @@ Paladin
/obj/item/stock_parts/cell/ammo/mfc=2,
/obj/item/ammo_box/magazine/m10mm_adv=2,
/obj/item/clothing/accessory/bos/paladin=1
+ )
+
+/* - Needs work, just a lazy concept for the moment
+/datum/outfit/loadout.paladinlasgat
+ name = "Paladin Heavy Weapons Specialist"
+ backpack_contents = list(
+ /obj/item/gun/energy/laser/lasergatling=1
)
+*/
/*
Scribe
@@ -579,7 +587,7 @@ Initiate
flag = F13INITIATE
faction = "BOS"
total_positions = 3
- spawn_positions = 2
+ spawn_positions = 3
description = "Either recently inducted or born into the Brotherhood, you have since proven yourself worthy of assignment to the Chapter. You are to assist your superiors and receive training how they deem fit. You are NEVER allowed to leave the bunker without the direct supervision of a superior; doing so may result in exile or transferrence back the Valley."
forbids = "The Brotherhood of Steel Forbids: Unethical human experimentation. Violence beyond what is needed to accomplish Brotherhood goals."
enforces = "The Brotherhood of Steel Expects: Obeying the Chain That - Binds your direct superior. Collection and safeguarding of technology from the wasteland. Experimentation and research."
diff --git a/code/modules/jobs/job_types/legion.dm b/code/modules/jobs/job_types/legion.dm
index fae7d4c2..de2c4aeb 100644
--- a/code/modules/jobs/job_types/legion.dm
+++ b/code/modules/jobs/job_types/legion.dm
@@ -5,7 +5,7 @@
selection_color = "#ffeeee"
exp_type = EXP_TYPE_LEGION
forbids = "The Legion forbids: Ghouls joining the Legion. Women in armed roles. Chems and drugs such as jet or alcohol. Reliance on technology. Lethally harming any servants of Caesar without proper reason."
- enforces = "The Legion expects: Obeying orders of superiors. A roman style name. Wearing the uniform, unless acting as a nonlethal infiltrator."
+ enforces = "The Legion expects: Obeying orders of superiors. A roman style name. Wearing your uniform, unless acting as a nonlethal infiltrator."
/datum/outfit/job/CaesarsLegion
id = null
@@ -176,8 +176,8 @@ Orator - lol no just kidding it's a not-so-useless role. :)
title = "Legion Libritor"
flag = F13LIBRITOR
faction = "Legion"
- total_positions = 2
- spawn_positions = 2
+ total_positions = 0
+ spawn_positions = 0
description = "You are, effectively, the counter to the Bear's 'heavy troopers', as you carry some pretty heavy equipment yourself. A much larger gun, in fact. Don't let down your fellows."
supervisors = "the Centurion and Decani"
@@ -377,8 +377,8 @@ datum/job/CaesarsLegion/Legionnaire/f13slavemaster
title = "Legion Slavemaster"
flag = F13SLAVEMASTER
faction = "Legion"
- total_positions = 1
- spawn_positions = 1
+ total_positions = 0
+ spawn_positions = 0
description = "You are the feared and respected disciplinary corps of the Legion. Acting as both master of the Slaves and de-facto executioner of the Centurion's will within his ranks, you are a faceless and undoubtedly cruel torturer... but be careful to not let your hubris and malice lead to a strikeback from those you thought broken."
supervisors = "the Decani and Centurion"
@@ -473,7 +473,7 @@ Veteran Legionary
H.add_quirk("Big Leagues")
/*
-Prime Legionairy
+Prime Legionary
*/
/datum/job/CaesarsLegion/Legionnaire/f13prime
@@ -593,7 +593,7 @@ Explorer
loadout_options = list(
- /datum/outfit/loadout/explinfil, //C4, engineering supplies
+ /datum/outfit/loadout/explinfil, //Engineering Supplies, 1 Block of C-4, and a .44 Revolver
/datum/outfit/loadout/explscout, //.44 trail carbine
//datum/outfit/loadout/explassassin //.308 DKS sniper rifle
)
diff --git a/code/modules/jobs/job_types/wasteland.dm b/code/modules/jobs/job_types/wasteland.dm
index c48926b2..9f2ad99d 100644
--- a/code/modules/jobs/job_types/wasteland.dm
+++ b/code/modules/jobs/job_types/wasteland.dm
@@ -34,9 +34,9 @@ Great Khan
title = "Great Khan"
flag = F13PUSHER
faction = "Wastelander"
- total_positions = 0
- spawn_positions = 0
- description = "You are no common raider or tribal settler, for you are a Great Khan. Your ancestry is that of fierce warriors and noble chieftans, whose rites and sagas tell of blood soaked battlefields and great sacrifice for your tribe. At least, this was once the case: after the massacre at Bitter Springs by the NCR, your people have lost much of their strength - now you and many other Khans travel west of Vegas through Red Rock Canyon in the hopes of settling in the region of Pahrump. You are not a raider, and should not act as such without permission from server staff."
+ total_positions = 3
+ spawn_positions = 3
+ description = "You are no common raider or tribal settler, for you are a Great Khan. Your ancestry is that of fierce warriors and noble chieftans, whose rites and sagas tell of blood soaked battlefields and great sacrifice for your tribe. At least, this was once the case: after the massacre at Bitter Springs by the NCR, your people have lost much of their strength - now you and many other Khans travel west of Vegas through Red Rock Canyon in the hopes of settling in this region. You are not a raider, and should not act as such without permission from server staff."
supervisors = "your gang leadership"
selection_color = "#ff915e"
exp_requirements = 120
diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi
index 78fcecbf..f0e4a0c3 100644
Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ