From ebe667c4d2e270270894ea7438e45ef6d9a6d076 Mon Sep 17 00:00:00 2001
From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date: Tue, 17 Sep 2019 11:53:13 +1000
Subject: [PATCH] Adds combat hybrid cell-loaded gun kit

---
 .../guns/cell_loaded/cell_loaded.dm           | 23 ++++++++++++++++++-
 maps/tether/tether-10-colony.dmm              |  4 ++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/code/modules/vore/fluffstuff/guns/cell_loaded/cell_loaded.dm b/code/modules/vore/fluffstuff/guns/cell_loaded/cell_loaded.dm
index 66db8708597..8e9a5181e66 100644
--- a/code/modules/vore/fluffstuff/guns/cell_loaded/cell_loaded.dm
+++ b/code/modules/vore/fluffstuff/guns/cell_loaded/cell_loaded.dm
@@ -258,4 +258,25 @@
 	new /obj/item/ammo_casing/microbattery/medical/burn3(src)
 	new /obj/item/ammo_casing/microbattery/medical/stabilize2(src)
 	new /obj/item/ammo_casing/microbattery/medical/toxin3(src)
-	new /obj/item/ammo_casing/microbattery/medical/omni3(src)
\ No newline at end of file
+	new /obj/item/ammo_casing/microbattery/medical/omni3(src)
+
+/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hybrid_combat
+	name = "military cell-loaded gun kit"
+	desc = "A storage case for a multi-purpose handgun. Variety hour!"
+	w_class = ITEMSIZE_NORMAL
+	max_w_class = ITEMSIZE_NORMAL
+
+/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hybrid_combat/New()
+	..()
+	new /obj/item/weapon/gun/projectile/cell_loaded(src)
+	new /obj/item/ammo_magazine/cell_mag/advanced(src)
+	new /obj/item/ammo_casing/microbattery/combat/shotstun(src)
+	new /obj/item/ammo_casing/microbattery/combat/shotstun(src)
+	new /obj/item/ammo_casing/microbattery/combat/lethal(src)
+	new /obj/item/ammo_casing/microbattery/combat/lethal(src)
+	new /obj/item/ammo_casing/microbattery/combat/lethal(src)
+	new /obj/item/ammo_casing/microbattery/combat/ion(src)
+	new /obj/item/ammo_casing/microbattery/combat/xray(src)
+	new /obj/item/ammo_casing/microbattery/medical/stabilize2(src)
+	new /obj/item/ammo_casing/microbattery/medical/haste(src)
+	new /obj/item/ammo_casing/microbattery/medical/resist(src)
\ No newline at end of file
diff --git a/maps/tether/tether-10-colony.dmm b/maps/tether/tether-10-colony.dmm
index 6fe1783d6d1..4c3d5da2f4e 100644
--- a/maps/tether/tether-10-colony.dmm
+++ b/maps/tether/tether-10-colony.dmm
@@ -16981,8 +16981,8 @@
 /area/centcom/evac)
 "QQ" = (
 /obj/structure/table/rack,
-/obj/item/weapon/storage/secure/briefcase/nsfw_pack,
-/obj/item/weapon/storage/secure/briefcase/nsfw_pack,
+/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hybrid_combat,
+/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hybrid_combat,
 /turf/unsimulated/floor{
 	icon_state = "dark"
 	},