Merge branch 'master' of https://github.com/tgstation/-tg-station int…

…o BEES_glorious_BEES

Conflicts:
	icons/obj/hydroponics/equipment.dmi

code/game/machinery/cloning.dm

@@ -353,13 +353,8 @@
 
 /obj/item/weapon/storage/box/disks/New()
 	..()
-	new /obj/item/weapon/disk/data(src)
-	new /obj/item/weapon/disk/data(src)
-	new /obj/item/weapon/disk/data(src)
-	new /obj/item/weapon/disk/data(src)
-	new /obj/item/weapon/disk/data(src)
-	new /obj/item/weapon/disk/data(src)
-	new /obj/item/weapon/disk/data(src)
+	for(var/i in 1 to 7)
+		new /obj/item/weapon/disk/data(src)
 
 /*
  *	Manual -- A big ol' manual.

code/game/machinery/constructable_frame.dm

@@ -791,3 +791,14 @@ obj/item/weapon/circuitboard/rdserver
 	req_components = list(
 							/obj/item/weapon/stock_parts/console_screen = 1,
 							/obj/item/weapon/stock_parts/matter_bin = 3)
+
+/obj/item/weapon/circuitboard/plantgenes
+	name = "circuit board (Plant DNA Manipulator)"
+	build_path = /obj/machinery/plantgenes
+	board_type = "machine"
+	origin_tech = "programming=2;biotech=3"
+	req_components = list(
+							/obj/item/weapon/stock_parts/manipulator = 1,
+							/obj/item/weapon/stock_parts/micro_laser = 2,
+							/obj/item/weapon/stock_parts/console_screen = 1,
+							/obj/item/weapon/stock_parts/scanning_module = 1,)

code/game/objects/items/bodybag.dm

@@ -40,6 +40,7 @@
 	density = 0
 	mob_storage_capacity = 2
 	open_sound = 'sound/items/zip.ogg'
+	close_sound = 'sound/items/zip.ogg'
 
 
 /obj/structure/closet/body_bag/attackby(obj/item/I, mob/user, params)
@@ -107,4 +108,4 @@
 	foldedbag_path = /obj/item/bodybag/bluespace
 	density = 0
 	mob_storage_capacity = 15
-	max_mob_size = MOB_SIZE_LARGE
+	max_mob_size = MOB_SIZE_LARGE