From ba5dcb990ae1fd9ccea639b6598195535bc8333b Mon Sep 17 00:00:00 2001 From: Kirie Saito <77302679+Kitsunemitsu@users.noreply.github.com> Date: Mon, 30 Oct 2023 15:11:08 -0400 Subject: [PATCH 1/3] updates Platoon CO and platoon SGT --- .../vendor_types/squad_prep/squad_leader.dm | 2 - colonialmarines.dme | 4 + lowpopcm/items/belts.dm | 4 + lowpopcm/items/guncases.dm | 12 ++ lowpopcm/roles/command/pco.dm | 2 - lowpopcm/roles/command/so.dm | 8 +- lowpopcm/vending/platoonco.dm | 107 +++++++++++++ lowpopcm/vending/platoonsgt.dm | 140 ++++++++++++++++++ maps/map_files/USS_Shrike/USS_Shrike.dmm | 44 +++++- 9 files changed, 310 insertions(+), 13 deletions(-) create mode 100644 lowpopcm/items/belts.dm create mode 100644 lowpopcm/items/guncases.dm create mode 100644 lowpopcm/vending/platoonco.dm create mode 100644 lowpopcm/vending/platoonsgt.dm diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm index 81c1941c342..0d4065a9e1c 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm +++ b/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), diff --git a/colonialmarines.dme b/colonialmarines.dme index 21ee1c78a96..835a82bc58a 100644 --- a/colonialmarines.dme +++ b/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 diff --git a/lowpopcm/items/belts.dm b/lowpopcm/items/belts.dm new file mode 100644 index 00000000000..d59f02ae150 --- /dev/null +++ b/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) diff --git a/lowpopcm/items/guncases.dm b/lowpopcm/items/guncases.dm new file mode 100644 index 00000000000..5af1ba8f627 --- /dev/null +++ b/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) diff --git a/lowpopcm/roles/command/pco.dm b/lowpopcm/roles/command/pco.dm index 1e36a16beb2..b8907aa5646 100644 --- a/lowpopcm/roles/command/pco.dm +++ b/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 diff --git a/lowpopcm/roles/command/so.dm b/lowpopcm/roles/command/so.dm index 753bcc63919..496b9a4bcc0 100644 --- a/lowpopcm/roles/command/so.dm +++ b/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 diff --git a/lowpopcm/vending/platoonco.dm b/lowpopcm/vending/platoonco.dm new file mode 100644 index 00000000000..900f5c60a68 --- /dev/null +++ b/lowpopcm/vending/platoonco.dm @@ -0,0 +1,107 @@ +//------------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 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("Medical Helmet Optic", 4, /obj/item/device/helmet_visor/medical, null, VENDOR_ITEM_RECOMMENDED), + 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_gear_platooncdr + + +//------------ESSENTIAL SETS--------------- + +/obj/effect/essentials_set/psgt + spawned_gear_list = list( + /obj/item/device/binoculars/range/designator, + /obj/item/storage/box/m94/signal, + /obj/item/device/binoculars/designator + ) + diff --git a/lowpopcm/vending/platoonsgt.dm b/lowpopcm/vending/platoonsgt.dm new file mode 100644 index 00000000000..a604ddc246d --- /dev/null +++ b/lowpopcm/vending/platoonsgt.dm @@ -0,0 +1,140 @@ +//------------GEAR VENDOR--------------- + +GLOBAL_LIST_INIT(cm_vending_gear_platoonsgt, list( + list("PLATOON SERGEANT KIT (CHOOSE 1)", 0, null, null, null), + list("Essential PSGT Kit", 0, /obj/effect/essentials_set/psgt, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), + + list("WEAPONS KIT (CHOOSE 1)", 0, null, null, null), + list("L42A Rifle Kit", 0, /obj/item/storage/box/guncase/l42a, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR), + list("M41A Mark 1 Kit", 0, /obj/item/storage/box/guncase/m41aMK1 , MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR), + list("MOU-53 Shotgun Kit", 0, /obj/item/storage/box/guncase/mou53, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR), + list("R4T Lever-Action Rifle Kit", 0, /obj/item/storage/box/guncase/r4t_scout, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR), + list("XM-88 Experimental Rifle", 0, /obj/item/storage/box/guncase/xm88, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR), + list("M707 Anti-Material Rifle Kit", 0, /obj/item/storage/box/guncase/vulture/skillless, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR), + + list("CLOTHING ITEMS", 0, null, null, null), + list("Machete Scabbard (Full)", 4, /obj/item/storage/large_holster/machete/full, null, VENDOR_ITEM_REGULAR), + list("Machete Pouch (Full)", 4, /obj/item/storage/pouch/machete/full, null, VENDOR_ITEM_REGULAR), + list("M276 Pattern Combat Toolbelt Rig", 15, /obj/item/storage/belt/gun/utility, null, 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("Welding Visor", 5, /obj/item/device/helmet_visor/welding_visor, null, VENDOR_ITEM_REGULAR), + list("Night Vision Optic", 20, /obj/item/device/helmet_visor/night_vision, null, VENDOR_ITEM_RECOMMENDED), + + list("ENGINEERING SUPPLIES", 0, null, null, null), //They're not really engineers. + list("Plastic explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_RECOMMENDED), + list("Breaching Charge", 7, /obj/item/explosive/plastic/breaching_charge, null, VENDOR_ITEM_RECOMMENDED), + list("Signal Flare Pack", 7, /obj/item/storage/box/m94/signal, null, VENDOR_ITEM_REGULAR), + + list("EXPLOSIVES", 0, null, null, null), + list("M40 HEDP High Explosive Packet (x3 grenades)", 18, /obj/item/storage/box/packet/high_explosive, null, VENDOR_ITEM_REGULAR), + list("M40 HIDP Incendiary Packet (x3 grenades)", 18, /obj/item/storage/box/packet/incendiary, null, VENDOR_ITEM_REGULAR), + list("M40 HPDP White Phosphorus Packet (x3 grenades)", 18, /obj/item/storage/box/packet/phosphorus, null, VENDOR_ITEM_REGULAR), + list("M40 HSDP Smoke Packet (x3 grenades)", 9, /obj/item/storage/box/packet/smoke, null, VENDOR_ITEM_REGULAR), + list("M74 AGM-Frag Airburst Packet (x3 airburst grenades)", 20, /obj/item/storage/box/packet/airburst_he, null, VENDOR_ITEM_REGULAR), + list("M74 AGM-Incendiary Airburst Packet (x3 airburst grenades)", 20, /obj/item/storage/box/packet/airburst_incen, null, VENDOR_ITEM_REGULAR), + list("M74 AGM-Smoke Airburst Packet (x3 airburst grenades)", 10, /obj/item/storage/box/packet/airburst_smoke, null, VENDOR_ITEM_REGULAR), + list("M74 AGM-Hornet Airburst Packet (x3 airburst grenades", 20, /obj/item/storage/box/packet/hornet, null, VENDOR_ITEM_REGULAR), + list("M20 Mine Box (x4 mines)", 20, /obj/item/storage/box/explosive_mines, null, VENDOR_ITEM_REGULAR), + + 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("Medical Helmet Optic", 4, /obj/item/device/helmet_visor/medical, null, VENDOR_ITEM_RECOMMENDED), + list("Roller Bed", 2, /obj/item/roller, null, VENDOR_ITEM_REGULAR), + + + )) + +/obj/structure/machinery/cm_vending/gear/platoonsgt + name = "\improper ColMarTech Platoon Sergeant Gear Rack" + desc = "An automated gear rack for Platoon Sergeant." + icon_state = "sl_gear" + show_points = TRUE + vendor_role = list(JOB_LP_PST) + req_access = list(ACCESS_MARINE_DATABASE) + +/obj/structure/machinery/cm_vending/gear/platoonsgt/get_listed_products(mob/user) + return GLOB.cm_vending_gear_platoonsgt + +//------------CLOTHING VENDOR--------------- + +GLOBAL_LIST_INIT(cm_vending_clothing_platoonsgt, list( + list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), + list("Standard Marine Apparel", 0, list(/obj/item/clothing/gloves/marine, /obj/item/clothing/head/helmet/marine/leader), MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), + list("B18 Pattern Armor", 0, /obj/item/clothing/gloves/marine/specialist, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), + list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), + list("Map", 0, /obj/item/map/current_map, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_MANDATORY), + list("USCM Radio Telephone Pack", 0, /obj/item/storage/backpack/marine/satchel/rto, null, 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("M276 Ammo Load Rig", 0, /obj/item/storage/belt/marine, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), + list("M276 M82F Holster Rig", 0, /obj/item/storage/belt/gun/flaregun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), + list("M276 Shotgun Shell Loading Rig", 0, /obj/item/storage/belt/shotgun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), + list("M276 M40 Grenade Rig", 0, /obj/item/storage/belt/grenade, 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/platoonsgt + 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_PST) + +/obj/structure/machinery/cm_vending/clothing/platoonsgt/get_listed_products(mob/user) + return GLOB.cm_vending_clothing_platoonsgt + + +//------------ESSENTIAL SETS--------------- + +/obj/effect/essentials_set/psgt + spawned_gear_list = list( + /obj/item/device/binoculars/range/designator, + /obj/item/storage/box/m94/signal, + /obj/item/device/binoculars/designator + ) + diff --git a/maps/map_files/USS_Shrike/USS_Shrike.dmm b/maps/map_files/USS_Shrike/USS_Shrike.dmm index 0d5c63a49cb..63d5292aaca 100644 --- a/maps/map_files/USS_Shrike/USS_Shrike.dmm +++ b/maps/map_files/USS_Shrike/USS_Shrike.dmm @@ -117,7 +117,6 @@ /obj/item/device/radio/marine, /obj/item/device/radio/marine, /obj/item/device/radio/marine, -/obj/item/folded_tent/cmd, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -1696,6 +1695,13 @@ icon_state = "tcomms" }, /area/space) +"iWa" = ( +/obj/item/bedsheet/brown, +/obj/structure/bed, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/living/officer_rnr) "jbq" = ( /obj/structure/machinery/computer/telecomms/traffic, /turf/open/floor/almayer{ @@ -2087,6 +2093,18 @@ icon_state = "plate" }, /area/almayer/squads/bravo) +"nWH" = ( +/obj/structure/machinery/door/airlock/almayer/command/reinforced{ + access_modified = 1; + dir = 1; + name = "\improper Junior Officer's Quarters"; + req_access = null; + req_access_txt = null + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/living/officer_rnr) "ohC" = ( /obj/effect/landmark/start/marine/bravo, /obj/effect/landmark/late_join/bravo, @@ -2335,6 +2353,16 @@ icon_state = "green" }, /area/almayer/squads/req) +"qTw" = ( +/obj/structure/closet/secure_closet/staff_officer/gear, +/obj/item/clothing/suit/storage/jacket/marine/service, +/obj/item/clothing/suit/storage/jacket/marine/service, +/obj/item/clothing/suit/storage/jacket/marine/dress, +/obj/item/clothing/suit/storage/jacket/marine/dress, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/living/officer_rnr) "raw" = ( /turf/closed/wall/almayer, /area/almayer/squads/bravo) @@ -27196,9 +27224,9 @@ bdH bdH bdH eHr -hXd -hXd -hXd +iWa +iWa +iWa wpI njb njb @@ -27402,7 +27430,7 @@ eHr hXd hXd hXd -wpI +nWH njb njb njb @@ -27602,9 +27630,9 @@ bdH bdH bdH eHr -hXd -hXd -hXd +qTw +qTw +qTw wpI abw abB From 6a13c85a290ce720c3a3386e58171e1d72351664 Mon Sep 17 00:00:00 2001 From: Kirie Saito <77302679+Kitsunemitsu@users.noreply.github.com> Date: Mon, 30 Oct 2023 15:20:19 -0400 Subject: [PATCH 2/3] Finishes the update --- lowpopcm/vending/platoonco.dm | 12 +----------- lowpopcm/vending/platoonsgt.dm | 3 +-- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/lowpopcm/vending/platoonco.dm b/lowpopcm/vending/platoonco.dm index 900f5c60a68..806d7c7363d 100644 --- a/lowpopcm/vending/platoonco.dm +++ b/lowpopcm/vending/platoonco.dm @@ -93,15 +93,5 @@ GLOBAL_LIST_INIT(cm_vending_clothing_platooncdr, list( vendor_role = list(JOB_LP_PCDR) /obj/structure/machinery/cm_vending/clothing/platooncdr/get_listed_products(mob/user) - return GLOB.cm_vending_gear_platooncdr - - -//------------ESSENTIAL SETS--------------- - -/obj/effect/essentials_set/psgt - spawned_gear_list = list( - /obj/item/device/binoculars/range/designator, - /obj/item/storage/box/m94/signal, - /obj/item/device/binoculars/designator - ) + return GLOB.cm_vending_clothing_platooncdr diff --git a/lowpopcm/vending/platoonsgt.dm b/lowpopcm/vending/platoonsgt.dm index a604ddc246d..724b0213330 100644 --- a/lowpopcm/vending/platoonsgt.dm +++ b/lowpopcm/vending/platoonsgt.dm @@ -82,7 +82,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_platoonsgt, list( GLOBAL_LIST_INIT(cm_vending_clothing_platoonsgt, list( list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), list("Standard Marine Apparel", 0, list(/obj/item/clothing/gloves/marine, /obj/item/clothing/head/helmet/marine/leader), MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), - list("B18 Pattern Armor", 0, /obj/item/clothing/gloves/marine/specialist, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), + list("M3 Platoon Sergeant Armor", 0, /obj/item/clothing/suit/storage/marine/sof, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("Map", 0, /obj/item/map/current_map, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_MANDATORY), list("USCM Radio Telephone Pack", 0, /obj/item/storage/backpack/marine/satchel/rto, null, VENDOR_ITEM_MANDATORY), @@ -133,7 +133,6 @@ GLOBAL_LIST_INIT(cm_vending_clothing_platoonsgt, list( /obj/effect/essentials_set/psgt spawned_gear_list = list( - /obj/item/device/binoculars/range/designator, /obj/item/storage/box/m94/signal, /obj/item/device/binoculars/designator ) From e3fd2ebcf72f66dd5c0663e61c86009e0e75d4aa Mon Sep 17 00:00:00 2001 From: Kirie Saito <77302679+Kitsunemitsu@users.noreply.github.com> Date: Mon, 30 Oct 2023 15:42:56 -0400 Subject: [PATCH 3/3] Moves an item --- lowpopcm/vending/platoonco.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lowpopcm/vending/platoonco.dm b/lowpopcm/vending/platoonco.dm index 806d7c7363d..a064b5fdedc 100644 --- a/lowpopcm/vending/platoonco.dm +++ b/lowpopcm/vending/platoonco.dm @@ -16,6 +16,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_platooncdr, list( 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), @@ -32,7 +33,6 @@ GLOBAL_LIST_INIT(cm_vending_gear_platooncdr, list( 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("Medical Helmet Optic", 4, /obj/item/device/helmet_visor/medical, null, VENDOR_ITEM_RECOMMENDED), list("Roller Bed", 2, /obj/item/roller, null, VENDOR_ITEM_REGULAR), ))