diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm
index 340119a4e78a..638546e3399a 100644
--- a/code/modules/research/designs.dm
+++ b/code/modules/research/designs.dm
@@ -109,9 +109,26 @@ other types of metals and chemistry for reagents).
 	pixel_y = base_pixel_y + rand(-5, 5)
 	if(design_name)
 		name = jointext(list(disk_name, design_name), " - ")
-	if(length(starting_blueprints))
-		for(var/design in starting_blueprints)
-			blueprints += new design()
+	//[CELADON-EDIT] - Превращаем обычный список в ассоциативный. Люммох пидарас. Вагабонд боженька. Чиним диски пупупу
+	// if(length(starting_blueprints))
+		// for(var/design in starting_blueprints)
+			// blueprints += new design()
+	var/list/new_designs = list()
+	var/list/previous_designs = starting_blueprints
+	var/maxim_shelby = length(previous_designs)
+	for(var/i in 1 to max_blueprints)
+		if(maxim_shelby >= i)
+			var/a = pick(previous_designs)
+			var/datum/design/b = new a()
+			new_designs += b
+			new_designs[b] = i
+			previous_designs -= a
+		else
+			var/c = null
+			new_designs += c
+			new_designs[c] = i
+	blueprints = new_designs
+	//[/CELADON-EDIT]
 
 /obj/item/disk/design_disk/adv
 	name = "Advanced Component Design Disk"
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index dc4e8d176afe..50c62e5bf5b8 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -668,17 +668,10 @@ Nothing else in the console has ID requirements.
 	RDSCREEN_UI_DDISK_CHECK
 	var/list/l = list()
 	l += "Disk Operations: <A href='?src=[REF(src)];clear_design=0'>Clear Disk</A><A href='?src=[REF(src)];updt_design=0'>Upload All</A><A href='?src=[REF(src)];eject_design=1'>Eject Disk</A>"
-	// [CELADON-EDIT] - CELADON_FIXES - Чиним диски
-	// for(var/i in 1 to d_disk.max_blueprints) // CELADON-EDIT - ORIGINAL
-	for(var/i in d_disk.blueprints)
-		// [/CELADON-EDIT]
+	for(var/i in 1 to d_disk.max_blueprints)
 		l += "<div class='statusDisplay'>"
-		// [CELADON-EDIT] - CELADON_FIXES - Чиним диски
-		// if(d_disk.blueprints[i])
-		//			var/datum/design/D = d_disk.blueprints[i] // CELADON-EDIT - ORIGINAL
-		if(istype(i, /datum/design))
-			var/datum/design/D = i
-			// [/CELADON-EDIT]
+		if(d_disk.blueprints[i])
+			var/datum/design/D = d_disk.blueprints[i] // CELADON-EDIT - ORIGINAL
 			l += "[D.icon_html(usr)] <A href='?src=[REF(src)];view_design=[D.id]'>[D.name]</A>"
 			l += "Operations: <A href='?src=[REF(src)];updt_design=[i]'>Upload to database</A> <A href='?src=[REF(src)];clear_design=[i]'>Clear Slot</A>"
 		else