Adds two weapon sets to the Captain, ported from SR

code/game/objects/items/weapons/melee/polearms.dm

@@ -468,6 +468,13 @@
 	gripped_intents = list(POLEARM_THRUST, SPEAR_CUT, POLEARM_CHOP, POLEARM_BASH)
 	melting_material = /datum/material/steel
 
+/obj/item/weapon/polearm/halberd/bardiche/captain
+	name = "Deliverance"
+	desc = "A glaive decorated with gold forged for the Captain alongside their armor. To deliver justice with every wide swing."
+	sellprice = 200
+	icon_state = "capglaive"
+	melting_material = /datum/material/steel
+
 //................ Eagle Beak ............... //
 /obj/item/weapon/polearm/eaglebeak
 	name = "eagle's beak"

code/game/objects/items/weapons/melee/swords.dm

@@ -229,6 +229,12 @@
 	icon_state = "decsaber"
 	sellprice = 140
 
+/obj/item/weapon/sword/sabre/captain
+	name = "Law"
+	desc = "A sabre decorated with gold forged specifically for the Captain alongside their armor. To bring Law to the lands, they shall use this blade."
+	icon_state = "capsaber"
+	sellprice = 140
+
 /obj/item/weapon/sword/sabre/stalker
 	name = "stalker sabre"
 	desc = "A once elegant blade of mythril, diminishing under the suns gaze"

code/game/objects/items/weapons/shields.dm

@@ -307,6 +307,15 @@
 			if("onbelt")
 				return list("shrink" = 0.3,"sx" = -2,"sy" = -5,"nx" = 4,"ny" = -5,"wx" = 0,"wy" = -5,"ex" = 2,"ey" = -5,"nturn" = 0,"sturn" = 0,"wturn" = 0,"eturn" = 0,"nflip" = 0,"sflip" = 0,"wflip" = 0,"eflip" = 0,"northabove" = 0,"southabove" = 1,"eastabove" = 1,"westabove" = 0)
 
+/obj/item/weapon/shield/tower/buckleriron/captain
+	name = "Order"
+	desc = "A buckler decorated with gold made specifically for the Captain alongside their armor. To bring order to the lands with every blow deflected."
+	icon_state = "capbuckler"
+	sellprice = 60
+	max_integrity = INTEGRITY_STRONG
+	melting_material = /datum/material/steel
+	wdefense = 7
+
 /obj/item/weapon/shield/heater
 	name = "heater shield"
 	desc = "A sturdy wood and leather shield. Made to not be too encumbering while still providing good protection."

code/modules/jobs/job_types/nobility/captain.dm

@@ -37,13 +37,13 @@
 	)
 
 	skills = list(
-		/datum/skill/combat/swords = 5,
+		/datum/skill/combat/swords = 3,
 		/datum/skill/combat/wrestling = 4,
 		/datum/skill/combat/axesmaces = 4,
-		/datum/skill/combat/shields = 4,
+		/datum/skill/combat/shields = 2,
 		/datum/skill/combat/unarmed = 3,
 		/datum/skill/combat/knives = 3,
-		/datum/skill/combat/polearms = 2,
+		/datum/skill/combat/polearms = 3,
 		/datum/skill/combat/whipsflails = 2,
 		/datum/skill/combat/crossbows = 3,
 		/datum/skill/combat/bows = 2,
@@ -76,6 +76,20 @@
 	if(spawned.dna?.species?.id == SPEC_ID_HUMEN)
 		spawned.dna.species.soundpack_m = new /datum/voicepack/male/knight()
 
+	var/static/list/selectableweapon = list(
+		"Law and Order" = list(/obj/item/weapon/sword/sabre/captain, /obj/item/weapon/shield/tower/buckleriron/captain),
+		"Deliverer of Justice" = /obj/item/weapon/polearm/halberd/bardiche/captain,
+	)
+
+	var/choice = spawned.select_equippable(player_client, selectableweapon, message = "Choose thy blade", title = "CAPTAIN")
+	if(!choice)
+		return
+	switch(choice)
+		if("Law and Order")
+			spawned.clamped_adjust_skillrank(/datum/skill/combat/swords, 2, 5, TRUE)
+			spawned.clamped_adjust_skillrank(/datum/skill/combat/shields, 2, 4, TRUE)
+		if("Deliverer of Justice")
+			spawned.clamped_adjust_skillrank(/datum/skill/combat/polearms, 2, 5, TRUE)
 
 /datum/outfit/captain
 	name = "Captain"
@@ -87,12 +101,9 @@
 	shirt = /obj/item/clothing/shirt/undershirt/colored/guard
 	shoes = /obj/item/clothing/shoes/boots
 	backl = /obj/item/storage/backpack/satchel
-	backr = /obj/item/weapon/shield/tower/metal
 	belt = /obj/item/storage/belt/leather/plaquesilver
-	beltl = /obj/item/weapon/sword/sabre/dec
 	beltr = /obj/item/weapon/mace/cudgel
 	cloak = /obj/item/clothing/cloak/captain
-	scabbards = list(/obj/item/weapon/scabbard/sword/noble)
 	backpack_contents = list(
 		/obj/item/storage/keyring/captain = 1,
 		/obj/item/signal_horn = 1