Command updates

code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm

@@ -9,10 +9,8 @@ GLOBAL_LIST_INIT(cm_vending_gear_leader, list(
 		list("M41A Standard Kit", 0, /obj/item/storage/box/kit/m41a_kit	, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR),
 		list("M240 Pyrotechnician Support Kit", 0, /obj/item/storage/box/kit/mini_pyro, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR),
 		list("M2C Heavy Machine Gun", 0, /obj/item/storage/box/guncase/m2c, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR),
-		list("M56D Heavy Machine Gun", 0, /obj/item/storage/box/guncase/m56d, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR),
 		list("M79 Grenade Launcher", 0, /obj/item/storage/box/guncase/m79, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR),
 		list("MOU-53 Shotgun", 0, /obj/item/storage/box/guncase/mou53, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR),
-		list("XM88 Heavy Rifle", 0, /obj/item/storage/box/guncase/xm88, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR),
 		list("Basic Engineering Supplies", 0, /obj/item/storage/box/kit/engineering_supply_kit, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR),
 
 		list("ARMORS", 0, null, null, null),

colonialmarines.dme

@@ -2430,6 +2430,8 @@
 #include "interface\skin.dmf"
 #include "lowpopcm\defines\job.dm"
 #include "lowpopcm\gamemodes\lowpopstandard.dm"
+#include "lowpopcm\items\belts.dm"
+#include "lowpopcm\items\guncases.dm"
 #include "lowpopcm\roles\command\co.dm"
 #include "lowpopcm\roles\command\pco.dm"
 #include "lowpopcm\roles\command\so.dm"
@@ -2440,5 +2442,7 @@
 #include "lowpopcm\roles\squad\medic.dm"
 #include "lowpopcm\roles\squad\rto.dm"
 #include "lowpopcm\roles\squad\sg.dm"
+#include "lowpopcm\vending\platoonco.dm"
+#include "lowpopcm\vending\platoonsgt.dm"
 #include "maps\_basemap.dm"
 // END_INCLUDE

lowpopcm/items/belts.dm

@@ -0,0 +1,4 @@
+/obj/item/storage/belt/gun/m44/pcdr/fill_preset_inventory()
+	handle_item_insertion(new /obj/item/weapon/gun/revolver/m44/custom())
+	for(var/i = 1 to storage_slots - 1)
+		new /obj/item/ammo_magazine/revolver/heavy(src)

lowpopcm/items/guncases.dm

@@ -0,0 +1,12 @@
+/obj/item/storage/box/guncase/l42a
+	name = "\improper L42A battle rifle case"
+	desc = "A gun case containing the L42A battle rifle."
+	storage_slots = 5
+	can_hold = list(/obj/item/weapon/gun/rifle/lmg, /obj/item/ammo_magazine/rifle/l42a)
+
+/obj/item/storage/box/guncase/l42a/fill_preset_inventory()
+	new /obj/item/weapon/gun/rifle/l42a(src)
+	new /obj/item/ammo_magazine/rifle/l42a(src)
+	new /obj/item/ammo_magazine/rifle/l42a(src)
+	new /obj/item/ammo_magazine/rifle/l42a(src)
+	new /obj/item/attachable/bipod(src)

lowpopcm/roles/command/pco.dm

@@ -10,13 +10,11 @@
 /datum/equipment_preset/uscm_ship/xo/pcdr
 	name = "USCM Platoon Commander (PCDR)"
 	flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE
-
 	assignment = JOB_LP_PCDR
 	rank = JOB_LP_PCDR
 	paygrade = "MO2"
 	role_comm_title = "PCDR"
 	minimum_age = 30
-
 	minimap_icon = list("cic" = MINIMAP_ICON_COLOR_SILVER)
 	minimap_background = MINIMAP_ICON_BACKGROUND_CIC
 

lowpopcm/roles/command/so.dm

@@ -1,7 +1,13 @@
 
 //*************************************
-//------------SENIOR OFFICER-----------
+//------------OFFICERS-----------
 //*************************************/
 
 /datum/job/command/executive/lowpop
 	title = JOB_LP_SO
+
+
+
+//Junior Officer
+/datum/job/command/bridge/lowpop
+	title = JOB_LP_JO

lowpopcm/vending/platoonco.dm

@@ -0,0 +1,97 @@
+//------------GEAR VENDOR---------------
+
+GLOBAL_LIST_INIT(cm_vending_gear_platooncdr, list(
+		list("PLATOON COMMANDER WEAPON (CHOOSE 1)", 0, null, null, null),
+		list("M41A Mark 1 Kit", 0, /obj/item/storage/box/guncase/m41aMK1	, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR),
+		list("MK221 Shotgun Kit", 0, /obj/item/storage/box/kit/honorguard	, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR),
+		list("PCDR's Heavy M44 Belt", 0, /obj/item/storage/belt/gun/m44/pcdr	, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR),
+
+		list("UTILITIES", 0, null, null, null),
+		list("Whistle", 3, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR),
+		list("Range Finder", 3, /obj/item/device/binoculars/range, null, VENDOR_ITEM_REGULAR),
+		list("Laser Designator", 5, /obj/item/device/binoculars/range/designator, null, VENDOR_ITEM_REGULAR),
+		list("Fire Extinguisher (Portable)", 3, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR),
+		list("Motion Detector", 5, /obj/item/device/motiondetector, null, VENDOR_ITEM_REGULAR),
+		list("Fulton Device Stack", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR),
+
+		list("HELMET OPTICS", 0, null, null, null),
+		list("Night Vision Optic", 20, /obj/item/device/helmet_visor/night_vision, null, VENDOR_ITEM_RECOMMENDED),
+		list("Medical Helmet Optic", 4, /obj/item/device/helmet_visor/medical, null, VENDOR_ITEM_RECOMMENDED),
+
+		list("MEDICAL SUPPLIES", 0, null, null, null),
+		list("Burn Kit", 2, /obj/item/stack/medical/advanced/ointment, null, VENDOR_ITEM_REGULAR),
+		list("Trauma Kit", 2, /obj/item/stack/medical/advanced/bruise_pack, null, VENDOR_ITEM_REGULAR),
+		list("Advanced Firstaid Kit", 12, /obj/item/storage/firstaid/adv, null, VENDOR_ITEM_REGULAR),
+		list("Medical Splints", 1, /obj/item/stack/medical/splint, null, VENDOR_ITEM_REGULAR),
+
+		list("Injector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR),
+		list("Injector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR),
+		list("Injector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR),
+		list("Injector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR),
+		list("Injector (Oxycodone)", 2, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR),
+		list("Injector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR),
+		list("Injector (Tricord)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR),
+
+		list("Health Analyzer", 4, /obj/item/device/healthanalyzer, null, VENDOR_ITEM_REGULAR),
+		list("Roller Bed", 2, /obj/item/roller, null, VENDOR_ITEM_REGULAR),
+	))
+
+/obj/structure/machinery/cm_vending/gear/platooncdr
+	name = "\improper ColMarTech Platoon Commander Gear Rack"
+	desc = "An automated gear rack for Platoon Sergeant."
+	icon_state = "sl_gear"
+	show_points = TRUE
+	vendor_role = list(JOB_LP_PCDR)
+	req_access = list(ACCESS_MARINE_DATABASE)
+
+/obj/structure/machinery/cm_vending/gear/platooncdr/get_listed_products(mob/user)
+	return GLOB.cm_vending_gear_platooncdr
+
+//------------CLOTHING VENDOR---------------
+
+GLOBAL_LIST_INIT(cm_vending_clothing_platooncdr, list(
+		list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null),
+		list("M10 Officer Helmet", 0, /obj/item/clothing/head/helmet/marine/MP/SO, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY),
+		list("M3 Officer Armor", 0, /obj/item/clothing/suit/storage/marine/MP/SO, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY),
+		list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY),
+
+		list("BELT (CHOOSE 1)", 0, null, null, null),
+		list("G8-A General Utility Pouch", 0, /obj/item/storage/backpack/general_belt, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED),
+		list("Ceremonial Sword", 0, /obj/item/storage/large_holster/ceremonial_sword/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED),
+		list("M276 Ammo Load Rig", 0, /obj/item/storage/belt/marine, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED),
+		list("M276 Shotgun Shell Loading Rig", 0, /obj/item/storage/belt/shotgun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
+
+		list("POUCHES (CHOOSE 2)", 0, null, null, null),
+		list("Autoinjector Pouch (Full)", 0, /obj/item/storage/pouch/autoinjector/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED),
+		list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
+		list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
+		list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED),
+		list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
+		list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED),
+		list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
+		list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
+		list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
+		list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
+		list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
+
+		list("ACCESSORIES (CHOOSE 1)", 0, null, null, null),
+		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_RECOMMENDED),
+		list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
+		list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
+		list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
+
+		list("MASK (CHOOSE 1)", 0, null, null, null),
+		list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR),
+		list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR),
+	))
+
+/obj/structure/machinery/cm_vending/clothing/platooncdr
+	name = "\improper ColMarTech Platoon Sergeant Equipment Rack"
+	desc = "An automated rack hooked up to a colossal storage of Platoon Sergeant standard-issue equipment."
+	req_access = list(ACCESS_MARINE_DATABASE)
+	vendor_role = list(JOB_LP_PCDR)
+
+/obj/structure/machinery/cm_vending/clothing/platooncdr/get_listed_products(mob/user)
+	return GLOB.cm_vending_clothing_platooncdr
+