diff --git a/code/__defines/materials.dm b/code/__defines/materials.dm
index 76897da6bb..326b210656 100644
--- a/code/__defines/materials.dm
+++ b/code/__defines/materials.dm
@@ -69,10 +69,7 @@
 #define MAT_FLOKIUM			"flockium"
 #define MAT_SMOLEBRICKS		"smolebricks"
 #define MAT_WAX				"wax"
-
-//ChompEdit Begin Tyr exclusive material
 #define MAT_EAGATE			"energized agate"
-//ChompEdit End
 
 #define MAT_CULT			"cult"
 #define MAT_CULT2			"cult2"
diff --git a/code/modules/materials/materials/gems.dm b/code/modules/materials/materials/gems.dm
index 040133a8d7..e33fb34da3 100644
--- a/code/modules/materials/materials/gems.dm
+++ b/code/modules/materials/materials/gems.dm
@@ -230,3 +230,32 @@
 		new /datum/stack_recipe("glamour bow", /obj/item/gun/launcher/crossbow/bow/glamour, 15, time = 15 SECONDS, pass_stack_color = FALSE, supplied_material = "[name]"),
 		new /datum/stack_recipe("glamour arrow", /obj/item/arrow/standard/glamour, 1, time = 15 SECONDS, pass_stack_color = FALSE, supplied_material = "[name]")
 	)
+
+//downstream material, upported to keep cohesion between sprites. Not intended to naturally spawn and require mapping for accessing it
+/datum/material/weathered_agate
+	name = MAT_EAGATE
+	display_name = "energized agate"
+	use_name = "energized agate"
+	icon_colour = "#FF3300"
+	stack_type = /obj/item/stack/material/weathered_agate
+	ignition_point = 2400
+	melting_point = 2200
+	protectiveness = 70
+	opacity = 0.3
+	reflectivity = 0.5
+	explosion_resistance = 13
+	negation = 12
+	spatial_instability = 18
+	radiation_resistance = 18
+	supply_conversion_value = 12
+	can_sharpen = TRUE
+
+	hardness = 70
+	weight = 5
+
+	shard_type = SHARD_SHARD
+	tableslam_noise = 'sound/effects/Glasshit.ogg'
+	sheet_singular_name = "gem"
+	sheet_plural_name = "gems"
+	icon_base = "resin"
+	table_icon_base = "resin"
diff --git a/code/modules/materials/sheets/gems.dm b/code/modules/materials/sheets/gems.dm
index de88838c68..8d8835988b 100644
--- a/code/modules/materials/sheets/gems.dm
+++ b/code/modules/materials/sheets/gems.dm
@@ -74,3 +74,9 @@
 	default_type = MAT_GLAMOUR
 	no_variants = FALSE
 	apply_colour = TRUE
+
+/obj/item/stack/material/weathered_agate
+	name = MAT_EAGATE
+	icon_state = "sheet-agate"
+	singular_name = "weathered agate"
+	default_type = MAT_EAGATE
diff --git a/icons/mob/items/lefthand_material.dmi b/icons/mob/items/lefthand_material.dmi
index 1871a07175..bbc941b1e7 100644
Binary files a/icons/mob/items/lefthand_material.dmi and b/icons/mob/items/lefthand_material.dmi differ
diff --git a/icons/mob/items/righthand_material.dmi b/icons/mob/items/righthand_material.dmi
index 2187bd149a..de8747e16b 100644
Binary files a/icons/mob/items/righthand_material.dmi and b/icons/mob/items/righthand_material.dmi differ
diff --git a/icons/obj/stacks.dmi b/icons/obj/stacks.dmi
index f348f3d83c..cfc1254a44 100644
Binary files a/icons/obj/stacks.dmi and b/icons/obj/stacks.dmi differ
diff --git a/icons/obj/stacks_ch.dmi b/icons/obj/stacks_ch.dmi
index 97567a41d0..29a5beb6f7 100644
Binary files a/icons/obj/stacks_ch.dmi and b/icons/obj/stacks_ch.dmi differ
diff --git a/modular_chomp/code/modules/materials/materials/gems.dm b/modular_chomp/code/modules/materials/materials/gems.dm
index 4b4188b495..609ded1d29 100644
--- a/modular_chomp/code/modules/materials/materials/gems.dm
+++ b/modular_chomp/code/modules/materials/materials/gems.dm
@@ -5,30 +5,3 @@
 
 /datum/material/morphium //buffed protection
 	protectiveness = 65
-
-//disable this when this is ported upstream
-/datum/material/weathered_agate
-	name = MAT_EAGATE
-	display_name = "energized agate"
-	use_name = "energized agate"
-	icon_colour = "#FF3300"
-	stack_type = /obj/item/stack/material/weathered_agate
-	flags = MATERIAL_UNMELTABLE
-	cut_delay = 60
-	reflectivity = 0
-	conductivity = 1
-	shard_type = SHARD_SHARD
-	tableslam_noise = 'sound/effects/Glasshit.ogg'
-	stack_origin_tech = list(TECH_ARCANE = 1)
-	sheet_singular_name = "gem"
-	sheet_plural_name = "gems"
-	supply_conversion_value = 15
-	icon_base = "stone"
-	table_icon_base = "stone"
-
-
-/obj/item/stack/material/weathered_agate
-	name = MAT_EAGATE
-	icon_state = "sheet-diamond"
-	singular_name = "weathered agate"
-	default_type = MAT_EAGATE