Com Tech Specializations

cmss13-devs · Jul 6, 2024 · 52674e8 · 52674e8
1 parent bd18351
commit 52674e8
Show file tree

Hide file tree

Showing 6 changed files with 96 additions and 6 deletions.
diff --git a/code/game/machinery/vending/vendor_types/crew/staff_officer_armory.dm b/code/game/machinery/vending/vendor_types/crew/staff_officer_armory.dm
@@ -20,7 +20,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_staff_officer_armory, list(
 		list("Aviator Shades", 0, /obj/item/clothing/glasses/sunglasses/aviator, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR),
 
 		list("SPECIALISATION KIT (CHOOSE 1)", 0, null, null, null),
-		list("Essential Engineer Set", 0, /obj/effect/essentials_set/engi, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_RECOMMENDED),
+		list("Essential Engineer Set", 0, /obj/effect/essentials_set/engi/basic, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_RECOMMENDED),
 		list("Essential Medical Set", 0, /obj/effect/essentials_set/medic, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_RECOMMENDED),
 
 		list("BELT (CHOOSE 1)", 0, null, null, null),

diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm
@@ -2,7 +2,12 @@
 
 GLOBAL_LIST_INIT(cm_vending_gear_engi, list(
 		list("ENGINEER SET (MANDATORY)", 0, null, null, null),
-		list("Essential Engineer Set", 0, /obj/effect/essentials_set/engi, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY),
+		list("Essential Engineer Set (Most Versatile)", 0, /obj/effect/essentials_set/engi/basic, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY),
+		list("FOB Construction Set (Most Metal)", 0, /obj/effect/essentials_set/engi/fob, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY),
+		list("FOB Defense Set (Extra Sentry, Little Metal)", 0, /obj/effect/essentials_set/engi/fob_defenses, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY),
+		list("Rapid Deployment Set (Fast Cades, Little Resiliance)", 0, /obj/effect/essentials_set/engi/rapid_deployment, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY),
+		list("Frontline Supply Set (Keep Your Team Supplied)", 0, /obj/effect/essentials_set/engi/frontline_supply, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY),
+		list("Demolitions Set (Equipped To Level The Place)", 0, /obj/effect/essentials_set/engi/demolitions, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY),
 
 		list("HANDHELD DEFENSE (CHOOSE 1)", 0, null, null, null),
 		list("21S Tesla Coil", 0, /obj/item/defenses/handheld/tesla_coil, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_MANDATORY),
@@ -154,6 +159,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_engi, list(
 		list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
 
 		list("ACCESSORIES (CHOOSE 1)", 0, null, null, null),
+		list("Tool Webbing", 0, /obj/item/clothing/accessory/storage/tool_webbing/equipped, 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_RECOMMENDED),
 		list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
@@ -200,7 +206,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_engi, list(
 
 //------------ESSENTIAL SETS---------------
 
-/obj/effect/essentials_set/engi
+/obj/effect/essentials_set/engi/basic
 	spawned_gear_list = list(
 		/obj/item/explosive/plastic,
 		/obj/item/stack/sandbags_empty = 25,
@@ -211,3 +217,72 @@ GLOBAL_LIST_INIT(cm_vending_clothing_engi, list(
 		/obj/item/tool/shovel/etool/folded,
 		/obj/item/device/lightreplacer,
 	)
+
+/obj/effect/essentials_set/engi/fob
+	spawned_gear_list = list(
+		/obj/item/stack/sheet/metal/large_stack,
+		/obj/item/stack/sheet/metal/large_stack,
+		/obj/item/stack/barbed_wire/full_stack,
+		/obj/item/stack/sheet/plasteel/med_large_stack,
+		/obj/item/circuitboard/apc,
+		/obj/item/cell/high,
+		/obj/item/tool/shovel/etool/folded,
+		/obj/item/device/lightreplacer,
+	)
+
+/obj/effect/essentials_set/engi/fob_defenses
+	spawned_gear_list = list(
+		/obj/item/stack/sheet/metal/large_stack,
+		/obj/item/stack/barbed_wire/full_stack,
+		/obj/item/defenses/handheld/sentry,
+		/obj/item/storage/box/explosive_mines,
+		/obj/item/circuitboard/apc,
+		/obj/item/cell/high,
+		/obj/item/tool/shovel/etool/folded,
+		/obj/item/device/lightreplacer,
+	)
+
+/obj/effect/essentials_set/engi/rapid_deployment
+	spawned_gear_list = list(
+		/obj/item/storage/pouch/folding_barricade,
+		/obj/item/storage/pouch/folding_barricade,
+		/obj/item/stack/folding_barricade/three,
+		/obj/item/stack/folding_barricade/three,
+		/obj/item/stack/folding_barricade/three,
+		/obj/item/stack/sandbags/large_stack,
+		/obj/item/stack/sandbags/large_stack,
+		/obj/item/stack/barbed_wire/full_stack,
+		/obj/item/explosive/grenade/metal_foam,
+		/obj/item/explosive/grenade/metal_foam,
+		/obj/item/explosive/grenade/metal_foam,
+		/obj/item/circuitboard/apc,
+		/obj/item/cell/high,
+		/obj/item/tool/shovel/etool/folded,
+		/obj/item/device/lightreplacer,
+		/obj/item/reagent_container/hypospray/autoinjector/emergency,
+	)
+
+/obj/effect/essentials_set/engi/frontline_supply
+	spawned_gear_list = list(
+		/obj/item/stack/sheet/metal/large_stack,
+		/obj/item/stack/sheet/plasteel/small_stack = 16,
+		/obj/item/stack/barbed_wire/small_stack,
+		/obj/item/ammo_box/rounds,
+		/obj/item/circuitboard/apc,
+		/obj/item/cell/high,
+		/obj/item/tool/shovel/etool/folded,
+		/obj/item/device/lightreplacer,
+	)
+
+/obj/effect/essentials_set/engi/demolitions
+	spawned_gear_list = list(
+		/obj/item/explosive/plastic,
+		/obj/item/explosive/plastic,
+		/obj/item/storage/box/explosive_mines,
+		/obj/item/storage/box/packet/high_explosive,
+		/obj/item/stack/sheet/metal/large_stack,
+		/obj/item/circuitboard/apc,
+		/obj/item/cell/high,
+		/obj/item/tool/shovel/etool/folded,
+		/obj/item/device/lightreplacer,
+	)
diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm
@@ -1177,6 +1177,21 @@
 		/obj/item/weapon/gun/smg/nailgun/compact,
 	)
 
+/obj/item/storage/pouch/folding_barricade
+	name = "folding barricade pouch"
+	desc = "It's designed to hold folding barricades, sandbags, crowbars, and barbed wire. It also has two hooks for an entrenching tool and crowbar. Best for engineers that want to quickly setup defenses."
+	storage_slots = 3
+	max_w_class = SIZE_LARGE
+	icon_state = "construction"
+	can_hold = list(
+		/obj/item/stack/folding_barricade,
+		/obj/item/stack/sandbags_empty,
+		/obj/item/stack/sandbags,
+		/obj/item/stack/barbed_wire,
+		/obj/item/tool/shovel/etool,
+		/obj/item/tool/crowbar,
+	)
+
 /obj/item/storage/pouch/construction/full/fill_preset_inventory()
 	new /obj/item/stack/sheet/plasteel(src, 50)
 	new /obj/item/stack/sheet/metal(src, 50)

diff --git a/code/modules/gear_presets/clf.dm b/code/modules/gear_presets/clf.dm
@@ -241,7 +241,7 @@
 /datum/equipment_preset/clf/engineer/get_antag_gear_equipment()
 	return list(
 		list("MECHANIC SET (MANDATORY)", 0, null, null, null),
-		list("Essential Mechanic Set", 0, /obj/effect/essentials_set/engi, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY),
+		list("Essential Mechanic Set", 0, /obj/effect/essentials_set/engi/basic, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY),
 
 		list("ENGINEERING SUPPLIES", 0, null, null, null),
 		list("Airlock Circuit Board", 2, /obj/item/circuitboard/airlock, null, VENDOR_ITEM_REGULAR),

diff --git a/code/modules/gear_presets/pmc.dm b/code/modules/gear_presets/pmc.dm
@@ -1752,7 +1752,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null),
 /datum/equipment_preset/pmc/technician/get_antag_gear_equipment()
 	return list(
 		list("TECHNICIAN SET (MANDATORY)", 0, null, null, null),
-		list("Essential Engineer Set", 0, /obj/effect/essentials_set/engi, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY),
+		list("Essential Engineer Set", 0, /obj/effect/essentials_set/engi/basic, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY),
 
 		list("HANDHELD DEFENSE (CHOOSE 1)", 0, null, null, null),
 		list("WY Planted Flag", 0, /obj/item/defenses/handheld/planted_flag/wy, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_MANDATORY),

diff --git a/code/modules/gear_presets/upp.dm b/code/modules/gear_presets/upp.dm
@@ -488,7 +488,7 @@
 /datum/equipment_preset/upp/sapper/get_antag_gear_equipment()
 	return list(
 		list("SAPPER SET (MANDATORY)", 0, null, null, null),
-		list("Essential Sapper Set", 0, /obj/effect/essentials_set/engi, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY),
+		list("Essential Sapper Set", 0, /obj/effect/essentials_set/engi/basic, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY),
 
 		list("HANDHELD DEFENSE (CHOOSE 1)", 0, null, null, null),
 		list("UPP Planted Flag", 0, /obj/item/defenses/handheld/planted_flag/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_MANDATORY),