diff --git a/code/__DEFINES/construction.dm b/code/__DEFINES/construction.dm
index 8033dda0..9cc469a4 100644
--- a/code/__DEFINES/construction.dm
+++ b/code/__DEFINES/construction.dm
@@ -69,7 +69,7 @@
 #define MAT_PLASMA		"$plasma"
 #define MAT_BLUESPACE	"$bluespace"
 #define MAT_BANANIUM	"$bananium"
-#define MAT_CALORIT 	"$calorit"           //GS13
+#define MAT_CALORITE 	"$calorite"           //GS13
 #define MAT_TITANIUM	"$titanium"
 #define MAT_BIOMASS		"$biomass"
 #define MAT_PLASTIC	    "$plastic"
diff --git a/code/datums/components/material_container.dm b/code/datums/components/material_container.dm
index 5e0aee59..9a3529f2 100644
--- a/code/datums/components/material_container.dm
+++ b/code/datums/components/material_container.dm
@@ -381,11 +381,11 @@
 	sheet_type = /obj/item/stack/sheet/mineral/bananium
 	coin_type = /obj/item/coin/bananium
 
-/datum/material/calorit //GS13
-	name = "Calorit"
-	id = MAT_CALORIT
-	sheet_type = /obj/item/stack/sheet/mineral/calorit
-	// coin_type = /obj/item/coin/calorit
+/datum/material/calorite //GS13
+	name = "calorite"
+	id = MAT_CALORITE
+	sheet_type = /obj/item/stack/sheet/mineral/calorite
+	// coin_type = /obj/item/coin/calorite
 
 /datum/material/titanium
 	name = "Titanium"
diff --git a/code/datums/components/remote_materials.dm b/code/datums/components/remote_materials.dm
index 72779fd7..7dc86daa 100644
--- a/code/datums/components/remote_materials.dm
+++ b/code/datums/components/remote_materials.dm
@@ -54,7 +54,7 @@ handles linking back and forth.
 /datum/component/remote_materials/proc/_MakeLocal()
 	silo = null
 	mat_container = parent.AddComponent(/datum/component/material_container,
-		list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_CALORIT, MAT_TITANIUM, MAT_BLUESPACE, MAT_PLASTIC),
+		list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_CALORITE, MAT_TITANIUM, MAT_BLUESPACE, MAT_PLASTIC),
 		local_size,
 		FALSE,
 		/obj/item/stack)
diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm
index 723ad963..91fd1776 100644
--- a/code/game/machinery/recycler.dm
+++ b/code/game/machinery/recycler.dm
@@ -18,7 +18,7 @@
 	var/item_recycle_sound = 'sound/items/welder.ogg'
 
 /obj/machinery/recycler/Initialize()
-	AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_URANIUM, MAT_BANANIUM, MAT_CALORIT, MAT_TITANIUM, MAT_BLUESPACE, MAT_PLASTIC), INFINITY, FALSE, null, null, null, TRUE)
+	AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_URANIUM, MAT_BANANIUM, MAT_CALORITE, MAT_TITANIUM, MAT_BLUESPACE, MAT_PLASTIC), INFINITY, FALSE, null, null, null, TRUE)
 	AddComponent(/datum/component/butchering, 1, amount_produced,amount_produced/5)
 	. = ..()
 	update_icon()
diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm
index c2e1bbdf..ce358226 100644
--- a/code/game/objects/items/stacks/sheets/mineral.dm
+++ b/code/game/objects/items/stacks/sheets/mineral.dm
@@ -280,27 +280,27 @@ GLOBAL_LIST_INIT(bananium_recipes, list ( \
 
 
 /*
- * Calorit - GS13
+ * calorite - GS13
  */
-/obj/item/stack/sheet/mineral/calorit
-	name = "calorit"
-	icon_state = "sheet-calorit"
-	item_state = "sheet-calorit"
-	singular_name = "calorit sheet"
-	sheettype = "calorit"
-	materials = list(MAT_CALORIT=MINERAL_MATERIAL_AMOUNT)
+/obj/item/stack/sheet/mineral/calorite
+	name = "calorite"
+	icon_state = "sheet-calorite"
+	item_state = "sheet-calorite"
+	singular_name = "calorite sheet"
+	sheettype = "calorite"
+	materials = list(MAT_CALORITE=MINERAL_MATERIAL_AMOUNT)
 	novariants = TRUE
 	grind_results = list(/datum/reagent/consumable/lipoifier = 10)
 	point_value = 40
-	merge_type = /obj/item/stack/sheet/mineral/calorit
+	merge_type = /obj/item/stack/sheet/mineral/calorite
 
-GLOBAL_LIST_INIT(calorit_recipes, list ( \
-	new/datum/stack_recipe("calorit tile", /obj/item/stack/tile/mineral/calorit, 1, 4, 20), \
-	// new/datum/stack_recipe("Fatty Statue", /obj/structure/statue/calorit/fatty, 5, one_per_turf = 1, on_floor = 1),
+GLOBAL_LIST_INIT(calorite_recipes, list ( \
+	new/datum/stack_recipe("calorite tile", /obj/item/stack/tile/mineral/calorite, 1, 4, 20), \
+	// new/datum/stack_recipe("Fatty Statue", /obj/structure/statue/calorite/fatty, 5, one_per_turf = 1, on_floor = 1),
 	))
 
-/obj/item/stack/sheet/mineral/calorit/Initialize(mapload, new_amount, merge = TRUE)
-	recipes = GLOB.calorit_recipes
+/obj/item/stack/sheet/mineral/calorite/Initialize(mapload, new_amount, merge = TRUE)
+	recipes = GLOB.calorite_recipes
 	. = ..()
 
 
diff --git a/code/game/objects/items/stacks/tiles/tile_mineral.dm b/code/game/objects/items/stacks/tiles/tile_mineral.dm
index 0a4044d4..841aeeaa 100644
--- a/code/game/objects/items/stacks/tiles/tile_mineral.dm
+++ b/code/game/objects/items/stacks/tiles/tile_mineral.dm
@@ -52,14 +52,14 @@
 	mineralType = "bananium"
 	materials = list(MAT_BANANIUM=500)
 
-/obj/item/stack/tile/mineral/calorit  //GS13
-	name = "calorit tile"
-	singular_name = "calorit floor tile"
-	desc = "A tile made out of calorit. Bwwooomphf."
-	icon_state = "tile_calorit"
-	turf_type = /turf/open/floor/mineral/calorit
-	mineralType = "calorit"
-	materials = list(MAT_CALORIT=500)
+/obj/item/stack/tile/mineral/calorite  //GS13
+	name = "calorite tile"
+	singular_name = "calorite floor tile"
+	desc = "A tile made out of calorite. Bwoomph."
+	icon_state = "tile_calorite"
+	turf_type = /turf/open/floor/mineral/calorite
+	mineralType = "calorite"
+	materials = list(MAT_CALORITE=500)
 
 /obj/item/stack/tile/mineral/abductor
 	name = "alien floor tile"
diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm
index 0066fb2f..851f2aca 100644
--- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm
+++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm
@@ -104,7 +104,7 @@
 	/obj/item/stack/sheet/mineral/uranium,
 	/obj/item/stack/sheet/mineral/diamond,
 	/obj/item/stack/sheet/mineral/bananium,
-	/obj/item/stack/sheet/mineral/calorit,
+	/obj/item/stack/sheet/mineral/calorite,
 	/obj/item/stack/sheet/plasteel,
 	/obj/item/stack/sheet/mineral/titanium,
 	/obj/item/stack/sheet/mineral/plastitanium,
diff --git a/code/game/objects/structures/door_assembly_types.dm b/code/game/objects/structures/door_assembly_types.dm
index 3f1f3d7d..59906330 100644
--- a/code/game/objects/structures/door_assembly_types.dm
+++ b/code/game/objects/structures/door_assembly_types.dm
@@ -216,14 +216,14 @@
 	mineral = "bananium"
 	glass_type = /obj/machinery/door/airlock/bananium/glass
 
-// /obj/structure/door_assembly/door_assembly_calorit //GS13
-// 	name = "calorit airlock assembly"
+// /obj/structure/door_assembly/door_assembly_calorite //GS13
+// 	name = "calorite airlock assembly"
 // 	desc = "Very inviting."
-// 	icon = 'icons/obj/doors/airlocks/station/calorit.dmi'
-// 	base_name = "calorit airlock"
-// 	airlock_type = /obj/machinery/door/airlock/calorit
-// 	mineral = "calorit"
-// 	glass_type = /obj/machinery/door/airlock/calorit/glass
+// 	icon = 'icons/obj/doors/airlocks/station/calorite.dmi'
+// 	base_name = "calorite airlock"
+// 	airlock_type = /obj/machinery/door/airlock/calorite
+// 	mineral = "calorite"
+// 	glass_type = /obj/machinery/door/airlock/calorite/glass
 
 /obj/structure/door_assembly/door_assembly_sandstone
 	name = "sandstone airlock assembly"
diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm
index 573ae063..2a1b3767 100644
--- a/code/game/objects/structures/false_walls.dm
+++ b/code/game/objects/structures/false_walls.dm
@@ -263,14 +263,14 @@
 	walltype = /turf/closed/wall/mineral/bananium
 	canSmoothWith = list(/obj/structure/falsewall/bananium, /turf/closed/wall/mineral/bananium)
 
-// /obj/structure/falsewall/calorit            //GS13
-// 	name = "calorit wall"
-// 	desc = "A wall with calorit plating. Burp."
-// 	icon = 'icons/turf/walls/calorit_wall.dmi'
-// 	icon_state = "calorit"
-// 	mineral = /obj/item/stack/sheet/mineral/calorit
-// 	walltype = /turf/closed/wall/mineral/calorit
-// 	canSmoothWith = list(/obj/structure/falsewall/calorit, /turf/closed/wall/mineral/calorit)
+// /obj/structure/falsewall/calorite            //GS13
+// 	name = "calorite wall"
+// 	desc = "A wall with calorite plating. Burp."
+// 	icon = 'icons/turf/walls/calorite_wall.dmi'
+// 	icon_state = "calorite"
+// 	mineral = /obj/item/stack/sheet/mineral/calorite
+// 	walltype = /turf/closed/wall/mineral/calorite
+// 	canSmoothWith = list(/obj/structure/falsewall/calorite, /turf/closed/wall/mineral/calorite)
 
 
 /obj/structure/falsewall/sandstone
diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm
index 9db2f38e..9e081207 100644
--- a/code/game/objects/structures/statues.dm
+++ b/code/game/objects/structures/statues.dm
@@ -318,3 +318,15 @@
 	name = "blueberry statue"
 	desc = "A statue resembling a poor humanoid creature shaped like a ball."
 	icon_state = "blueberry"
+
+
+//////////////////////////////CALORITE - GS13///////////////////////////////
+
+/obj/structure/statue/calorite
+	max_integrity = 400
+	material_drop_type = /obj/item/stack/sheet/mineral/calorite
+
+/obj/structure/statue/calorite/fatty
+	name = "Fatty statue"
+	desc = "A statue of a well-rounded fatso."
+	icon_state = "fatty"
diff --git a/code/game/turfs/simulated/floor/mineral_floor.dm b/code/game/turfs/simulated/floor/mineral_floor.dm
index 4f0bfb8d..0cd73d10 100644
--- a/code/game/turfs/simulated/floor/mineral_floor.dm
+++ b/code/game/turfs/simulated/floor/mineral_floor.dm
@@ -5,6 +5,7 @@
  * Silver floor
  * Bananium floor
  * Diamond floor
+ * Calorite floor
  * Uranium floor
  * Shuttle floor (Titanium)
  * Sand floors
@@ -204,20 +205,52 @@
 	initial_gas_mix = AIRLESS_ATMOS
 
 
-//CALORIT - GS13
+//calorite floor - GS13
 
-/turf/open/floor/mineral/calorit
-	article = "a"
-	name = "calorit floor"
-	icon_state = "calorit"
-	floor_tile = /obj/item/stack/tile/mineral/calorit
-	icons = list("calorit","calorit_dam")
+/turf/open/floor/mineral/calorite
+	name = "Calorite floor"
+	icon_state = "calorite"
+	floor_tile = /obj/item/stack/tile/mineral/calorite
+	icons = list("calorite","calorite_dam")
 	var/last_event = 0
 	var/active = null
 
-/turf/open/floor/mineral/calorit/Entered(mob/living/carbon/M)
-	M.fatness = M.fatness + 50
-	return ..()
+/turf/open/floor/mineral/calorite/Entered(mob/living/carbon/M)
+			M.fatness = M.fatness + 20
+
+// /turf/open/floor/mineral/calorite/proc/fatten(mob/living/carbon/M)
+// 	if(!active)
+// 		if(world.time > last_event+15)
+// 			active = 1
+// 			M.fatness = M.fatness + 30
+// 			for(var/turf/open/floor/mineral/calorite/T in orange(1,src))
+// 				T.fatten()
+// 			last_event = world.time
+// 			active = 0
+// 			return
+
+// calorite floor, disguised version - GS13
+
+/turf/open/floor/mineral/calorite_hide
+	name = "Steel floor"
+	icon_state = "calorite_hide"
+	floor_tile = /obj/item/stack/tile/mineral/calorite_hide
+	icons = list("calorite_hide","calorite_hide_dam")
+
+/turf/open/floor/mineral/calorite_hide/Entered(mob/living/carbon/M)
+			M.fatness = M.fatness + 50
+
+// calorite floor, powerful version - GS13
+
+/turf/open/floor/mineral/calorite_strong
+	name = "Infused calorite floor"
+	icon_state = "calorite_strong"
+	floor_tile = /obj/item/stack/tile/mineral/calorite_strong
+	icons = list("calorite_strong","calorite_strong_dam")
+
+/turf/open/floor/mineral/calorite_strong/Entered(mob/living/carbon/M)
+			M.fatness = M.fatness + 200
+
 
 //DIAMOND
 
diff --git a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm
index 02deb13f..0c376027 100644
--- a/code/game/turfs/simulated/minerals.dm
+++ b/code/game/turfs/simulated/minerals.dm
@@ -355,12 +355,12 @@
 	spread = 0
 	scan_state = "rock_Bananium"
 
-// /turf/closed/mineral/calorit //GS13
-// 	mineralType = /obj/item/stack/ore/calorit
+// /turf/closed/mineral/calorite //GS13
+// 	mineralType = /obj/item/stack/ore/calorite
 // 	mineralAmt = 3
 // 	spreadChance = 1
 // 	spread = 0
-// 	scan_state = "rock_Calorit"
+// 	scan_state = "rock_calorite"
 
 /turf/closed/mineral/bscrystal
 	mineralType = /obj/item/stack/ore/bluespace_crystal
diff --git a/code/game/turfs/simulated/wall/mineral_walls.dm b/code/game/turfs/simulated/wall/mineral_walls.dm
index 1e994b01..4fa82191 100644
--- a/code/game/turfs/simulated/wall/mineral_walls.dm
+++ b/code/game/turfs/simulated/wall/mineral_walls.dm
@@ -42,6 +42,14 @@
 	sheet_type = /obj/item/stack/sheet/mineral/bananium
 	canSmoothWith = list(/turf/closed/wall/mineral/bananium, /obj/structure/falsewall/bananium)
 
+/turf/closed/wall/mineral/calorite //GS13
+	name = "calorite wall"
+	desc = "A wall with calorite plating. Burp."
+	icon = 'icons/turf/walls/calorite_wall.dmi'
+	icon_state = "calorite"
+	sheet_type = /obj/item/stack/sheet/mineral/calorite
+	canSmoothWith = list(/turf/closed/wall/mineral/calorite, /obj/structure/falsewall/calorite)
+
 /turf/closed/wall/mineral/sandstone
 	name = "sandstone wall"
 	desc = "A wall with sandstone plating. Rough."
diff --git a/code/modules/cargo/exports/large_objects.dm b/code/modules/cargo/exports/large_objects.dm
index fcee41b5..26e8f34b 100644
--- a/code/modules/cargo/exports/large_objects.dm
+++ b/code/modules/cargo/exports/large_objects.dm
@@ -274,6 +274,11 @@
 	unit_name = "Clown statue"
 	export_types = list(/obj/structure/statue/bananium/clown)
 
+/datum/export/large/fattystatue //GS13
+	cost = 2000
+	unit_name = "Fatty statue"
+	export_types = list(/obj/structure/statue/calorite/fatty)
+
 /datum/export/large/sandstatue
 	cost = 90 //Big cash
 	unit_name = "sandstone statue"
diff --git a/code/modules/integrated_electronics/subtypes/input.dm b/code/modules/integrated_electronics/subtypes/input.dm
index 46f8017b..06771251 100644
--- a/code/modules/integrated_electronics/subtypes/input.dm
+++ b/code/modules/integrated_electronics/subtypes/input.dm
@@ -1087,7 +1087,8 @@
 		"Solid Plasma"			= IC_PINTYPE_NUMBER,
 		"Uranium"				= IC_PINTYPE_NUMBER,
 		"Bananium"				= IC_PINTYPE_NUMBER,
-		"Titanium"		= IC_PINTYPE_NUMBER,
+		"Calorite"				= IC_PINTYPE_NUMBER,
+		"Titanium"				= IC_PINTYPE_NUMBER,
 		"Bluespace Mesh"		= IC_PINTYPE_NUMBER,
 		"Biomass"				= IC_PINTYPE_NUMBER,
 		)
@@ -1098,7 +1099,7 @@
 		)
 	spawn_flags = IC_SPAWN_RESEARCH
 	power_draw_per_use = 40
-	var/list/mtypes = list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE, MAT_BIOMASS)
+	var/list/mtypes = list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_CALORITE, MAT_TITANIUM, MAT_BLUESPACE, MAT_BIOMASS)
 
 
 /obj/item/integrated_circuit/input/matscan/do_work()
@@ -1340,4 +1341,4 @@
 	set_pin_data(IC_OUTPUT,	3, L.max_arousal)
 	set_pin_data(IC_OUTPUT,	4, L.canbearoused)
 	push_data()
-	activate_pin(2)
\ No newline at end of file
+	activate_pin(2)
diff --git a/code/modules/integrated_electronics/subtypes/manipulation.dm b/code/modules/integrated_electronics/subtypes/manipulation.dm
index 12f5791c..148ceaaf 100644
--- a/code/modules/integrated_electronics/subtypes/manipulation.dm
+++ b/code/modules/integrated_electronics/subtypes/manipulation.dm
@@ -372,6 +372,7 @@
 		"Solid Plasma"			= IC_PINTYPE_NUMBER,
 		"Bluespace Mesh"		= IC_PINTYPE_NUMBER,
 		"Bananium"				= IC_PINTYPE_NUMBER,
+		"Calorite"				= IC_PINTYPE_NUMBER,
 		"Titanium"				= IC_PINTYPE_NUMBER,
 		)
 	outputs = list(
@@ -386,6 +387,7 @@
 		"Solid Plasma"			= IC_PINTYPE_NUMBER,
 		"Bluespace Mesh"		= IC_PINTYPE_NUMBER,
 		"Bananium"				= IC_PINTYPE_NUMBER,
+		"Calorite"				= IC_PINTYPE_NUMBER,
 		"Titanium"				= IC_PINTYPE_NUMBER
 		)
 	activators = list(
@@ -400,11 +402,11 @@
 	power_draw_per_use = 40
 	ext_cooldown = 1
 	cooldown_per_use = 10
-	var/list/mtypes = list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE)
+	var/list/mtypes = list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_CALORITE MAT_TITANIUM, MAT_BLUESPACE)
 
 /obj/item/integrated_circuit/manipulation/matman/Initialize()
 	var/datum/component/material_container/materials = AddComponent(/datum/component/material_container,
-	list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE), 0,
+	list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_CALORITE, MAT_TITANIUM, MAT_BLUESPACE), 0,
 	FALSE, /obj/item/stack, CALLBACK(src, .proc/is_insertion_ready), CALLBACK(src, .proc/AfterMaterialInsert))
 	materials.max_amount =100000
 	materials.precise_insertion = TRUE
diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm
index f5150b47..ca11771b 100644
--- a/code/modules/mining/machine_processing.dm
+++ b/code/modules/mining/machine_processing.dm
@@ -82,7 +82,7 @@
 /obj/machinery/mineral/processing_unit/Initialize()
 	. = ..()
 	proximity_monitor = new(src, 1)
-	AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE), INFINITY, TRUE, /obj/item/stack)
+	AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_CALORITE, MAT_TITANIUM, MAT_BLUESPACE), INFINITY, TRUE, /obj/item/stack)
 	stored_research = new /datum/techweb/specialized/autounlocking/smelter
 
 /obj/machinery/mineral/processing_unit/Destroy()
diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm
index 34262af1..4e6f7ba5 100644
--- a/code/modules/mining/machine_redemption.dm
+++ b/code/modules/mining/machine_redemption.dm
@@ -17,7 +17,7 @@
 	var/ore_pickup_rate = 15
 	var/sheet_per_ore = 1
 	var/point_upgrade = 1
-	var/list/ore_values = list(MAT_GLASS = 1, MAT_METAL = 1, MAT_PLASMA = 15, MAT_SILVER = 16, MAT_GOLD = 18, MAT_TITANIUM = 30, MAT_URANIUM = 30, MAT_DIAMOND = 50, MAT_BLUESPACE = 50, MAT_BANANIUM = 60)
+	var/list/ore_values = list(MAT_GLASS = 1, MAT_METAL = 1, MAT_PLASMA = 15, MAT_SILVER = 16, MAT_GOLD = 18, MAT_TITANIUM = 30, MAT_URANIUM = 30, MAT_DIAMOND = 50, MAT_BLUESPACE = 50, MAT_BANANIUM = 60, MAT_CALORITE = 40)
 	var/message_sent = FALSE
 	var/list/ore_buffer = list()
 	var/datum/techweb/stored_research
diff --git a/code/modules/mining/machine_silo.dm b/code/modules/mining/machine_silo.dm
index 246106be..2f118d55 100644
--- a/code/modules/mining/machine_silo.dm
+++ b/code/modules/mining/machine_silo.dm
@@ -16,7 +16,7 @@ GLOBAL_LIST_EMPTY(silo_access_logs)
 /obj/machinery/ore_silo/Initialize(mapload)
 	. = ..()
 	AddComponent(/datum/component/material_container,
-		list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE, MAT_PLASTIC),
+		list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_CALORITE, MAT_TITANIUM, MAT_BLUESPACE, MAT_PLASTIC),
 		INFINITY,
 		FALSE,
 		/obj/item/stack,
diff --git a/code/modules/mining/minebot.dm b/code/modules/mining/minebot.dm
index 6fe6842c..0cf3ef95 100644
--- a/code/modules/mining/minebot.dm
+++ b/code/modules/mining/minebot.dm
@@ -30,7 +30,7 @@
 	speak_emote = list("states")
 	wanted_objects = list(/obj/item/stack/ore/diamond, /obj/item/stack/ore/gold, /obj/item/stack/ore/silver,
 						  /obj/item/stack/ore/plasma, /obj/item/stack/ore/uranium, /obj/item/stack/ore/iron,
-						  /obj/item/stack/ore/bananium, /obj/item/stack/ore/titanium)
+						  /obj/item/stack/ore/bananium, /obj/item/stack/ore/calorite, /obj/item/stack/ore/titanium)
 	healable = 0
 	loot = list(/obj/effect/decal/cleanable/robot_debris)
 	del_on_death = TRUE
diff --git a/code/modules/mining/mint.dm b/code/modules/mining/mint.dm
index f32afb28..1e34771f 100644
--- a/code/modules/mining/mint.dm
+++ b/code/modules/mining/mint.dm
@@ -15,7 +15,7 @@
 
 /obj/machinery/mineral/mint/Initialize()
 	. = ..()
-	AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_URANIUM, MAT_DIAMOND, MAT_BANANIUM), MINERAL_MATERIAL_AMOUNT * 50, FALSE, /obj/item/stack)
+	AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_URANIUM, MAT_DIAMOND, MAT_BANANIUM, MAT_CALORITE), MINERAL_MATERIAL_AMOUNT * 50, FALSE, /obj/item/stack)
 
 /obj/machinery/mineral/mint/process()
 	var/turf/T = get_step(src, input_dir)
diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm
index 67e1d769..831075da 100644
--- a/code/modules/mining/ores_coins.dm
+++ b/code/modules/mining/ores_coins.dm
@@ -179,6 +179,15 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 	materials = list(MAT_BANANIUM=MINERAL_MATERIAL_AMOUNT)
 	refined_type = /obj/item/stack/sheet/mineral/bananium
 
+/obj/item/stack/ore/calorite //GS13
+	name = "calorite ore"
+	icon_state = "Calorite ore"
+	item_state = "Calorite ore"
+	singular_name = "Calorite ore chunk"
+	points = 40
+	materials = list(MAT_CALORITE=MINERAL_MATERIAL_AMOUNT)
+	refined_type = /obj/item/stack/sheet/mineral/calorite
+
 /obj/item/stack/ore/titanium
 	name = "titanium ore"
 	icon_state = "Titanium ore"
diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi
index 333c593f..cc015289 100644
Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ