diff --git a/code/game/machinery/computer/sentencing.dm b/code/game/machinery/computer/sentencing.dm index 52a4159a2a90..98df48b6053a 100644 --- a/code/game/machinery/computer/sentencing.dm +++ b/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 diff --git a/code/game/machinery/vending/vendor_types/crew/mp.dm b/code/game/machinery/vending/vendor_types/crew/mp.dm index cdf374249211..5600b9858b3b 100644 --- a/code/game/machinery/vending/vendor_types/crew/mp.dm +++ b/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 diff --git a/code/game/machinery/vending/vendor_types/crew/senior_officers.dm b/code/game/machinery/vending/vendor_types/crew/senior_officers.dm index 24b60079692b..d6fbe9e0c862 100644 --- a/code/game/machinery/vending/vendor_types/crew/senior_officers.dm +++ b/code/game/machinery/vending/vendor_types/crew/senior_officers.dm @@ -31,23 +31,28 @@ 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), + 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("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("PERSONAL SIDEARM (CHOOSE 1)", 0, null, null, null), list("M4A3 Service Pistol", 0, /obj/item/storage/belt/gun/m4a3/full, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_REGULAR), 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("Military Police Chief M3 Armor", 0, /obj/item/clothing/suit/storage/marine/MP/WO, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_RECOMMENDED), - - list("COMBAT EQUIPMENT (TAKE ALL)", 0, null, null, null), + 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), diff --git a/code/modules/clothing/head/head.dm b/code/modules/clothing/head/head.dm index 1b4e292a22af..b9a5d52b5fb0 100644 --- a/code/modules/clothing/head/head.dm +++ b/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 diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index eab8b76e81ab..ea97714b311e 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/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." diff --git a/code/modules/clothing/suits/marine_armor.dm b/code/modules/clothing/suits/marine_armor.dm index ab62ea782a09..65283db96582 100644 --- a/code/modules/clothing/suits/marine_armor.dm +++ b/code/modules/clothing/suits/marine_armor.dm @@ -313,7 +313,8 @@ var/list/squad_colors_chat = list(rgb(230,125,125), rgb(255,230,80), rgb(255,150 /obj/item/clothing/suit/storage/marine/MP name = "\improper M2 pattern MP armor" - desc = "A standard Colonial Marines M2 Pattern Chestplate. Protects the chest from ballistic rounds, bladed objects and accidents. It has a small leather pouch strapped to it for limited storage." + desc = "A standard Colonial Marines M2 Pattern Chestplate with modifications made to pad the armor a bit and make it more usefull in a face to face confrontation. Protects the chest from ballistic rounds, bladed objects and accidents. It has a small leather pouch strapped to it for limited storage." + desc_lore = "Military Police Officers trained in USCMC facilities are taught to prioritize negotiation and deescalation over physical confrontation. While they are essentially trained the same techniques as their Provost counterparts, the curriculum and the nature of the training itself highly empathizes being part of the Corps. Originally, MP issue armor was an expression of that philosophy, essentially just differently colored Marine chestplates. Over time however, this basic setup grew into an entire kit, marked by years of experience in realities of law enforcement on USCMC vessels, becoming completely on par with the Provost issued kit in both terms of gear and resistance. " icon_state = "mp_armor" armor_melee = CLOTHING_ARMOR_MEDIUMHIGH armor_bullet = CLOTHING_ARMOR_LOW @@ -348,25 +349,58 @@ var/list/squad_colors_chat = list(rgb(230,125,125), rgb(255,230,80), rgb(255,150 item_state_slots = list(WEAR_JACKET = "mp_armor") black_market_value = 20 +/obj/item/clothing/suit/storage/marine/MP/B + name = "\improper Provost issue M2 pattern MP armor" + desc = "A modified M2 pattern chestplate with USCMC Provost Office black and crimson colors. May look bulkier and more intimidating than its USCM counterpart but offers no actual additional protection. It has a small leather pouch strapped to it for limited storage." + desc_lore = "Military Police Officers trained in Provost facilities are introduced to the harsh, worse-case-scenario style thinking that defines the Provost on the day they join the force and continue to see the greater Marine force as a mass to keep tabs off more than anything else. The somewhat imposing, bulky armor that tends to be preferred by officers embracing this way of thinking started as a simple modified chestplate with additions being tested, adopted, and propagated by Provost aligned vessels that over time resulted in this efficient and stylish kit. Neither side would not openly admit it, but this kit is completely on par with its USCMC issued equivalent." + icon_state = "mp_armor_b" + item_state = "mp_armor_b" + specialty = "Provost issue M2 pattern MP" + item_state_slots = list(WEAR_JACKET = "mp_armor_b") + flags_atom = NO_SNOW_TYPE + /obj/item/clothing/suit/storage/marine/MP/warden icon_state = "warden" name = "\improper M3 pattern warden MP armor" - desc = "A well-crafted suit of M3 Pattern Armor typically distributed to Wardens. Useful for letting your men know who is in charge." + desc = "A well-crafted suit of M3 Pattern Armor typically distributed to Wardens. Usefull for sitting down and having a chat with a troubled soul." + desc_lore = "USCMC trained Wardens are trained to rely on their skill in negotiation, deescalation and reading the situation and practically are not expected to be in a physical confrontation. This assumption was very brutally confronted with the hard reality of USCMC crewed ships, especially in remote regions like the Veil. Wardens quickly started using regular MP armor until the Provost Office formally started requiring that all MPs on duty wear armor at all times. The rather hasty adoption of this requirement lead to the Warden armor effectively copying a lot of the solutions and tricks incorporated into the armors worn by Provost Enforcer Wardens and being identical to them in terms of protection and available space. " armor_bio = CLOTHING_ARMOR_MEDIUMLOW armor_rad = CLOTHING_ARMOR_MEDIUMLOW uniform_restricted = list(/obj/item/clothing/under/marine/warden) specialty = "M3 pattern warden MP" item_state_slots = list(WEAR_JACKET = "warden") +/obj/item/clothing/suit/storage/marine/MP/warden/B + + name = "\improper Provost issue M3 pattern warden MP armor" + desc = "A well-crafted suit of M3 Pattern Armor with USCMC Provost Office black and crimson colors. Like the Wardens themselves, may look bulkier and more intimidating than its USCMC counterpart but offers no actual additional protection." + desc_lore = "Provost trained Wardens are trained to rely on physical intimidation and direct force when encountering issues in the brig and everything about their kit reflects that. The armor that is provided to personnel who either opt for service on USCMC ships or drops out of the Provost Enforcer Warden training program is effectively identical to the one used on board of Provost vessels and installations, incorporating decades of experience and improvements. Provost trained Wardens shared this experience and solutions with their USCMC trained equivalent rather freely as any differences in training was brutally verified by the reality of law enforcement and today the kit is identical to its counterpart in therms of protection and functionality. " + icon_state = "warden_b" + item_state = "warden_b" + specialty = "Provost issue M3 pattern warden MP" + item_state_slots = list(WEAR_JACKET = "warden_b") + flags_atom = NO_SNOW_TYPE + /obj/item/clothing/suit/storage/marine/MP/WO icon_state = "warrant_officer" name = "\improper M3 pattern chief MP armor" - desc = "A well-crafted suit of M3 Pattern Armor typically distributed to Chief MPs. Useful for letting your men know who is in charge." + desc = "A well-crafted suit of M3 Pattern Armor typically distributed to Chief MPs. Has the aura of carefully considered, but firm and deliberate force." + desc_lore = "USCMC issued CMP armor was intended to both look familiar to standard Marine armor colors and stand out enough so CMPs can be easy to spot in a crowd. Using the standard officer chestplate as a base, the armor has gotten a fair amount of bulk added to it over time, somewhat indiscreetly covered by a jacket. The older veterans that initially joined the CMP ranks from the USCMC officer cadre as part of the split training program found quickly that being the most visible MP on board a ship is only viable if your armor can take a hit or two. Bringing up the USCMC issued kit up to par with the Provost issue CMP gear is considered one of the key factors that contributed to CMP officers becoming particularly indistinguishable from each other in terms of manners and approach despite their point of entry into the Marines." uniform_restricted = list(/obj/item/clothing/under/marine/officer/warrant) specialty = "M3 pattern chief MP" item_state_slots = list(WEAR_JACKET = "warrant_officer") black_market_value = 30 +/obj/item/clothing/suit/storage/marine/MP/WO/B + name = "\improper Provost issue M3 pattern chief MP armor" + desc = "A well-crafted suit of M3 Pattern Armor with USCMC Provost Office crimson and black colors. The crimson colored heavy padding on the chest, arms and legs seems to particularly stand out." + desc_lore = "Provost issued CMP armor is meant to make the CMP draw attention and then once the attention is centered on them protect them from incoming blows. The Provost Office encourages its CMPs to be active and involved in all levels of law enforcement and as such their armor is aimed to enable them to do just that. The armor reflects the Provosts Offices experience and approach to law enforcement but remains in use even by the many Provost trained CMPs that opt to continue their career outside of the Office structures. A measurable increase in such officers - Provost trained CMPs that over time decide to abandon their Provost related ambitions - is the one definite success of the split training program despite its overall failure to change the habits and approach of CMPs." + icon_state = "warrant_officer_b" + item_state = "warrant_officer_b" + specialty = "Provost Issue M3 pattern chief MP" + item_state_slots = list(WEAR_JACKET = "warrant_officer_b") + flags_atom = NO_SNOW_TYPE + /obj/item/clothing/suit/storage/marine/MP/general name = "\improper M3 pattern general officer armor" desc = "A well-crafted suit of M3 Pattern Armor with a gold shine. It looks very expensive, but shockingly fairly easy to carry and wear." diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm index 540c311f9221..6c8316a4d272 100644 --- a/code/modules/clothing/under/marine_uniform.dm +++ b/code/modules/clothing/under/marine_uniform.dm @@ -97,17 +97,29 @@ flags_atom = NO_SNOW_TYPE /obj/item/clothing/under/marine/mp - name = "military police jumpsuit" - desc = "Standard-issue Military Police uniform. It has shards of light Kevlar to help protect against stabbing weapons and bullets." + name = "military police uniform" + desc = "Standard-issue Military Police uniform. Looks and feels just like a regular Marine uniform." + desc_lore = "Military Police Officers that enter the service through standard USCMC recruitment and are trained in USCMC bootcamps are assigned this uniform upon starting their MP training. The uniforms themselves - made to resemble regular USCMC uniforms as much as possible are a good representation of how the Corps sees and trains MPs within its own structures - Officers are recruited, trained and assigned together with the soldiers they serve with and are expected to be more a negotiating force first. Regardless of their training any MP needs to follow the strict instructions and criteria laid out by the Provost Office, so the effectiveness of the USCMC initiative has been limited as the Provost relentlessly culls both its own numbers and any MP who is found guilty of breaking the very regulations they are sworn to upkeep." icon_state = "MP_jumpsuit" worn_state = "MP_jumpsuit" suit_restricted = list(/obj/item/clothing/suit/storage/marine, /obj/item/clothing/suit/armor/riot/marine, /obj/item/clothing/suit/storage/jacket/marine/service/mp) flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_SLEEVE_CUTTABLE|UNIFORM_JACKET_REMOVABLE specialty = "military police" +/obj/item/clothing/under/marine/mp/B + name = "\improper Provost issue military police uniform" + desc = "Standard-issue Military Police uniform used by MPs who entered service through the Provost Office. Most likely the most infamous uniform design in all of the USCM, for better or worse." + desc_lore = "Military Police Officers that enter the service through Provost office recruitment and trained in Provost facilities and ships are assigned this uniform and keep it even if they decide for a tour of duty in the general USCMC fleet following their training. The Provost Office is fairly infamous for keeping a highly disciplined, heavily trained and highly insular cadre of Enforcers as part of its fleet and most officers that enter the service this way aspire to that position. Provost trained MPs tend to be seen as harsher and more confrontational than their USCMC counterparts and are often criticized for being too far removed from 'real' Marines to truly understand them, but are vastly more educated in theoretical fields surrounding law enforcement. In the end no matter their origin, they are all subject to the harsh criteria set forth by the Provost." + icon_state = "MP_jumpsuit_b" + worn_state = "MP_jumpsuit_b" + flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE + specialty = "Provost issue military police" + flags_atom = NO_SNOW_TYPE + /obj/item/clothing/under/marine/warden - name = "military warden jumpsuit" - desc = "Standard-issue Military Warden uniform. It has shards of light Kevlar to help protect against stabbing weapons and bullets." + name = "military warden uniform" + desc = "Standard-issue Military Warden uniform. Looks just like a regular Marine uniform, the only thing setting it apart is the black armbands." + desc_lore = "Wardens trained by the USCMC are essentially expected to be the most skilled MP on duty. Like their Provost counterparts, they are meant to be the CMP's second in command, however USCMC Wardens spend significantly less time studying the theory of rehabilitation and prisoner management and more time learning basic management and deescalation procedures. A USCMC trained Warden will typically be primed to see their Brig as a place where wayward Marines get put for making dumb choices and will put effort towards making sure they do not make the same mistake again using conversational techniques they are trained. In the end, mostly due to the fact that the Provost Office remains in control of the criteria for all MPs serving on USCMC ships, this approach saw very limited change in actual behavior of Wardens, leading some to theorize that the issue is not training, but rather the institution of the Brig itself." icon_state = "warden_jumpsuit" worn_state = "warden_jumpsuit" suit_restricted = list(/obj/item/clothing/suit/storage/marine, /obj/item/clothing/suit/armor/riot/marine, /obj/item/clothing/suit/storage/jacket/marine/service/warden) @@ -115,6 +127,16 @@ specialty = "military warden" flags_atom = NO_SNOW_TYPE +/obj/item/clothing/under/marine/warden/B + name = "\improper Provost issue military warden uniform" + desc = "Standard-issue Military Warden uniform used by Marines who entered service through the Provost Office. Seems to match Provost commissioned officer patterns." + desc_lore = "Military Wardens trained by the Provost office are typically educated more like managers than anything else. Provost Enforcer Wardens are commissioned officers and receive a multi year curriculum during their training and the lighter training received MP Wardens who serve on regular USCMC ships reflects that approach. Educated in prisoner psychology, rehabilitation theory and a very rigorous physical regimen, a Provost trained Military Warden sees a convict as a project, where the end goal is rehabilitation and generally are told that as long as they are complying with procedure, the ends justify the means - a rehabilitated prisoner today means them not being arrested tomorrow. Despite concern that contact with USCMC trained Wardens would blunt their edge, Provost trained Wardens welcomed and even adopted some methods of their Marine counterparts, leading some to question the point of the whole split." + icon_state = "warden_jumpsuit_b" + worn_state = "warden_jumpsuit_b" + flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE + specialty = "Provost issue military warden" + flags_atom = NO_SNOW_TYPE + /obj/item/clothing/under/marine/officer name = "marine officer uniform" desc = "Softer than silk. Lighter than feather. More protective than Kevlar. Fancier than a regular jumpsuit, too. It has shards of light Kevlar to help protect against stabbing weapons and bullets." @@ -136,7 +158,8 @@ /obj/item/clothing/under/marine/officer/warrant name = "\improper chief MP uniform" - desc = "A uniform typically worn by a Chief MP of the USCM. It has shards of light Kevlar to help protect against stabbing weapons, bullets, and shrapnel from explosions. This uniform includes a small EMF distributor to help nullify energy-based weapon fire, along with a hazmat chemical filter woven throughout the material to ward off biological and radiation hazards." + desc = "A uniform typically worn by a Chief MP of the USCM who transferred into law enforcement from the USCMC proper. This uniform seems to have been made to draw extra attention, which seems like a bad idea out in the field." + desc_lore = "Initially almost the whole cadre of USCMC trained CMPs were relatively older commissioned veterans looking to either branch out or take what was universally seen as more challenging but less deadly assignment within the USCMC to stay in until the end of their commission. To this day USCMC trained CMPs are overwhelmingly USCMC commissioned officers with different specialties who chose to transfer to law enforcement for a variety of reasons. Regardless of their origins, prospective CMPs need to pass certification from both the Provost Office and the USCMC meaning that by the end of the process, they are likely to have identical training. USCMC brass assumed that just the different perspective that officers previously embedded among Marines would be enough to somewhat relax the extremely strict standard both demanded by the Provost Office and aspired to by Provost trained CMPs. " icon_state = "WO_jumpsuit" item_state = "WO_jumpsuit" worn_state = "WO_jumpsuit" @@ -145,6 +168,16 @@ specialty = "chief MP" flags_atom = NO_SNOW_TYPE +/obj/item/clothing/under/marine/officer/warrant/B + name = "\improper Provost issue chief MP uniform" + desc = "A uniform typically worn by a Chief MP of the USCM who entered service through the Provost Office. Seems to be of higher quality than general USCMC issued uniform, but the extra shiny buttons and accents are easy to smudge hard to keep clean." + desc_lore = "CMPs trained by the Provost Office receive their commission on a Provost ship or facility and typically are trained for their role from their induction into the Marines. These officers are shaped from the ground up to be a representation of the Provost office and while typically the ultimate goal of such training is to join the ranks of the Office itself, most prospective Provost officers typically find themselves doing at least one tour of duty on a USCMC ship. Regardless of their career intentions, Provost trained officers need to pass certification by both the Office and the USCMC and are on equal footing in terms of training. Provost trained CMPs gain some much needed perspective during their tours and typically naturally lose some of the zeal the Office inspires in its cadre just by the virtue of exposure to their USCMC trained comrades and the realities of MP work itself." + icon_state = "WO_jumpsuit_b" + item_state = "WO_jumpsuit_b" + worn_state = "WO_jumpsuit_b" + specialty = "Provost issue chief MP" + flags_atom = NO_SNOW_TYPE + /obj/item/clothing/under/marine/officer/technical name = "technical officer uniform" icon_state = "johnny" diff --git a/icons/mob/humans/onmob/head_1.dmi b/icons/mob/humans/onmob/head_1.dmi index 0fb5700225e3..26a10ad40667 100644 Binary files a/icons/mob/humans/onmob/head_1.dmi and b/icons/mob/humans/onmob/head_1.dmi differ diff --git a/icons/mob/humans/onmob/suit_1.dmi b/icons/mob/humans/onmob/suit_1.dmi index c17f403d99ce..f32dfdbaf3f7 100644 Binary files a/icons/mob/humans/onmob/suit_1.dmi and b/icons/mob/humans/onmob/suit_1.dmi differ diff --git a/icons/mob/humans/onmob/uniform_0.dmi b/icons/mob/humans/onmob/uniform_0.dmi index cac9869c9034..2165d29fcc18 100644 Binary files a/icons/mob/humans/onmob/uniform_0.dmi and b/icons/mob/humans/onmob/uniform_0.dmi differ diff --git a/icons/obj/items/clothing/cm_hats.dmi b/icons/obj/items/clothing/cm_hats.dmi index 33f600015a6f..ffe2edf5d39a 100644 Binary files a/icons/obj/items/clothing/cm_hats.dmi and b/icons/obj/items/clothing/cm_hats.dmi differ diff --git a/icons/obj/items/clothing/cm_suits.dmi b/icons/obj/items/clothing/cm_suits.dmi index fc2e10114370..42e5191b23bf 100644 Binary files a/icons/obj/items/clothing/cm_suits.dmi and b/icons/obj/items/clothing/cm_suits.dmi differ diff --git a/icons/obj/items/clothing/uniforms.dmi b/icons/obj/items/clothing/uniforms.dmi index 254c9e8b67c9..162e9c5373f6 100644 Binary files a/icons/obj/items/clothing/uniforms.dmi and b/icons/obj/items/clothing/uniforms.dmi differ