Merge branch 'dev' of https://github.com/Zuhayr/Baystation12 into dev

code/modules/mob/living/silicon/robot/drone/drone_items.dm

@@ -316,22 +316,22 @@
 			switch(type)
 				if("metal")
 					if(!stack_metal)
-						stack_metal = new(src.module)
+						stack_metal = new /obj/item/stack/sheet/metal/cyborg(src.module)
 						stack_metal.amount = 1
 					stack = stack_metal
 				if("glass")
 					if(!stack_glass)
-						stack_glass = new(src.module)
+						stack_glass = new /obj/item/stack/sheet/glass/cyborg(src.module)
 						stack_glass.amount = 1
 					stack = stack_glass
 				if("wood")
 					if(!stack_wood)
-						stack_wood = new(src.module)
+						stack_wood = new /obj/item/stack/sheet/wood/cyborg(src.module)
 						stack_wood.amount = 1
 					stack = stack_wood
 				if("plastic")
 					if(!stack_plastic)
-						stack_plastic = new(src.module)
+						stack_plastic = new /obj/item/stack/sheet/mineral/plastic/cyborg(src.module)
 						stack_plastic.amount = 1
 					stack = stack_plastic
 

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -310,17 +310,7 @@
 	var/obj/item/weapon/reagent_containers/spray/cleaner/C = locate() in src.modules
 	C.reagents.add_reagent("cleaner", 10)
 
-	var/list/stacks = list (
+	for(var/T in stacktypes)
-		/obj/item/stack/sheet/metal,
-		/obj/item/weapon/cable_coil,
-		/obj/item/stack/sheet/glass/cyborg,
-		/obj/item/stack/rods,
-		/obj/item/stack/sheet/rglass/cyborg,
-		/obj/item/stack/tile/plasteel,
-		/obj/item/stack/tile/wood
-	)
-
-	for(var/T in stacks)
 		var/O = locate(T) in src.modules
 		var/obj/item/stack/sheet/S = O
 
@@ -329,11 +319,8 @@
 			S = new T(src)
 			src.modules += S
 			S.amount = 1
-		var/max = 15
-		if(stacktypes[T])
-			max = stacktypes[T]
 
-		if(S && S.amount < max)
+		if(S && S.amount < stacktypes[T])
 			S.amount++
 
 	var/obj/item/device/lightreplacer/LR = locate() in src.modules