diff --git a/code/modules/mob/living/silicon/robot/drone/drone_items.dm b/code/modules/mob/living/silicon/robot/drone/drone_items.dm
index 12b9ab83ae..d15af755f5 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm
+++ b/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
 
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 56ab25cea3..1aad22242f 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/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 (
-		/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)
+	for(var/T in stacktypes)
 		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
diff --git a/icons/effects/species.dmi b/icons/effects/species.dmi
index 56d0e57212..3129808d01 100644
Binary files a/icons/effects/species.dmi and b/icons/effects/species.dmi differ
diff --git a/icons/mob/human_races/r_armalis.dmi b/icons/mob/human_races/r_armalis.dmi
new file mode 100644
index 0000000000..9013f485a8
Binary files /dev/null and b/icons/mob/human_races/r_armalis.dmi differ
diff --git a/icons/mob/vox.dmi b/icons/mob/vox.dmi
index 6abba5c9e0..0661fd0f17 100644
Binary files a/icons/mob/vox.dmi and b/icons/mob/vox.dmi differ