Merge branch 'quality-of-life-improment' of https://github.com/iMoeMo…

…e/Big-Iron into quality-of-life-improment

_maps/map_files/Pahrump/Pahrump-Above-3.dmm

@@ -379,6 +379,11 @@
 	icon_state = "whitegreenrustychess"
 	},
 /area/f13/building)
+"bj" = (
+/obj/structure/table,
+/obj/effect/spawner/lootdrop/f13/blueprintLowMid,
+/turf/open/floor/plasteel/f13/vault_floor/white,
+/area/f13/clinic)
 "bk" = (
 /obj/structure/fence{
 	dir = 1
@@ -2377,6 +2382,11 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood/f13/carpet,
 /area/f13/building)
+"hw" = (
+/obj/structure/table,
+/obj/item/locked_box/medical/drugs,
+/turf/open/floor/plasteel/f13/vault_floor/white,
+/area/f13/clinic)
 "hx" = (
 /obj/structure/table/reinforced,
 /turf/open/floor/plasteel/f13/vault_floor/floor,
@@ -3337,6 +3347,8 @@
 "kx" = (
 /obj/structure/table,
 /obj/effect/spawner/lootdrop/f13/junkspawners,
+/obj/effect/spawner/lootdrop/f13/blueprintMid,
+/obj/effect/spawner/lootdrop/f13/blueprintHigh,
 /turf/open/floor/plasteel/f13/vault_floor/white/whitesolid{
 	icon_state = "whitedirtysolid"
 	},
@@ -12270,6 +12282,8 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table,
 /obj/item/defibrillator/primitive,
+/obj/item/reagent_containers/hypospray/medipen/medx,
+/obj/item/reagent_containers/hypospray/medipen/medx,
 /turf/open/floor/plasteel/f13/vault_floor/white/whitesolid{
 	icon_state = "whitedirtysolid"
 	},
@@ -12526,6 +12540,7 @@
 /obj/item/organ/heart,
 /obj/item/reagent_containers/hypospray/medipen/stimpak/super,
 /obj/machinery/light,
+/obj/item/reagent_containers/hypospray/medipen/stimpak/super,
 /turf/open/floor/plasteel/f13/vault_floor/white/whitesolid{
 	icon_state = "whitedirtysolid"
 	},
@@ -63108,7 +63123,7 @@ pS
 CB
 WG
 EY
-MF
+hw
 xr
 lE
 EY
@@ -64662,7 +64677,7 @@ Ve
 Ve
 IS
 EY
-MF
+bj
 lq
 iZ
 EY

_maps/map_files/Pahrump/Pahrump-Underground-1.dmm

@@ -7420,6 +7420,7 @@
 /obj/effect/spawner/lootdrop/f13/weapon/melee/random_mid,
 /obj/effect/spawner/lootdrop/f13/weapon/melee/random,
 /obj/effect/spawner/lootdrop/f13/weapon/gun/tier4,
+/obj/effect/spawner/lootdrop/f13/armor/tier3,
 /turf/open/floor/f13{
 	icon_state = "bluerustysolid"
 	},
@@ -7722,11 +7723,6 @@
 /obj/item/reagent_containers/food/snacks/meat/slab/ant_meat,
 /turf/open/indestructible/ground/inside/subway,
 /area/f13/tunnel)
-"fAg" = (
-/obj/structure/simple_door/wood,
-/obj/item/mine/explosive,
-/turf/open/floor/wood/f13/oak,
-/area/f13/building)
 "fAi" = (
 /obj/machinery/light,
 /obj/effect/decal/cleanable/dirt,
@@ -8117,10 +8113,6 @@
 /obj/machinery/workbench/advanced,
 /turf/open/floor/wood/f13/oakbroken3,
 /area/f13/building)
-"fOy" = (
-/mob/living/simple_animal/hostile/raider/ranged/boss,
-/turf/open/floor/wood/f13/oak,
-/area/f13/building)
 "fOZ" = (
 /obj/structure/simple_door/metal/iron,
 /obj/structure/barricade/wooden/planks/pregame,
@@ -15577,6 +15569,7 @@
 /obj/structure/closet/cabinet,
 /obj/effect/spawner/lootdrop/f13/armor/clothes,
 /obj/effect/spawner/lootdrop/f13/armor/tier3,
+/obj/effect/spawner/lootdrop/f13/armor/tier4,
 /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
 /area/f13/tunnel)
 "lTu" = (
@@ -18292,6 +18285,8 @@
 /obj/effect/decal/cleanable/dirt{
 	color = "#363636"
 	},
+/obj/effect/spawner/lootdrop/f13/armor/tier3,
+/obj/effect/spawner/lootdrop/f13/armor/tier4,
 /turf/open/floor/plasteel/darkred/side{
 	dir = 4
 	},
@@ -19696,14 +19691,14 @@
 "pCg" = (
 /obj/structure/closet,
 /obj/effect/spawner/lootdrop/f13/blueprintLowPartsWeighted,
-/obj/effect/spawner/lootdrop/f13/weapon/gun/tier4,
 /mob/living/simple_animal/hostile/raider/junker/boss{
 	robust_searching = 1;
 	minimum_distance = 2;
 	retreat_distance = 5;
 	melee_damage_lower = 80;
 	melee_damage_upper = 80
 	},
+/obj/effect/spawner/lootdrop/f13/weapon/gun/tier5,
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/building)
 "pCJ" = (
@@ -20381,6 +20376,7 @@
 	dir = 1
 	},
 /obj/effect/spawner/lootdrop/f13/armor/tier3,
+/obj/effect/spawner/lootdrop/f13/armor/tier4,
 /turf/open/indestructible/ground/inside/subway,
 /area/f13/tunnel)
 "qhW" = (
@@ -25437,7 +25433,6 @@
 /obj/effect/decal/cleanable/dirt{
 	color = "#363636"
 	},
-/mob/living/simple_animal/hostile/raider/ranged/boss,
 /turf/open/floor/f13{
 	icon_state = "floorrusty"
 	},
@@ -26388,6 +26383,7 @@
 /area/f13/bunker)
 "vcM" = (
 /obj/item/reagent_containers/hypospray/medipen/stimpak,
+/obj/effect/spawner/lootdrop/f13/weapon/gun/tier5,
 /turf/open/floor/f13{
 	icon_state = "reddirtyfull"
 	},
@@ -28825,6 +28821,7 @@
 /obj/effect/decal/cleanable/dirt{
 	color = "000000"
 	},
+/obj/effect/spawner/lootdrop/f13/weapon/gun/tier4,
 /turf/open/floor/carpet/black,
 /area/f13/building)
 "wVg" = (
@@ -50150,7 +50147,7 @@ ajV
 enc
 bxT
 bxT
-fAg
+vEd
 rMm
 kGo
 mDq
@@ -50662,7 +50659,7 @@ vPg
 ydu
 xLj
 ocG
-fOy
+rrZ
 npt
 ydu
 iMA
@@ -71609,7 +71606,7 @@ vPg
 vPg
 vPg
 aoj
-lnr
+bcq
 iOJ
 aoj
 aoj

code/game/objects/effects/spawners/f13lootdrop.dm

@@ -1013,26 +1013,29 @@
 				/obj/item/gun/ballistic/automatic/smg/american180,
 				/obj/effect/spawner/bundle/f13/aer9,
 				/obj/effect/spawner/bundle/f13/wattz2k,
-				/obj/effect/spawner/lootdrop/f13/weapon/revolver44variants
+				/obj/effect/spawner/lootdrop/f13/weapon/revolver44variants,
+				/obj/effect/spawner/bundle/f13/mp5,
+				/obj/effect/spawner/bundle/f13/smg10mm
 				)
 
 /obj/effect/spawner/lootdrop/f13/weapon/gun/tier4
 	name = "tier four firearms"
-	loot = list(/obj/effect/spawner/bundle/f13/mp5,
-				/obj/effect/spawner/bundle/f13/smg10mm,
+	loot = list(
 				/obj/effect/spawner/bundle/f13/worn_assault_carbine,
 				/obj/effect/spawner/bundle/f13/marksman,
 				/obj/effect/spawner/bundle/f13/guns/tommygun,
 				/obj/effect/spawner/bundle/f13/shotgunlever,
 				/obj/effect/spawner/bundle/f13/aer12,
 				/obj/effect/spawner/bundle/f13/dkssniper,
 				/obj/effect/spawner/bundle/f13/plasmapistol,
-				/obj/effect/spawner/bundle/f13/wattz2kext
+				/obj/effect/spawner/bundle/f13/wattz2kext,
+				/obj/effect/spawner/bundle/f13/r82
 				)
 
 /obj/effect/spawner/lootdrop/f13/weapon/gun/tier5
 	name = "tier five firearms"
 	loot = list(/obj/effect/spawner/bundle/f13/assault_rifle,
+				/obj/effect/spawner/bundle/f13/infiltrator,
 				/obj/effect/spawner/bundle/f13/r84,
 				/obj/effect/spawner/bundle/f13/brushgun,
 				/obj/effect/spawner/bundle/f13/assault_carbine,

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

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)

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 ---------------------