specialisation of specialists 2 (#337)

* a * a * a * Update enclave.dm * a * ea * Update enclave.dm
Foundation-19 · Nov 14, 2023 · 99a7d34 · 99a7d34
1 parent d57c93b
commit 99a7d34
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 25 deletions.
diff --git a/code/modules/jobs/job_types/bos.dm b/code/modules/jobs/job_types/bos.dm
@@ -237,7 +237,7 @@ Head Knight
 	suit = 			/obj/item/clothing/suit/armor/f13/combat/brotherhood/captain
 	glasses =		/obj/item/clothing/glasses/night
 	accessory =		/obj/item/clothing/accessory/bos/headknight
-	belt =			/obj/item/storage/belt/security/full
+	belt =			/obj/item/storage/belt/utility/full/engi
 	neck =			/obj/item/storage/belt/holster
 	mask =			/obj/item/clothing/mask/gas/sechailer
 	head =			/obj/item/clothing/head/helmet/f13/combat/brotherhood/captain

diff --git a/code/modules/jobs/job_types/enclave.dm b/code/modules/jobs/job_types/enclave.dm
@@ -150,32 +150,51 @@
 	outfit = /datum/outfit/job/enclave/peacekeeper/f13gysergeant
 	exp_requirements = 600
 
+	loadout_options = list(
+		/datum/outfit/loadout/gysergeantshotgun, // shotgun + ripper
+		/datum/outfit/loadout/gysergeantrifle // carbine, suppressor, ESDs
+		)
+
+/datum/outfit/job/enclave/peacekeeper/f13gysergeant/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+	..()
+	if(visualsOnly)
+		return
+	ADD_TRAIT(H, TRAIT_HARD_YARDS, src)
+	ADD_TRAIT(H, TRAIT_LIFEGIVER, src)
+
 /datum/outfit/job/enclave/peacekeeper/f13gysergeant
 	name = "Enclave Gunnery Sergeant"
 	jobtype = /datum/job/enclave/f13gysergeant
 	head = /obj/item/clothing/head/helmet/f13/enclave/marine
 	suit = /obj/item/clothing/suit/armor/f13/enclave/marine
-	suit_store = /obj/item/gun/ballistic/shotgun/automatic/combat/neostead
 	accessory = /obj/item/clothing/accessory/enclave/master_sergeant
-
 	backpack_contents = list(
-		/obj/item/ammo_box/magazine/m45exp = 2,
-		/obj/item/gun/ballistic/automatic/pistol/mk23 = 1,
 		/obj/item/reagent_containers/hypospray/medipen/stimpak = 2,
+		/obj/item/gun/ballistic/automatic/pistol/mk23 = 1,
+		/obj/item/ammo_box/magazine/m45exp = 2,
 		/obj/item/grenade/flashbang = 1,
-		/obj/item/ammo_box/shotgun/buck = 2,
 		/obj/item/pda = 1,
 		/obj/item/storage/bag/money/small/wastelander = 1,
-		/obj/item/melee/onehanded/knife/survival = 1,
+		/obj/item/melee/onehanded/knife/survival = 1
 		)
 
-/datum/outfit/job/enclave/peacekeeper/f13gysergeant/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
-	..()
-	if(visualsOnly)
-		return
-	ADD_TRAIT(H, TRAIT_HARD_YARDS, src)
-	ADD_TRAIT(H, TRAIT_LIFEGIVER, src)
+/datum/outfit/loadout/gysergeantshotgun
+	name = "CQC Sergeant"
+	suit_store = /obj/item/gun/ballistic/shotgun/automatic/combat/citykiller
+	backpack_contents = list(
+		/obj/item/ammo_box/shotgun/slug = 2,
+		/obj/item/ammo_box/shotgun/buck = 2,
+		/obj/item/melee/powered/ripper/prewar = 1
+		)
 
+/datum/outfit/loadout/gysergeantrifle
+	name = "Support Sergeant"
+	suit_store = /obj/item/gun/ballistic/automatic/assault_carbine
+	backpack_contents = list(
+		/obj/item/ammo_box/magazine/m5mm = 4,
+		/obj/item/ammo_box/m5mmbox/shock = 1,
+		/obj/item/suppressor = 1
+		)
 
 //Armored Infantry
 
@@ -277,6 +296,11 @@
 	outfit = /datum/outfit/job/enclave/peacekeeper/f13specialist
 	exp_requirements = 300
 
+	loadout_options = list(
+		/datum/outfit/loadout/specmedic,
+		/datum/outfit/loadout/specengi
+		)
+
 /datum/outfit/job/enclave/peacekeeper/f13specialist
 	name = "Enclave Specialist"
 	jobtype = /datum/job/enclave/f13specialist
@@ -290,11 +314,29 @@
 		/obj/item/pda = 1,
 		/obj/item/storage/bag/money/small/wastelander = 1,
 		/obj/item/melee/onehanded/knife/survival = 1,
-		/obj/item/storage/firstaid/ancient = 1,
-		/obj/item/gun/medbeam = 1,
 		/obj/item/ammo_box/magazine/m556/rifle = 3,
 		)
 
+/datum/outfit/loadout/specmedic
+	name = "Medic"
+	backpack_contents = list(
+		/obj/item/gun/medbeam = 1,
+		/obj/item/storage/firstaid/ancient = 1,
+		/obj/item/reagent_containers/hypospray/medipen/stimpak = 4,
+		/obj/item/book/granter/trait/midsurgery = 1,
+		/obj/item/book/granter/trait/chemistry = 1
+		)
+
+/datum/outfit/loadout/specengi
+	name = "Engineer"
+	backpack_contents = list(
+		/obj/item/gun/ballistic/revolver/grenadelauncher = 1,
+		/obj/item/ammo_box/a40mm = 2,
+		/obj/item/storage/belt/utility/full/engi = 1,
+		/obj/item/book/granter/trait/techno = 1,
+		/obj/item/book/granter/trait/explosives = 1
+		)
+
 /datum/outfit/job/enclave/peacekeeper/f13specialist/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	..()
 	if(visualsOnly)

diff --git a/code/modules/jobs/job_types/legion.dm b/code/modules/jobs/job_types/legion.dm
@@ -637,6 +637,11 @@ Weapons		Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al
 	supervisors = "the Decanii"
 	display_order = JOB_DISPLAY_ORDER_EXPLORER
 	outfit = /datum/outfit/job/CaesarsLegion/Legionary/f13explorer
+
+	loadout_options = list(
+		/datum/outfit/loadout/sniper,	// scoped rifle
+		/datum/outfit/loadout/skirmisher, 		// SMG and tools
+		)
 
 	matchmaking_allowed = list(
 		/datum/matchmaking_pref/friend = list(
@@ -663,17 +668,32 @@ Weapons		Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al
 	suit = /obj/item/clothing/suit/armor/f13/legion/vet/explorer
 	head = /obj/item/clothing/head/helmet/f13/legion/vet/explorer
 	glasses = /obj/item/clothing/glasses/sunglasses/big
-	belt = /obj/item/storage/backpack/spearquiver
 	neck = /obj/item/storage/belt/holster
-	suit_store = /obj/item/gun/ballistic/rifle/hunting
 	r_pocket = /obj/item/flashlight
 	l_pocket = /obj/item/binoculars
 	backpack_contents = list(
 		/obj/item/storage/bag/money/small/legenlisted = 1,
-		/obj/item/attachments/scope = 1,
 		/obj/item/melee/onehanded/machete = 1,
-		/obj/item/restraints/handcuffs = 1,
-		/obj/item/ammo_box/a308 = 2,
+		/obj/item/storage/survivalkit/medical/legion = 1,
+		/obj/item/reagent_containers/pill/patch/healpoultice = 1
+		)
+
+/datum/outfit/loadout/sniper
+	name = "Sniper Explorer"
+	suit_store = /obj/item/gun/ballistic/rifle/repeater/trail
+	backpack_contents = list(
+		/obj/item/ammo_box/tube/m44 = 4,
+		/obj/item/attachments/scope = 1
+		)
+
+/datum/outfit/loadout/skirmisher
+	name = "Skirmishing Explorer"
+	suit_store = /obj/item/gun/ballistic/automatic/smg/cg45
+	backpack_contents = list(
+		/obj/item/ammo_box/magazine/cg45 = 2,
+		/obj/item/book/granter/trait/explosives = 1,
+		/obj/item/grenade/plastic/c4 = 1,
+		/obj/item/grenade/smokebomb = 2
 		)
 
 // ----------------- FRUMENTARIUS ---------------------

diff --git a/code/modules/jobs/job_types/ncr.dm b/code/modules/jobs/job_types/ncr.dm
@@ -557,11 +557,11 @@ Weapons		Service Rifle, Grease Gun, 9mm pistol, all good.
 	suit = /obj/item/clothing/suit/armor/f13/trailranger
 	belt = /obj/item/storage/belt/military/NCR_Bandolier
 	neck = /obj/item/clothing/neck/mantle/ranger
-	suit_store = /obj/item/gun/ballistic/rifle/repeater/cowboy
+	suit_store = /obj/item/gun/ballistic/rifle/repeater/trail
 	backpack_contents = list(
 		/obj/item/storage/box/ration/ranger_lunch = 1,
 		/obj/item/gun/ballistic/revolver/colt357 = 1,
-		/obj/item/ammo_box/tube/a357 = 4
+		/obj/item/ammo_box/tube/m44 = 4
 		)
 
 /datum/outfit/loadout/rangerpatrol
@@ -704,13 +704,13 @@ Weapons		Service Rifle, Grease Gun, 9mm pistol, all good.
 		)
 /datum/outfit/loadout/combatengineerdestroyer
 	name = "Explosives Expert"
-	suit_store = /obj/item/gun/ballistic/shotgun/hunting
+	suit_store = /obj/item/gun/ballistic/revolver/grenadelauncher
 	backpack_contents = list(
 		/obj/item/storage/box/ration/menu_ten = 1,
+		/obj/item/ammo_box/a40mm = 2,
 		/obj/item/grenade/plastic/c4 = 1,
 		/obj/item/book/granter/crafting_recipe/blueprint/trapper = 1,
-		/obj/item/book/granter/trait/explosives = 1,
-		/obj/item/ammo_box/shotgun/buck = 3
+		/obj/item/book/granter/trait/explosives = 1
 		)
 
 /datum/outfit/job/ncr/f13combatengineer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)