citizen loadout

code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm

@@ -261,6 +261,7 @@
 	result = /obj/item/gun/ballistic/revolver/single_shotgun
 	reqs = list(/obj/item/screwdriver = 1,
 	/obj/item/twohanded/baseball = 1,
+	/obj/item/stack/crafting/metalparts = 2,
 	/obj/item/ammo_casing/shotgun = 1,
 	/obj/item/stack/rods = 1)
 	tools = list(TOOL_WORKBENCH)
@@ -360,7 +361,7 @@
 	result = /obj/item/gun/ballistic/automatic/pistol/n99
 	reqs = list(/obj/item/stack/sheet/mineral/wood = 1,
 				/obj/item/stack/crafting/metalparts = 3,
-				/obj/item/stack/sheet/metal = 1)
+				/obj/item/stack/sheet/metal = 1,)
 	tools = list(TOOL_WORKBENCH)
 	time = 120
 	category = CAT_WEAPONRY
@@ -373,8 +374,7 @@
 	result = /obj/item/gun/ballistic/rifle/hunting
 	reqs = list(/obj/item/stack/sheet/mineral/wood = 1,
 				/obj/item/stack/crafting/metalparts = 4,
-				/datum/reagent/blackpowder = 20,
-				/obj/item/stack/sheet/metal = 3)
+				/obj/item/stack/sheet/metal = 3,)
 	tools = list(TOOL_WORKBENCH)
 	time = 120
 	category = CAT_WEAPONRY
@@ -455,7 +455,7 @@
 				/obj/item/stack/crafting/goodparts = 1,
 				/obj/item/suppressor = 1,
 				/obj/item/stack/sheet/plastic = 3,
-				/datum/reagent/blackpowder = 30)
+	)
 	tools = list(TOOL_AWORKBENCH)
 	time = 120
 	category = CAT_WEAPONRY
@@ -469,7 +469,7 @@
 	reqs = list(/obj/item/stack/sheet/mineral/wood = 1,
 				/obj/item/stack/crafting/metalparts = 3,
 				/obj/item/stack/sheet/metal = 3,
-				/datum/reagent/blackpowder = 15)
+	)
 	tools = list(TOOL_WORKBENCH)
 	time = 120
 	category = CAT_WEAPONRY
@@ -574,7 +574,7 @@
 	reqs = list(/obj/item/stack/sheet/metal = 5,
 				/obj/item/advanced_crafting_components/receiver = 1,
 				/obj/item/stack/crafting/metalparts = 3,
-				/datum/reagent/blackpowder = 20)
+	)
 	tools = list(TOOL_WORKBENCH)
 	time = 120
 	category = CAT_WEAPONRY
@@ -588,7 +588,7 @@
 	reqs = list(/obj/item/stack/sheet/metal = 5,
 				/obj/item/advanced_crafting_components/receiver = 1,
 				/obj/item/stack/crafting/metalparts = 3,
-				/datum/reagent/blackpowder = 20)
+	)
 	tools = list(TOOL_WORKBENCH)
 	time = 120
 	category = CAT_WEAPONRY
@@ -600,8 +600,7 @@
 	name = ".223 Pistol"
 	result = /obj/item/gun/ballistic/revolver/thatgun
 	reqs = list(/obj/item/stack/crafting/metalparts = 2,
-				/datum/reagent/blackpowder = 15,
-				/obj/item/stack/sheet/metal = 3)
+				/obj/item/stack/sheet/metal = 3,)
 	tools = list(TOOL_WORKBENCH)
 	time = 120
 	category = CAT_WEAPONRY
@@ -669,9 +668,8 @@
 	reqs = list(/obj/item/stack/sheet/metal = 10,
 				/obj/item/advanced_crafting_components/assembly = 1,
 				/obj/item/advanced_crafting_components/receiver = 1,
-				/datum/reagent/blackpowder = 30,
-				/obj/item/stack/crafting/goodparts = 3
-				)
+				/obj/item/stack/crafting/goodparts = 3,
+	)
 	tools = list(TOOL_WORKBENCH)
 	time = 120
 	category = CAT_WEAPONRY
@@ -817,8 +815,7 @@
 				/obj/item/advanced_crafting_components/assembly = 1,
 				/obj/item/advanced_crafting_components/alloys = 1,
 				/obj/item/advanced_crafting_components/receiver = 1,
-				/datum/reagent/blackpowder = 30,
-				/obj/item/stack/crafting/goodparts = 10
+				/obj/item/stack/crafting/goodparts = 10,
 				)
 	tools = list(TOOL_WORKBENCH)
 	time = 120

code/modules/clothing/suits/f13armor.dm

@@ -654,8 +654,10 @@
 /obj/item/clothing/suit/armor/f13/chitinarmor
 	name = "insect chitin armor"
 	desc = "(IV) A set of light armor made of insect chitin. Tough and light, it provides some moderate protection from trauma while allowing the user to remain mobile and protected from the elements."
-	icon_state = "insect_armor"
-	item_state = "insect_armor"
+	icon = 'icons/fallout/clothing/armored_light.dmi'
+	mob_overlay_icon = 'icons/fallout/onmob/clothes/armor_light.dmi'
+	icon_state = "insect"
+	item_state = "insect"
 	armor = list("tier" = 4, "energy" = 25, "bomb" = 25, "bio" = 70, "rad" = 65, "fire" = 80, "acid" = 100)
 	flags_inv = HIDEJUMPSUIT
 	strip_delay = 40
@@ -741,8 +743,8 @@
 /obj/item/clothing/suit/armor/f13/battlecoat/vault
 	name = "command coat"
 	desc = "(III) A heavy pre-war bomber coat, dyed blue with the number '113' embroidered on the back. Most often worn by leaders, such as the Overseer."
-	icon_state = "vault_commandcoat"
-	item_state = "vault_commandcoat"
+	icon_state = "maxson_battlecoat"
+	item_state = "maxson_battlecoat"
 	armor = list("tier" = 3)
 
 /obj/item/clothing/suit/armor/f13/battlecoat/vault/overseer

code/modules/clothing/suits/f13factionarmor.dm

@@ -666,8 +666,8 @@
 	desc = "(V) Heavy armor make of sturdy leather and pieces of bone. Worn by seasoned veterans within the Wayfinder tribe."
 	icon = 'icons/fallout/clothing/armored_heavy.dmi'
 	mob_overlay_icon = 'icons/fallout/onmob/clothes/armor_heavy.dmi'
-	icon_state = "heavy_tribal_armor"
-	item_state = "heavy_tribal_armor"
+	icon_state = "tribal_heavy"
+	item_state = "tribal_heavy"
 	armor = list("tier" = 5, "energy" = 45, "bomb" = 55, "bio" = 60, "rad" = 15, "fire" = 60, "acid" = 30)
 	flags_inv = HIDEJUMPSUIT
 	allowed = list(/obj/item/gun, /obj/item/kitchen, /obj/item/twohanded, /obj/item/claymore, /obj/item/melee/onehanded, /obj/item/twohanded/spear, /obj/item/melee/smith, /obj/item/melee/smith/twohand

code/modules/food_and_drinks/recipes/drinks_recipes.dm

@@ -1032,3 +1032,32 @@
 	results = list(/datum/reagent/consumable/ethanol/rotgut = 5)
 	required_reagents = list(/datum/reagent/space_cleaner = 1, /datum/reagent/consumable/ethanol/whiskey = 2, /datum/reagent/oil = 1, /datum/reagent/consumable/ethanol = 1)
 
+/datum/chemical_reaction/nukavictory
+	name = "Nuka Victory"
+	id = /datum/reagent/consumable/ethanol/nukavictory
+	results = list(/datum/reagent/consumable/ethanol/nukavictory = 2)
+	required_reagents = list(/datum/reagent/consumable/nuka_cola = 1, /datum/reagent/consumable/ethanol/thirteenloko = 1)
+
+/datum/chemical_reaction/nukaquartz
+	name = "Nuka Quartz"
+	id = /datum/reagent/consumable/nukaquartz
+	results = list(/datum/reagent/consumable/nukaquartz = 3)
+	required_reagents = list(/datum/reagent/consumable/nuka_cola = 1, /datum/reagent/silicon = 1, /datum/reagent/consumable/sugar = 1)
+
+/datum/chemical_reaction/nukacherry
+	name = "Nuka Cherry"
+	id = /datum/reagent/consumable/nukacherry
+	results = list(/datum/reagent/consumable/nukacherry = 4)
+	required_reagents = list(/datum/reagent/consumable/nuka_cola = 3, /datum/reagent/consumable/cherryjelly = 1)
+
+/datum/chemical_reaction/nukalove
+	name = "Nuka Love"
+	id = /datum/reagent/consumable/ethanol/nukalove
+	results = list(/datum/reagent/consumable/ethanol/nukalove = 2)
+	required_reagents = list(/datum/reagent/consumable/nukacherry = 1, /datum/reagent/consumable/nukaquartz = 1)
+
+/datum/chemical_reaction/nukaquantum
+	name = "Nuka Quantum"
+	id = /datum/reagent/consumable/ethanol/nukaquantum
+	results = list(/datum/reagent/consumable/ethanol/nukaquantum = 3) ////results in only 3 instead of 5
+	required_reagents = list(/datum/reagent/consumable/nuka_cola = 2, /datum/reagent/uranium = 1, /datum/reagent/bluespace = 1, /datum/reagent/consumable/bluecherryjelly= 1)

code/modules/jobs/job_types/legion.dm

@@ -596,7 +596,7 @@ commented out pending rework*/
 	ADD_TRAIT(H, TRAIT_HARD_YARDS, src)
 	ADD_TRAIT(H, TRAIT_BIG_LEAGUES, src)
 	ADD_TRAIT(H, TRAIT_LIFEGIVER, src)
-
+	
 /datum/outfit/job/CaesarsLegion/Legionnaire/f13explorer
 	name = "Legion Explorer"
 	jobtype = /datum/job/CaesarsLegion/Legionnaire/f13explorer
@@ -608,29 +608,29 @@ commented out pending rework*/
 	l_pocket = /obj/item/binoculars
 	suit_store = /obj/item/gun/ballistic/revolver/revolver45
 	backpack_contents = list(
-		/obj/item/ammo_box/c45/improvised = 2,
+		/obj/item/ammo_box/c45/improvised = 1,
 		/obj/item/reagent_containers/pill/patch/healingpowder = 1,
 		/obj/item/storage/bag/money/small/legenlisted = 1,
+		/obj/item/melee/onehanded/machete = 1,
 		)
 
 /datum/outfit/loadout/expambusher
 	name = "Ambusher"
 	suit_store = /obj/item/gun/ballistic/shotgun/automatic/combat/shotgunlever
-	glasses = /obj/item/clothing/glasses/legiongoggles
+	glasses = /obj/item/clothing/glasses/night/polarizing
 	backpack_contents = list(
 		/obj/item/ammo_box/shotgun/buck = 1,
 		/obj/item/ammo_box/shotgun/slug = 1,
-		/obj/item/melee/onehanded/machete = 1,
 		/obj/item/bottlecap_mine = 1,
 		)
 
 /datum/outfit/loadout/expsniper
 	name = "Sniper"
 	glasses = /obj/item/clothing/glasses/night/polarizing
 	l_pocket = /obj/item/attachments/scope
-	suit_store = /obj/item/gun/ballistic/rifle/hunting
+	suit_store = /obj/item/gun/ballistic/rifle/repeater/brush
 	backpack_contents = list(
-		/obj/item/ammo_box/a308 = 1,
+		/obj/item/ammo_box/tube/c4570 = 3,
 		/obj/item/melee/onehanded/machete = 1,
 		/obj/item/grenade/smokebomb = 1,
 		)
@@ -943,6 +943,7 @@ commented out pending rework*/
 	neck = /obj/item/clothing/neck/apron/labor/forge
 	gloves = /obj/item/clothing/gloves/legion/forgemaster
 	shoes = /obj/item/clothing/shoes/f13/military/plated
+	r_pocket = /obj/item/flashlight/lantern
 	backpack_contents = list(
 		/obj/item/storage/bag/money/small/legenlisted = 1,
 		/obj/item/stack/sheet/metal/twenty = 2,

code/modules/jobs/job_types/oasis.dm

@@ -697,19 +697,20 @@ Mayor
 	backpack_contents = list(
 		/obj/item/storage/bag/money/small/settler = 1,
 		/obj/item/melee/onehanded/knife/hunting = 1,
-		/obj/item/gun/ballistic/automatic/pistol/n99 = 1,
-		/obj/item/ammo_box/magazine/m10mm_adv/simple = 2,
 		)
 
-
 /datum/outfit/loadout/provisioner
 	name = "Provisioner"
 	neck = /obj/item/clothing/neck/scarf/cptpatriot
 	suit = /obj/item/clothing/suit/jacket/miljacket
+	neck = /obj/item/clothing/ears/headphones
 	uniform = /obj/item/clothing/under/f13/merca
 	gloves = /obj/item/clothing/gloves/f13/leather
 	shoes = /obj/item/clothing/shoes/f13/explorer
-	backpack_contents = list(/obj/item/reagent_containers/food/drinks/flask = 1)
+	backpack_contents = list(/obj/item/reagent_containers/food/drinks/flask = 1,
+	/obj/item/gun/ballistic/automatic/pistol/n99 = 1,
+	/obj/item/ammo_box/magazine/m10mm_adv/simple = 2,
+	)
 
 /datum/outfit/loadout/bum
 	name = "Bum"
@@ -718,34 +719,70 @@ Mayor
 	uniform = /obj/item/clothing/under/f13/rag
 	gloves = /obj/item/clothing/gloves/f13/handwraps
 	shoes = /obj/item/clothing/shoes/f13/rag
-	backpack_contents = list(/obj/item/storage/bag/trash = 1, /obj/item/reagent_containers/food/drinks/bottle/whiskey = 1)
+	backpack_contents = list(/obj/item/storage/bag/trash = 1, /obj/item/reagent_containers/food/drinks/bottle/whiskey = 1,
+	/obj/item/gun/ballistic/automatic/hobo/zipgun = 1,
+	/obj/item/twohanded/spear/scrapspear = 1,
+	)
 
 /datum/outfit/loadout/properlady
 	name = "Proper Lady"
 	head = /obj/item/clothing/head/beret/black
 	suit = /obj/item/clothing/under/sailordress
 	gloves = /obj/item/clothing/gloves/f13/lace
 	shoes = /obj/item/clothing/shoes/f13/fancy
-	backpack_contents = list(/obj/item/reagent_containers/food/drinks/bottle/wine = 1)
+	backpack_contents = list(/obj/item/reagent_containers/food/drinks/bottle/champagne = 1,
+	/obj/item/gun/ballistic/revolver/police = 1,
+	/obj/item/ammo_box/c38 = 2,
+	)
 
 /datum/outfit/loadout/propergent
 	name = "Respectable Gent"
 	head = /obj/item/clothing/head/f13/beaver
 	suit = /obj/item/clothing/suit/f13/cowboybvest
 	uniform = /obj/item/clothing/under/f13/bartenderalt
 	shoes = /obj/item/clothing/shoes/f13/fancy
-	backpack_contents = list(/obj/item/storage/box/matches = 1, /obj/item/storage/fancy/cigarettes/cigars = 1)
+	backpack_contents = list(/obj/item/storage/box/matches = 1,
+	/obj/item/storage/fancy/cigarettes/cigars = 1,
+	/obj/item/gun/ballistic/revolver/widowmaker = 1,
+	/obj/item/ammo_box/shotgun/improvised = 2,
+	)
 
 /datum/outfit/loadout/hombre
 	name = "Hombre"
 	head = /obj/item/clothing/head/f13/cowboy
 	suit = /obj/item/clothing/suit/f13/duster
 	uniform = /obj/item/clothing/under/f13/cowboyb
+	r_hand = /obj/item/gun/ballistic/rifle/hunting
 	gloves = /obj/item/clothing/gloves/f13/leather
 	shoes = /obj/item/clothing/shoes/f13/cowboy
-	backpack_contents = list()
-
-
+	backpack_contents = list(/obj/item/ammo_box/a308 = 2,
+	)
+
+/datum/outfit/loadout/secretary 
+	name = "Secretary"
+	uniform = /obj/item/clothing/under/suit/black
+	glasses = /obj/item/clothing/glasses/regular/hipster
+	shoes = /obj/item/clothing/shoes/laceup
+	r_hand = /obj/item/storage/briefcase
+	backpack_contents = list(/obj/item/pen = 1,
+	/obj/item/clipboard = 1,
+	/obj/item/paper_bin/bundlenatural = 1,
+	/obj/item/clothing/under/suit/black/skirt = 1,
+	/obj/item/gun/ballistic/automatic/pistol/pistol22 = 1,
+	/obj/item/ammo_box/magazine/m22 = 2,
+	)
+	///placeholder until a proper secretary role is added
+
+/datum/outfit/loadout/singer
+	name = "Saloon Singer"
+	shoes = /obj/item/clothing/shoes/laceup
+	backpack_contents = list(/obj/item/clothing/under/f13/classdress = 1,
+	/obj/item/clothing/under/suit/black_really = 1,
+	/obj/item/clothing/gloves/evening = 1,
+	/obj/item/clothing/gloves/color/white = 1,
+	/obj/item/melee/unarmed/brass = 1,
+	)
+
 /*----------------------------------------------------------------
 --							Detective							--
 ----------------------------------------------------------------*/

code/modules/projectiles/guns/ballistic/automatic.dm

@@ -749,6 +749,7 @@
 	fire_delay = 7
 	burst_size = 1
 	extra_speed = 500
+	extra_penetration = 0.1
 	zoom_amt = 10
 	zoom_out_amt = 13
 	semi_auto = TRUE

code/modules/projectiles/guns/ballistic/rifle.dm

@@ -136,6 +136,7 @@
 	item_state = "brushgun"
 	mag_type = /obj/item/ammo_box/magazine/internal/shot/tube4570
 	extra_damage = 2
+	extra_penetration = 0.1
 	recoil = 0.1
 	fire_sound = 'sound/f13weapons/brushgunfire.ogg'
 

code/modules/projectiles/guns/ballistic/shotgun.dm

@@ -325,6 +325,10 @@
 	w_class = WEIGHT_CLASS_NORMAL
 	slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
 	fire_sound = 'sound/f13weapons/shotgun.ogg'
+	can_bayonet = TRUE
+	bayonet_state = "bayonet"
+	knife_x_offset = 23
+	knife_y_offset = 23
 
 
 //Neostead 2000								Keywords: BOS, Shotgun, Semi-auto, 12 rounds internal