Initial commit

code/game/machinery/computer/sentencing.dm

@@ -2,7 +2,8 @@
 
 /obj/structure/machinery/computer/sentencing
 	name = "\improper Jurisdictional Automated System"
-	desc = "A powerful machine produced by Weyland-Yutani to streamline all punishment of prisoners. The best grade policing gear seen on this side of the galaxy."
+	desc = "A powerful machine develiped jointly with Weyland-Yutani to make sure every convict gets exactly the brig timer they deserver accroding to regulations. A living symbol of the somewhat strainder realationship of the Provost Office and the rest of the USCMC."
+	desc_lore = "The Jurisdictional Automated System and procedures surrounding it were conceived as a result of a through statistical analysis of USCMC arrest records and Marine Law violations that concluded that three out of four convictions end up with a misapplied timer. The fact that the Provost Office was unusually cooperative should probably have been a hint that something was off, and as the JAS entered service accuracy of brig timers increased to around 98% in cases where charges where applied correctly. Unfortunately it also became very clear that this increased, not decreased the average time a Marine spends in the brig by almost 50 percent. It was later revealed that the Office itself suspected that was the case from their own numbers but opted not to share that information, themselves not being exactly pleased with the leniency in brig timers and decided to use this initiative to their own ends. This caused a major rift between USCMC leadership and key figures in the Provost Office that ultimately got settled by the UAAC who established the split training program which despite its overall failure to majorly temper the specific behaviors of MPs on USCMC assignments did shift overall perspective to at least consider negotiation and deescalation an equally valid approach to direct confrontation."
 	icon_state = "jas"
 	req_one_access = list(ACCESS_MARINE_BRIG, ACCESS_MARINE_COMMAND)
 	var/datum/crime_incident/incident

code/game/machinery/vending/vendor_types/crew/mp.dm

@@ -1,23 +1,30 @@
 //------------ MP CLOTHING VENDOR---------------
 
 GLOBAL_LIST_INIT(cm_vending_clothing_military_police, list(
+
 		list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null),
+		list("Boots", 0, /obj/item/clothing/shoes/marine/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY),
 		list("Gloves", 0, /obj/item/clothing/gloves/marine, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY),
-		list("Uniform", 0, /obj/item/clothing/under/marine/mp, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
 		list("Headset", 0, /obj/item/device/radio/headset/almayer/mmpo, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY),
 		list("Satchel", 0, /obj/item/storage/backpack/satchel/sec, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY),
+		list("Gear Belt", 0, /obj/item/storage/belt/security/MP/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_MANDATORY),
+
+		list("UNIFORM (CHOOSE 1)", 0, null, null, null),
+		list("Uniform", 0, /obj/item/clothing/under/marine/mp, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
+		list("Provost Issue Uniform", 0, /obj/item/clothing/under/marine/mp/B, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
+
+		list("ARMOR (CHOOSE 1)", 0, null, null, null),
+		list("Military Police M2 Armor", 0, /obj/item/clothing/suit/storage/marine/MP, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY),
+		list("Provost Issue M2 Armor", 0, /obj/item/clothing/suit/storage/marine/MP/B, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY),
 
 		list("PERSONAL SIDEARM (CHOOSE 1)", 0, null, null, null),
 		list("M44 Revolver", 0, /obj/item/storage/belt/gun/m44/mp, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED),
 		list("M4A3 Pistol", 0, /obj/item/storage/belt/gun/m4a3/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED),
 		list("Mod 88 Pistol", 0, /obj/item/storage/belt/gun/m4a3/mod88, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED),
 
-		list("ARMOR (TAKE ALL)", 0, null, null, null),
-		list("Military Police M2 Armor", 0, /obj/item/clothing/suit/storage/marine/MP, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY),
-
-		list("COMBAT EQUIPMENT (TAKE ALL)", 0, null, null, null),
+		list("HELMET (CHOOSE 1)", 0, null, null, null),
 		list("Military Police M10 Helmet", 0, /obj/item/clothing/head/helmet/marine/MP, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY),
-		list("Marine Combat Boots", 0, /obj/item/clothing/shoes/marine/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY),
+		list("Provost Issue M10 Helmet", 0, /obj/item/clothing/head/helmet/marine/MP/B, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY),
 
 		list("EYEWEAR (TAKE ALL)", 0, null, null, null),
 		list("Security HUD Glasses", 0, /obj/item/clothing/glasses/sunglasses/sechud, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR),
@@ -28,11 +35,13 @@ GLOBAL_LIST_INIT(cm_vending_clothing_military_police, list(
 
 		list("ACCESSORIES (CHOOSE 1)", 0, null, null, null),
 		list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
+		list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
+		list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
 		list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
 
 		list("HAT (CHOOSE 1)", 0, null, null, null),
 		list("MP Beret", 0, /obj/item/clothing/head/beret/marine/mp, MARINE_CAN_BUY_MASK, VENDOR_ITEM_MANDATORY),
-
+		list("Provost Issue MP Beret", 0, /obj/item/clothing/head/beret/marine/mp/B, MARINE_CAN_BUY_MASK, VENDOR_ITEM_MANDATORY),
 	))
 
 /obj/structure/machinery/cm_vending/clothing/military_police
@@ -49,22 +58,28 @@ GLOBAL_LIST_INIT(cm_vending_clothing_military_police, list(
 GLOBAL_LIST_INIT(cm_vending_clothing_military_police_warden, list(
 
 		list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null),
+		list("Boots", 0, /obj/item/clothing/shoes/marine/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY),
 		list("Gloves", 0, /obj/item/clothing/gloves/marine, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY),
-		list("Warden Uniform", 0, /obj/item/clothing/under/marine/warden, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
 		list("Headset", 0, /obj/item/device/radio/headset/almayer/cmpcom, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY),
 		list("Satchel", 0, /obj/item/storage/backpack/satchel/sec, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY),
+		list("Gear Belt", 0, /obj/item/storage/belt/security/MP/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_MANDATORY),
+
+		list("UNIFORM (CHOOSE 1)", 0, null, null, null),
+		list("Uniform", 0, /obj/item/clothing/under/marine/warden, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
+		list("Provost Issue Uniform", 0, /obj/item/clothing/under/marine/warden/B, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
+
+		list("ARMOR (CHOOSE 1)", 0, null, null, null),
+		list("Military Warden M3 Armor", 0, /obj/item/clothing/suit/storage/marine/MP/warden, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_RECOMMENDED),
+		list("Provost Issue M3 Armor", 0, /obj/item/clothing/suit/storage/marine/MP/warden/B, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_RECOMMENDED),
 
 		list("PERSONAL SIDEARM (Take ALL)", 0, null, null, null),
 		list("M4A3 Service Pistol ", 0, /obj/item/storage/belt/gun/m4a3/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED),
 		list("Mod 88 Pistol", 0, /obj/item/storage/belt/gun/m4a3/mod88, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED),
 		list("M44 Revolver", 0, /obj/item/storage/belt/gun/m44/mp, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED),
 
-		list("ARMOR (TAKE ALL)", 0, null, null, null),
-		list("Military Warden M3 Armor", 0, /obj/item/clothing/suit/storage/marine/MP/warden, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY),
-
-		list("COMBAT EQUIPMENT (TAKE ALL)", 0, null, null, null),
+		list("HELMET (CHOOSE 1)", 0, null, null, null),
 		list("Military Police M10 Helmet", 0, /obj/item/clothing/head/helmet/marine/MP, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY),
-		list("Marine Combat Boots", 0, /obj/item/clothing/shoes/marine/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY),
+		list("Provost Issue M10 Helmet", 0, /obj/item/clothing/head/helmet/marine/MP/B, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY),
 
 		list("EYEWEAR (TAKE ALL)", 0, null, null, null),
 		list("Security HUD Glasses", 0, /obj/item/clothing/glasses/sunglasses/sechud, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR),
@@ -75,10 +90,13 @@ GLOBAL_LIST_INIT(cm_vending_clothing_military_police_warden, list(
 
 		list("ACCESSORIES (CHOOSE 1)", 0, null, null, null),
 		list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
+		list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
+		list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
 		list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
 
 		list("HAT (CHOOSE 1)", 0, null, null, null),
-		list("Warden Peaked Cap", 0, /obj/item/clothing/head/beret/marine/mp/warden, MARINE_CAN_BUY_MASK, VENDOR_ITEM_MANDATORY),
+		list("Warden Peaked Cap", 0, /obj/item/clothing/head/beret/marine/mp/warden, MARINE_CAN_BUY_MASK, VENDOR_ITEM_RECOMMENDED),
+		list("Provost Issue Warden Peaked Cap", 0, /obj/item/clothing/head/beret/marine/mp/warden/B, MARINE_CAN_BUY_MASK, VENDOR_ITEM_RECOMMENDED)
 	))
 
 /obj/structure/machinery/cm_vending/clothing/military_police_warden

code/game/machinery/vending/vendor_types/crew/senior_officers.dm

@@ -31,8 +31,8 @@
 GLOBAL_LIST_INIT(cm_vending_clothing_military_police_chief, list(
 
 		list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null),
+		list("Boots", 0, /obj/item/clothing/shoes/marine/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY),
 		list("Gloves", 0, /obj/item/clothing/gloves/marine, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY),
-		list("CMP Uniform", 0, /obj/item/clothing/under/marine/officer/warrant, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
 		list("Headset", 0, /obj/item/device/radio/headset/almayer/cmpcom, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY),
 		list("Satchel", 0, /obj/item/storage/backpack/satchel/sec, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY),
 		list("Gear Belt", 0, /obj/item/storage/belt/security/MP/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_MANDATORY),
@@ -42,12 +42,17 @@ GLOBAL_LIST_INIT(cm_vending_clothing_military_police_chief, list(
 		list("Mod 88 Pistol", 0, /obj/item/storage/belt/gun/m4a3/mod88, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_REGULAR),
 		list("M44 Revolver", 0, /obj/item/storage/belt/gun/m44/mp, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED),
 
-		list("ARMOR (TAKE ALL)", 0, null, null, null),
+		list("ARMOR (CHOOSE 1)", 0, null, null, null),
 		list("Military Police Chief M3 Armor", 0, /obj/item/clothing/suit/storage/marine/MP/WO, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_RECOMMENDED),
+		list("Provost Issue Chief M3 Armor", 0, /obj/item/clothing/suit/storage/marine/MP/WO/B, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_RECOMMENDED),
 
-		list("COMBAT EQUIPMENT (TAKE ALL)", 0, null, null, null),
+		list("UNIFORM (CHOOSE 1)", 0, null, null, null),
+		list("CMP Uniform", 0, /obj/item/clothing/under/marine/officer/warrant, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
+		list("Provost Issue CMP Uniform", 0, /obj/item/clothing/under/marine/officer/warrant/B, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
+
+		list("HELMET (CHOOSE 1)", 0, null, null, null),
 		list("Chief MP M10 Helmet", 0, /obj/item/clothing/head/helmet/marine/MP/WO, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY),
-		list("Marine Combat Boots", 0, /obj/item/clothing/shoes/marine/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY),
+		list("Provost Issue M10 Helmet", 0, /obj/item/clothing/head/helmet/marine/MP/B, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY),
 
 		list("EYEWEAR (TAKE ALL)", 0, null, null, null),
 		list("Security HUD Glasses", 0, /obj/item/clothing/glasses/sunglasses/sechud, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_MANDATORY),

code/modules/clothing/head/head.dm

@@ -416,27 +416,42 @@
 /obj/item/clothing/head/beret/marine/mp
 	name = "\improper USCM MP beret"
 	icon_state = "beretred"
-	desc = "A beret with the USCM Military Police insignia emblazoned on it."
+	desc = "A beret with the USCM Military Police insignia emblazoned on it. Similar to regular Marine berets, but in a matted red."
+	desc_lore = "The USCMC brass had hoped that the Provost crimson Berets would be naturally replaced by either helmets or hats, both way more common headgear options in the Marines. Instead, the newly graduating personnel immediately replicated both an overwhelming preference for berets as well as their own version of the ritual Provost Office trained MPs go through. This is considered the first clear sign that the idea of splitting training may not be as effective as USCMC HC had hoped. USCMC MP 'graduation' rituals are less physical than their Provost counterpart and include more team based challenges, they are in essence the same thing however - a nighttime marathon through unfamiliar territory with multiple obstacles and challenges on the way, at the end of which the highest ranking training officer officially grants the MP their first beret."
 	icon = 'icons/obj/items/clothing/cm_hats.dmi'
 	item_icons = list(
 		WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
 	)
 	black_market_value = 25
 
+/obj/item/clothing/head/beret/marine/mp/B
+	name = "\improper Provost issue USCM MP beret"
+	icon_state = "beretred_b"
+	desc = "A crimson beret with the USCMC Provost Office insignia emblazoned on it. It feels somewhat stiffer to the touch than a typical USCM beret."
+	desc_lore = "The origin of the overwhelming preference of all Provost Office Marines to use berets is typically connected to the significantly higher than normal percentage of Three World Empire emigrants or green card holders to be part of the force in its early days. This initial imbalance permanently ingrained the crimson beret as part of any Provost trained MP's service and identity. Everyone receives a crimson 'training' beret on their first day of training and uses it until their 'trial' around graduating, whenever that may be. Provost office trials vary greatly depending on where they are held, but typically includes a combination of hand to hand and riot control drills, exposure to the effects of all MP tools and a one on one talk with the officer in charge of training. Said officer then takes the training helmet and replaces it with the graduating MP's specialization specific headgear."
+
 /obj/item/clothing/head/beret/marine/mp/warden
 	name = "\improper USCM MP warden peaked cap"
 	icon_state = "warden"
-	desc = "A peaked cap with the USCM Military Police Lieutenant insignia emblazoned on it. It is typically used by Wardens on USCM ships."
+	desc = "A peaked cap with the USCM Military Police insignia emblazoned on it. Flimsy and not really meant to be used in action, but at least its easy to fix or replace anything that breaks."
+	desc_lore = "According to the regulations set for all MPs by the Provost Office, the position of Warden needs a unique, clearly identifying piece of headgear as part of its standard kit. The USCMC, not committed to any specific solution decided to let the first few cohorts of Wardens trained under their care make the choice. Much to their surprise and horror the USCMC trained Military Wardens almost unanimously picked the peaked cap in same color as their Provost counterpart. Like their Provost counterparts, the Wardens would answer that the headgear simply seemed to fit them and for whatever reason that seems to be a direct statistical correlation. "
+
+/obj/item/clothing/head/beret/marine/mp/warden/B
+	name = "\improper Provost issue USCM MP warden peaked cap"
+	icon_state = "warden_b"
+	desc = "A peaked cap with the USCMC Provost Office insignia emblazoned on it. The extra glossiness is a nice touch, but smudges are a constant issue."
+	desc_lore = "It is unclear why Provost trained Wardens chose the peaked cap in particular. While Provost regulations do require Wardens to have clearly identifiable and unique pieces of headgear as part of their standard kit, this preference seems to have developed naturally across the years and only later was codified. There were several initiatives stemming from the Provost Office itself to as they put it 'modernize' the look, but every time the result was the peaked cap being the overwhelming favorite. Provost trained Wardens claim that the headgear just seems a natural fit for them, an opinion they share with their USCMC trained counterparts."
 
 /obj/item/clothing/head/beret/marine/mp/cmp
 	name = "\improper USCM chief MP beret"
-	desc = "A beret with the USCM Military Police First Lieutenant insignia emblazoned on it. It shines with the glow of corrupt authority and a smudge of doughnut."
+	desc = "A high quality black beret with the USCMC CMP insignia attached to it. The insignia itself is the USCMC and Provost Office symbols merged with each other."
+	desc_lore = "Since all Marines that hold a position of CMP on any USCMC ship need to be certified by both the Provost Office and the USCMC they graduate their training jointly and jointly go through a similar ritual of 'earning' their beret as their lower ranking comrades, except one veiled in even more secrecy. Attended by any available current or past CMPs of any training origin on a given ship or training facility, prospective CMPs spend the night before their formal certification getting drunk and integrating into the broader CMP structures, while hearing tales and advice from any available veteran of the service. As a result most CMPs remember the time they receive their berets very fondly and tend to value them highly even if they do not actively use them. "
 	icon_state = "beretwo"
 	black_market_value = 30
 
 /obj/item/clothing/head/beret/marine/mp/mppeaked
 	name = "\improper USCM MP peaked cap"
-	desc = "A peaked cap worn by the USCM's Military Police. Something about it reminds you of an event you once read about in a history book."
+	desc = "A peaked cap worn by the USCM's Military Police."
 	icon_state = "mppeaked"
 
 /obj/item/clothing/head/beret/marine/mp/mpcap

code/modules/clothing/head/helmet.dm

@@ -737,6 +737,15 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
 	armor_energy = CLOTHING_ARMOR_MEDIUMLOW
 	specialty = "M10 pattern military police"
 
+/obj/item/clothing/head/helmet/marine/MP/B
+	name = "\improper Provost issue M10 pattern MP helmet"
+	desc = "A modified M10 Pattern Helmet in the crimson-black color scheme of the USCMC Provost Office. Typically only seen in use on board USCMC Provost Office ships."
+	desc_lore = "Unlike the other provost issued headgear, the helmet is typically not issued or used outside of Provost Office ships and facilities and is just a regular Marine helmet but in Office colors. It is unclear why a small set of helmets is available on the Almayer, but whoever is responsible seems to be replenishing the very limited supply during longer resupply stops and is working within USCMC logistics to get them delivered and seems to make sure there is always just enough for a full MP department to have one if needed. Whoever this benefactor is, their identity is redacted by the Provost Office itself and any inquiries about the deliveries are left without comment."
+	icon_state = "mp_helmet_b"
+	item_state = "mp_helmet_b"
+	specialty = "Provost issue M10 pattern military police"
+	flags_atom = NO_SNOW_TYPE
+
 /obj/item/clothing/head/helmet/marine/MP/WO
 	name = "\improper M3 pattern chief MP helmet"
 	desc = "A well-crafted variant of the M10 Helmet typically distributed to Chief MPs. Useful for letting your men know who is in charge."