CommitTime

cmss13-devs · Oct 27, 2023 · 6c5d534 · 6c5d534
1 parent 274e56e
commit 6c5d534
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/code/game/machinery/vending/vendor_types/crew/synthetic.dm b/code/game/machinery/vending/vendor_types/crew/synthetic.dm
@@ -356,7 +356,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list(
 		list("Maintenance Jack", 15, /obj/item/maintenance_jack, null, VENDOR_ITEM_REGULAR),
 		list("Portable Dialysis Machine", 15, /obj/item/tool/portadialysis, null, VENDOR_ITEM_REGULAR),
 		list("Telescopic Baton", 15, /obj/item/weapon/telebaton, null, VENDOR_ITEM_REGULAR),
-		list("Tactical Tools and C4", 15, /obj/item/storage/box/kit/tactical_kit, null, VENDOR_ITEM_REGULAR),
+		list("Tactical Equipment and C4", 15, /obj/item/storage/box/kit/tactical_kit, null, VENDOR_ITEM_REGULAR),
 	)
 
 //------------EXPERIMENTAL TOOL KITS---------------

diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm
@@ -683,6 +683,10 @@
 	new /obj/item/reagent_container/hypospray/autoinjector/stimulant/redemption_stimulant(src)
 	new /obj/item/reagent_container/hypospray/autoinjector/stimulant/speed_stimulant(src)
 
+/obj/item/storage/pouch/medical/socmed/synth
+	desc = "A heavy pouch that can carry a full suite of medical supplies, this one is a limited issue version sometimes given to USCM synthetic units."
+	storage_slots = 7
+
 /obj/item/storage/pouch/medical/socmed/dutch
 	name = "\improper Dutch's Medical Pouch"
 	desc = "A pouch bought from a black market trader by Dutch quite a few years ago. Rumoured to be stolen from secret USCM assets. Its contents have been slowly used up and replaced over the years."
@@ -1256,6 +1260,11 @@
 	new /obj/item/tool/weldingtool(src)
 	new /obj/item/tool/wrench(src)
 
+/obj/item/storage/pouch/tools/tactical/synth
+	desc = "This particular toolkit full of sharp, heavy objects was designed for breaking into things rather than fixing them. Still does the latter pretty well, though. Special issue version given to some USCM synthetic units."
+	icon_state = "soctools"
+	storage_slots = 4
+
 /obj/item/storage/pouch/sling
 	name = "sling strap"
 	desc = "Keeps a single item attached to a strap."

diff --git a/code/modules/cm_marines/equipment/kit_boxes.dm b/code/modules/cm_marines/equipment/kit_boxes.dm
@@ -546,9 +546,11 @@
 	new /obj/item/clothing/glasses/welding(src)
 
 /obj/item/storage/box/kit/tactical_kit
-	name = "\improper Tactical Engineering Kit"
+	name = "\improper Tactical Equipment Kit"
 
 /obj/item/storage/box/kit/tactical_kit/fill_preset_inventory()
+	new /obj/item/storage/pouch/medical/socmed/synth(src)
+	new /obj/item/storage/pouch/tools/tactical/synth(src)
 	new /obj/item/tool/screwdriver/tactical(src)
 	new /obj/item/tool/wirecutters/tactical(src)
 	new /obj/item/tool/crowbar/tactical(src)