Allows circuit printers, protolathes, mech fabricators, and prosthetic fabricators to store and use plastic and osmium sheets. No blueprints currently use either, however.

code/game/mecha/mech_fabricator.dm

@@ -13,7 +13,7 @@
 
 	var/speed = 1
 	var/mat_efficiency = 1
-	var/list/materials = list(DEFAULT_WALL_MATERIAL = 0, "glass" = 0, "gold" = 0, "silver" = 0, "diamond" = 0, "phoron" = 0, "uranium" = 0)
+	var/list/materials = list(DEFAULT_WALL_MATERIAL = 0, "glass" = 0, "plastic" = 0, "gold" = 0, "silver" = 0, "osmium" = 0, "diamond" = 0, "phoron" = 0, "uranium" = 0)
 	var/res_max_amount = 200000
 
 	var/datum/research/files

code/game/mecha/mech_prosthetics.dm

@@ -13,7 +13,7 @@
 
 	var/speed = 1
 	var/mat_efficiency = 1
-	var/list/materials = list(DEFAULT_WALL_MATERIAL = 0, "glass" = 0, "gold" = 0, "silver" = 0, "diamond" = 0, "phoron" = 0, "uranium" = 0, "plasteel" = 0)
+	var/list/materials = list(DEFAULT_WALL_MATERIAL = 0, "glass" = 0, "plastic" = 0, "gold" = 0, "silver" = 0, "osmium" = 0, "diamond" = 0, "phoron" = 0, "uranium" = 0, "plasteel" = 0)
 	var/res_max_amount = 200000
 
 	var/datum/research/files

code/modules/research/circuitprinter.dm

@@ -16,7 +16,7 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid).
 	var/mat_efficiency = 1
 	var/speed = 1
 
-	materials = list("metal" = 0, "glass" = 0, "gold" = 0, "silver" = 0, "phoron" = 0, "uranium" = 0, "diamond" = 0)
+	materials = list(DEFAULT_WALL_MATERIAL = 0, "glass" = 0, "plastic" = 0, "gold" = 0, "silver" = 0, "osmium" = 0, "phoron" = 0, "uranium" = 0, "diamond" = 0)
 
 	use_power = 1
 	idle_power_usage = 30
@@ -120,7 +120,7 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid).
 		return 1
 	if(O.is_open_container())
 		return 0
-	if(!istype(O, /obj/item/stack/material/glass) && !istype(O, /obj/item/stack/material/gold) && !istype(O, /obj/item/stack/material/diamond) && !istype(O, /obj/item/stack/material/uranium))
+	if(!istype(O, /obj/item/stack/material)) //Previously checked for specific material sheets, for some reason? Made the check on 133 redundant.
 		user << "<span class='notice'>You cannot insert this item into \the [src].</span>"
 		return 1
 	if(stat)

code/modules/research/protolathe.dm

@@ -15,7 +15,7 @@
 	var/mat_efficiency = 1
 	var/speed = 1
 
-	materials = list(DEFAULT_WALL_MATERIAL = 0, "glass" = 0, "gold" = 0, "silver" = 0, "phoron" = 0, "uranium" = 0, "diamond" = 0)
+	materials = list(DEFAULT_WALL_MATERIAL = 0, "glass" = 0, "plastic" = 0, "gold" = 0, "silver" = 0, "osmium" = 0, "phoron" = 0, "uranium" = 0, "diamond" = 0)
 
 /obj/machinery/r_n_d/protolathe/New()
 	..()
@@ -213,10 +213,14 @@
 			mattype = /obj/item/stack/material/steel
 		if("glass")
 			mattype = /obj/item/stack/material/glass
+		if("plastic")
+			mattype = /obj/item/stack/material/plastic
 		if("gold")
 			mattype = /obj/item/stack/material/gold
 		if("silver")
 			mattype = /obj/item/stack/material/silver
+		if("osmium")
+			mattype = /obj/item/stack/material/osmium
 		if("diamond")
 			mattype = /obj/item/stack/material/diamond
 		if("phoron")

code/modules/research/rdmachines.dm

@@ -22,10 +22,14 @@
 			return /obj/item/stack/material/steel
 		if("glass")
 			return /obj/item/stack/material/glass
+		if("plastic")
+			return /obj/item/stack/material/plastic
 		if("gold")
 			return /obj/item/stack/material/gold
 		if("silver")
 			return /obj/item/stack/material/silver
+		if("osmium")
+			return /obj/item/stack/material/osmium
 		if("phoron")
 			return /obj/item/stack/material/phoron
 		if("uranium")
@@ -40,10 +44,14 @@
 			return DEFAULT_WALL_MATERIAL
 		if(/obj/item/stack/material/glass)
 			return "glass"
+		if(/obj/item/stack/material/plastic)
+			return "plastic"
 		if(/obj/item/stack/material/gold)
 			return "gold"
 		if(/obj/item/stack/material/silver)
 			return "silver"
+		if(/obj/item/stack/material/osmium)
+			return "osmium"
 		if(/obj/item/stack/material/phoron)
 			return "phoron"
 		if(/obj/item/stack/material/uranium)