diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm
index 12abf3009b7..9383a78588c 100644
--- a/code/modules/mining/equipment_locker.dm
+++ b/code/modules/mining/equipment_locker.dm
@@ -323,8 +323,8 @@
new /datum/data/mining_equipment("Laser Pointer", /obj/item/device/laser_pointer, 300),
new /datum/data/mining_equipment("Alien Toy", /obj/item/clothing/mask/facehugger/toy, 300),
new /datum/data/mining_equipment("Advanced Scanner", /obj/item/device/t_scanner/adv_mining_scanner, 400),
- new /datum/data/mining_equipment("Hivelord Stabilizer", /obj/item/weapon/hivelordstabilizer , 400),
- new /datum/data/mining_equipment("Mining Drone", /mob/living/simple_animal/hostile/mining_drone, 500),
+ new /datum/data/mining_equipment("Hivelord Stabilizer", /obj/item/weapon/hivelordstabilizer, 400),
+ new /datum/data/mining_equipment("Mining Drone", /obj/item/weapon/mining_drone_cube, 500),
new /datum/data/mining_equipment("GAR mesons", /obj/item/clothing/glasses/meson/gar, 500),
new /datum/data/mining_equipment("Brute First-Aid Kit", /obj/item/weapon/storage/firstaid/brute, 600),
new /datum/data/mining_equipment("Jaunter", /obj/item/device/wormhole_jaunter, 600),
@@ -457,8 +457,7 @@
if("Resonator")
new /obj/item/weapon/resonator(src.loc)
if("Mining Drone")
- new /mob/living/simple_animal/hostile/mining_drone(src.loc)
- new /obj/item/weapon/weldingtool/hugetank(src.loc)
+ new /obj/item/weapon/storage/box/drone_kit(src.loc)
if("Advanced Scanner")
new /obj/item/device/t_scanner/adv_mining_scanner(src.loc)
qdel(voucher)
@@ -663,6 +662,22 @@
return
+/**********************Mining drone cube**********************/
+
+/obj/item/weapon/mining_drone_cube
+ name = "mining drone cube"
+ desc = "Compressed mining drone, ready for deployment. Just press the button to activate!"
+ w_class = 2.0
+ icon = 'icons/obj/aibots.dmi'
+ icon_state = "minedronecube"
+ item_state = "electronic"
+
+/obj/item/weapon/mining_drone_cube/attack_self(mob/user)
+ user.visible_message("\The [src] suddenly expands into a fully functional mining drone!", \
+ "You press center button on \the [src]. The device suddenly expands into a fully functional mining drone!")
+ new /mob/living/simple_animal/hostile/mining_drone(get_turf(src))
+ qdel(src)
+
/**********************Mining drone**********************/
/mob/living/simple_animal/hostile/mining_drone
@@ -797,6 +812,22 @@
SetOffenseBehavior()
..()
+
+/**********************Mining drone kit**********************/
+
+/obj/item/weapon/storage/box/drone_kit
+ name = "Drone Kit"
+ desc = "A boxed kit that includes one mining drone cube and a welding tool with an increased capacity."
+ icon_state = "implant"
+ max_w_class = 3
+ storage_slots = 2
+ can_hold = list("/obj/item/weapon/mining_drone_cube","/obj/item/weapon/weldingtool/hugetank")
+
+/obj/item/weapon/storage/box/drone_kit/New()
+ ..()
+ new /obj/item/weapon/mining_drone_cube(src)
+ new /obj/item/weapon/weldingtool/hugetank(src)
+
/**********************Lazarus Injector**********************/
/obj/item/weapon/lazarus_injector
diff --git a/icons/obj/aibots.dmi b/icons/obj/aibots.dmi
index 3c6ecf0c776..1a0d4960abe 100644
Binary files a/icons/obj/aibots.dmi and b/icons/obj/aibots.dmi differ