Merge branch 'origin/HEAD'

code/game/gamemodes/dynamic/dynamic_rulesets_events.dm

@@ -112,13 +112,13 @@
 	required_enemies = list(3,3,2,2,2,1,1,1,1,0)
 	weight = 3
 	cost = 0
-	earliest_start = 50 MINUTES
+	earliest_start = 120 MINUTES
 	blocking_rules = list(/datum/dynamic_ruleset/roundstart/nuclear,/datum/dynamic_ruleset/midround/from_ghosts/nuclear)
 	requirements = list(101,30,25,20,20,20,15,10,10,10)
 	//property_weights = list("story_potential" = 1, "trust" = 1, "chaos" = 1)
 	high_population_requirement = 15
 	occurances_max = 1
-	chaos_min = 2.0
+	chaos_min = 3.0
 	map_blacklist = list("LayeniaStation.dmm")
 
 /datum/dynamic_ruleset/event/pirates/ready(forced = FALSE)
@@ -143,9 +143,9 @@
 	requirements = list(101,20,15,10,10,10,10,10,10,10)
 	high_population_requirement = 15
 	//property_weights = list("chaos" = 1, "valid" = 1)
-	earliest_start = 30 MINUTES //Skyrat change.
+	earliest_start = 40 MINUTES //Skyrat change.
 	occurances_max = 2
-	chaos_min = 1.5
+	chaos_min = 2.0
 
 //////////////////////////////////////////////
 //                                          //
@@ -162,9 +162,9 @@
 	cost = 5
 	requirements = list(101,20,15,10,10,10,10,10,10,10)
 	high_population_requirement = 15
-	earliest_start = 30 MINUTES
+	earliest_start = 60 MINUTES
 	occurances_max = 2
-	chaos_min = 2
+	chaos_min = 2.5
 
 //////////////////////////////////////////////
 //                                          //
@@ -186,7 +186,7 @@
 	repeatable = TRUE
 	//property_weights = list("chaos" = 1, "extended" = 2)
 	occurances_max = 2
-	chaos_min = 1.2
+	chaos_min = 1.5
 
 /datum/dynamic_ruleset/event/ventclog/ready()
 	if(mode.threat_level > 30 && mode.threat >= 5 && prob(20))
@@ -194,13 +194,13 @@
 		cost = 8
 		required_enemies = list(3,3,3,2,2,2,1,1,0,0)
 		typepath = /datum/round_event/vent_clog/threatening
-		chaos_min = 1.5
+		chaos_min = 1.7
 	else if(mode.threat_level > 15 && mode.threat > 15 && prob(30))
 		name = "Clogged Vents: Catastrophic"
 		cost = 15
 		required_enemies = list(4,4,4,3,3,3,2,1,1,1)
 		typepath = /datum/round_event/vent_clog/catastrophic
-		chaos_min = 1.8
+		chaos_min = 2.0
 	else
 		cost = 0
 		name = "Clogged Vents: Normal"
@@ -297,7 +297,7 @@
 	repeatable = TRUE
 	//property_weights = list("extended" = 1)
 	occurances_max = 2
-	chaos_min = 1.2
+	chaos_min = 1.5
 
 /datum/dynamic_ruleset/event/anomaly_flux
 	name = "Anomaly: Hyper-Energetic Flux"
@@ -314,7 +314,7 @@
 	repeatable = TRUE
 	//property_weights = list("extended" = 1)
 	occurances_max = 2
-	chaos_min = 1.0
+	chaos_min = 1.5
 
 /datum/dynamic_ruleset/event/anomaly_gravitational
 	name = "Anomaly: Gravitational"
@@ -345,7 +345,7 @@
 	repeatable = TRUE
 	//property_weights = list("extended" = 1)
 	occurances_max = 2
-	chaos_min = 1.5
+	chaos_min = 1.8
 
 /datum/dynamic_ruleset/event/anomaly_vortex
 	name = "Anomaly: Vortex"
@@ -362,7 +362,7 @@
 	repeatable = TRUE
 	//property_weights = list("extended" = 1)
 	occurances_max = 1
-	chaos_min = 1.5
+	chaos_min = 1.8
 
 //////////////////////////////////////////////
 //                                          //
@@ -376,10 +376,10 @@
 	typepath = /datum/round_event/ghost_role/operative
 	required_enemies = list(0,0,0,0,0,0,0,0,0,0)
 	weight = 0 //This is changed in nuclearbomb.dm
-	occurances_max = 0 //Turned off. For now.
+	occurances_max = 3
 	requirements = list(10,10,10,10,10,10,10,10,10,10) //SECURE THAT DISK
 	cost = 50
-	chaos_min = 3
+	chaos_min = 4
 	map_blacklist = list("LayeniaStation.dmm")
 
 /datum/dynamic_ruleset/event/operative/get_weight()
@@ -436,7 +436,7 @@
 	name = "Communications Blackout"
 	//config_tag = "communications_blackout"
 	typepath = /datum/round_event/communications_blackout
-	cost = 2
+	cost = 3
 	weight = 10
 	repeatable_weight_decrease = 2
 	enemy_roles = list("Chief Engineer","Station Engineer")
@@ -453,7 +453,7 @@
 	typepath = /datum/round_event/processor_overload
 	cost = 4
 	weight = 2
-	earliest_start = 30 MINUTES
+	earliest_start = 90 MINUTES
 	repeatable_weight_decrease = 3
 	enemy_roles = list("Chief Engineer","Station Engineer")
 	required_enemies = list(2,2,2,2,1,1,1,1,1,1)
@@ -462,7 +462,7 @@
 	repeatable = TRUE
 	//property_weights = list("extended" = 1, "chaos" = 1)
 	//always_max_weight = TRUE
-	occurances_max = 2
+	occurances_max = 1
 
 /datum/dynamic_ruleset/event/space_dust
 	name = "Minor Space Dust"
@@ -476,7 +476,7 @@
 	requirements = list(5,5,5,5,5,5,5,0,0,0)
 	high_population_requirement = 5
 	repeatable = TRUE
-	earliest_start = 0 MINUTES
+	earliest_start = 10 MINUTES
 	//property_weights = list("extended" = 1)
 	//always_max_weight = TRUE
 	occurances_max = 0
@@ -495,7 +495,7 @@
 	high_population_requirement = 10
 	repeatable = TRUE
 	//property_weights = list("extended" = 1)
-	occurances_max = 3
+	occurances_max = 2
 	map_blacklist = list("LayeniaStation.dmm")
 
 
@@ -512,34 +512,34 @@
 	repeatable = TRUE
 	occurances_max = 10
 
-/datum/dynamic_ruleset/event/heart_attack
-	name = "Random Heart Attack"
-	typepath = /datum/round_event/heart_attack
-	cost = 0
-	weight = 2
-	earliest_start = 30 MINUTES
-	repeatable_weight_decrease = 1
-	enemy_roles = list("Medical Doctor","Chief Medical Officer", "Chemist")
-	required_enemies = list(3,3,2,2,2,2,2,2,2,1)
-	requirements = list(101,101,101,10,5,5,5,5,5,5)
-	high_population_requirement = 5
-	repeatable = TRUE
-	occurances_max = 2
-	chaos_min = 1.0
+// /datum/dynamic_ruleset/event/heart_attack
+// 	name = "Random Heart Attack"
+// 	typepath = /datum/round_event/heart_attack
+// 	cost = 0
+// 	weight = 2
+// 	earliest_start = 30 MINUTES
+// 	repeatable_weight_decrease = 1
+// 	enemy_roles = list("Medical Doctor","Chief Medical Officer", "Chemist")
+// 	required_enemies = list(3,3,2,2,2,2,2,2,2,1)
+// 	requirements = list(101,101,101,10,5,5,5,5,5,5)
+// 	high_population_requirement = 5
+// 	repeatable = TRUE
+// 	occurances_max = 2
+// 	chaos_min = 1.0
 
-/datum/dynamic_ruleset/event/radiation_storm
-	name = "Radiation Storm"
-	//config_tag = "radiation_storm"
-	typepath = /datum/round_event/radiation_storm
-	cost = 6
-	weight = 1
-	repeatable_weight_decrease = 1
-	enemy_roles = list("Chemist","Chief Medical Officer","Geneticist","Medical Doctor")
-	required_enemies = list(2,2,2,2,1,1,1,1,1,0)
-	requirements = list(5,5,5,5,5,5,5,5,5,5)
-	high_population_requirement = 10
-	//property_weights = list("extended" = 1,"chaos" = 1)
-	occurances_max = 1
+// /datum/dynamic_ruleset/event/radiation_storm
+// 	name = "Radiation Storm"
+// 	//config_tag = "radiation_storm"
+// 	typepath = /datum/round_event/radiation_storm
+// 	cost = 6
+// 	weight = 0
+// 	repeatable_weight_decrease = 1
+// 	enemy_roles = list("Chemist","Chief Medical Officer","Geneticist","Medical Doctor")
+// 	required_enemies = list(2,2,2,2,1,1,1,1,1,0)
+// 	requirements = list(5,5,5,5,5,5,5,5,5,5)
+// 	high_population_requirement = 100
+// 	//property_weights = list("extended" = 1,"chaos" = 1)
+// 	occurances_max = 0
 
 
 /datum/dynamic_ruleset/event/portal_storm_syndicate
@@ -552,7 +552,7 @@
 	required_enemies = list(2,2,2,2,2,2,2,2,2,2)
 	requirements = list(101,101,40,35,30,30,30,30,25,20)
 	high_population_requirement =  30
-	earliest_start = 40 MINUTES
+	earliest_start = 120 MINUTES
 	//property_weights = list("teamwork" = 1,"chaos" = 1, "extended" = -1)
 	occurances_max = 1
 	chaos_min = 1.5
@@ -571,7 +571,7 @@
 	high_population_requirement =  5
 	//property_weights = list("extended" = 1)
 	occurances_max = 2
-	chaos_min = 1.0
+	chaos_min = 1.3
 	map_blacklist = list("LayeniaStation.dmm")
 
 /datum/dynamic_ruleset/event/swarmers
@@ -604,7 +604,7 @@
 	//property_weights = list("story_potential" = 1, "extended" = 1, "valid" = -2)
 	high_population_requirement = 5
 	occurances_max = 1
-	chaos_min = 2
+	chaos_min = 2.5
 
 /datum/dynamic_ruleset/event/revenant
 	name = "Revenant"
@@ -619,7 +619,7 @@
 	high_population_requirement = 15
 	//property_weights = list("story_potential" = -2, "extended" = -1)
 	occurances_max = 1 //Skyrat change.
-	chaos_min = 1.9
+	chaos_min = 2.5
 
 /datum/dynamic_ruleset/event/immovable_rod
 	name = "Immovable Rod"
@@ -633,7 +633,7 @@
 	occurances_max = 2
 	weight = 3
 	repeatable_weight_decrease = 2
-	chaos_min = 1.5
+	chaos_min = 2.5
 	var/atom/special_target
 	map_blacklist = list("LayeniaStation.dmm")
 
@@ -649,7 +649,7 @@
 	occurances_max = 2
 	weight = 3
 	repeatable_weight_decrease = 2
-	chaos_min = 1.5
+	chaos_min = 2.0
 	var/atom/special_target
 	map_whitelist = list("LayeniaStation.dmm")
 
@@ -686,7 +686,7 @@
 	high_population_requirement = 0
 	weight = 10
 	repeatable = TRUE
-	occurances_max = 3
+	occurances_max = 6
 
 /datum/dynamic_ruleset/event/bureaucratic_error
 	name = "Bureaucratic Error"
@@ -704,7 +704,7 @@
 	weight = 100
 	repeatable_weight_decrease = 1 //Slightly drop the weight each time it is called to keep the pool from getting too diluted as the round goes on.
 	repeatable = TRUE
-	occurances_max = 200 //Our rounds can go for a WHILE
+	occurances_max = 100 //Our rounds can go for a WHILE
 
 /datum/dynamic_ruleset/event/disease_outbreak
 	name = "Disease Outbreak"
@@ -792,7 +792,7 @@
 	weight = 5
 	repeatable_weight_decrease = 3
 	repeatable = TRUE
-	occurances_max = 2
+	occurances_max = 4
 
 /datum/dynamic_ruleset/event/spacevine
 	name = "Spacevine"

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_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()

code/game/objects/effects/contraband.dm

@@ -408,11 +408,6 @@
 	desc = "A poster advertising a movie about some masked men."
 	icon_state = "poster44"
 
-/obj/structure/sign/poster/contraband/corn_oil //GS13
-	name = "Corn Oil"
-	desc = "A strange poster advertising corn oil beverage. Who would want to drink that...?"
-	icon_state = "poster45"
-
 /obj/structure/sign/poster/official
 	poster_item_name = "motivational poster"
 	poster_item_desc = "An official Nanotrasen-issued poster to foster a compliant and obedient workforce. It comes with state-of-the-art adhesive backing, for easy pinning to any vertical surface."
@@ -429,11 +424,6 @@
 	desc = "A poster glorifying the station's security force."
 	icon_state = "poster1_legit"
 
-/obj/structure/sign/poster/official/gato_logo
-	name = "GATO Logo"
-	desc = "A poster of our glorious GATO Corp!"
-	icon_state = "poster2_legit"
-
 /obj/structure/sign/poster/official/cleanliness
 	name = "Cleanliness"
 	desc = "A poster warning of the dangers of poor hygiene."
@@ -621,7 +611,39 @@
 	desc = "A poster motivating you in reading books, reading this is already giving you a headache."
 	icon_state = "libraryposter"
 
+/obj/structure/sign/poster/official/gato_logo
+	name = "GATO Logo"
+	desc = "A poster of our glorious GATO Corp!"
+	icon_state = "poster2_legit"
 
+/obj/structure/sign/poster/contraband/corn_oil
+	name = "Corn Oil Poster"
+	desc = "A strange poster advertising corn oil beverage. Who would want to drink that...?"
+	icon_state = "poster45"
 
+/obj/structure/sign/poster/contraband/supermatter
+	name = "Supermatter Warning Poster"
+	desc = "In case it wasn't already obvious, you shouldn't poke this giant yellow crystal..."
+	icon_state = "poster46"
+
+/obj/structure/sign/poster/contraband/chonk
+	name = "CHONK POSTER"
+	desc = "Next time eat a salad."
+	icon_state = "poster47"
+
+/obj/structure/sign/poster/contraband/missingpizza
+	name = "Missing Pizza Poster"
+	desc = "On GS13, it isn't uncommon to lose your food whenever you look away..."
+	icon_state = "poster48"
+
+/obj/structure/sign/poster/contraband/chefpropaganda
+	name = "Chef Propaganda Poster"
+	desc = "Enlist and learn how to cook nothing else but burgers, pizza and bread TODAY!"
+	icon_state = "poster49"
+
+/obj/structure/sign/poster/contraband/malta
+	name = "Malta Poster"
+	desc = "A poster from terran sectors, suggesting non-existence of mythical country of Malta."
+	icon_state = "poster50"
 
 #undef PLACE_SPEED

code/game/objects/items/stacks/sheets/mineral.dm

@@ -278,6 +278,32 @@ GLOBAL_LIST_INIT(bananium_recipes, list ( \
 	recipes = GLOB.bananium_recipes
 	. = ..()
 
+
+/*
+ * calorite - GS13
+ */
+/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/calorite
+
+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/calorite/Initialize(mapload, new_amount, merge = TRUE)
+	recipes = GLOB.calorite_recipes
+	. = ..()
+
+
 /*
  * Titanium
  */
@@ -447,4 +473,4 @@ GLOBAL_LIST_INIT(abductor_recipes, list ( \
 	amount = 5
 
 /obj/item/stack/sheet/mineral/coal/ten
-	amount = 10
+	amount = 10

code/game/objects/items/stacks/tiles/tile_mineral.dm

@@ -52,6 +52,30 @@
 	mineralType = "bananium"
 	materials = list(MAT_BANANIUM=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/calorite/hide  //GS13 - disguised variant
+	name = "Floor tile"
+	singular_name = "calorite floor tile"
+	desc = "A tile totally made out of steel."
+	icon_state = "tile"
+	turf_type = /turf/open/floor/mineral/calorite/hide
+
+/obj/item/stack/tile/mineral/calorite/strong  //GS13 - strong variant
+	name = "Infused calorite tile"
+	singular_name = "Infused calorite floor tile"
+	desc = "A tile made out of stronger variant of calorite. Bwuurp."
+	icon_state = "tile_calorite_strong"
+	turf_type = /turf/open/floor/mineral/calorite/strong
+
+
 /obj/item/stack/tile/mineral/abductor
 	name = "alien floor tile"
 	singular_name = "alien floor tile"
@@ -104,4 +128,4 @@
 	icon_state = "tile_basaltstone"
 	turf_type = /turf/open/floor/mineral/basaltstone_floor
 	mineralType = "sandstone"
-	materials = list(MAT_SANDSTONE=500)
+	materials = list(MAT_SANDSTONE=500)

code/game/objects/items/stacks/tiles/tile_types.dm

@@ -177,6 +177,11 @@
 	turf_type = /turf/open/floor/carpet/monochrome
 	tableVariant = /obj/structure/table/wood/fancy/monochrome
 
+/obj/item/stack/tile/carpet/gato //GS13
+	name = "gato-themed carpet"
+	icon_state = "tile-carpet-gato"
+	turf_type = /turf/open/floor/carpet/gato
+
 /obj/item/stack/tile/carpet/fifty
 	amount = 50
 
@@ -213,6 +218,9 @@
 /obj/item/stack/tile/carpet/royalblue/fifty
 	amount = 50
 
+/obj/item/stack/tile/carpet/gato/fifty
+	amount = 50
+
 /obj/item/stack/tile/fakespace
 	name = "astral carpet"
 	singular_name = "astral carpet"

code/game/objects/structures/crates_lockers/closets/syndicate.dm

@@ -104,6 +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/calorite,
 	/obj/item/stack/sheet/plasteel,
 	/obj/item/stack/sheet/mineral/titanium,
 	/obj/item/stack/sheet/mineral/plastitanium,

code/game/objects/structures/door_assembly_types.dm

@@ -216,6 +216,15 @@
 	mineral = "bananium"
 	glass_type = /obj/machinery/door/airlock/bananium/glass
 
+// /obj/structure/door_assembly/door_assembly_calorite //GS13
+// 	name = "calorite airlock assembly"
+// 	desc = "Very inviting."
+// 	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"
 	icon = 'icons/obj/doors/airlocks/station/sandstone.dmi'

code/game/objects/structures/false_walls.dm

@@ -263,6 +263,43 @@
 	walltype = /turf/closed/wall/mineral/bananium
 	canSmoothWith = list(/obj/structure/falsewall/bananium, /turf/closed/wall/mineral/bananium)
 
+/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)
+	var/active = null
+	var/last_event = 0
+
+/obj/structure/falsewall/calorite/proc/fatten()
+	if(!active)
+		if(world.time > last_event+15)
+			active = 1
+			for(var/mob/living/carbon/human/M in orange(3,src))
+				if(HAS_TRAIT(M, TRAIT_LIPOIFIER_IMMUNE))
+					return
+				else
+					M.fatness = M.fatness + 50
+			last_event = world.time
+			active = null
+			return
+	return
+
+/obj/structure/falsewall/calorite/Bumped(atom/movable/AM)
+	fatten()
+	..()
+
+/obj/structure/falsewall/calorite/attackby(obj/item/W, mob/user, params)
+	fatten()
+	return ..()
+
+/obj/structure/falsewall/calorite/attack_hand(mob/user)
+	fatten()
+	. = ..()
+
 
 /obj/structure/falsewall/sandstone
 	name = "sandstone wall"

code/game/objects/structures/statues.dm

@@ -318,3 +318,98 @@
 	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"
+	var/active = null
+	var/last_event = 0
+
+/obj/structure/statue/calorite/fatty/proc/beacon()
+	if(!active)
+		if(world.time > last_event+15)
+			active = 1
+			for(var/mob/living/carbon/human/M in orange(3,src))
+				to_chat(M, "<span class='warning'>You feel the statue calling to you, urging you to touch it...</span>")
+			last_event = world.time
+			active = null
+			return
+	return
+
+/obj/structure/statue/calorite/fatty/Bumped(atom/movable/AM)
+	beacon()
+	..()
+
+/obj/structure/statue/calorite/fatty/Crossed(var/mob/AM)
+	.=..()
+	if(!.)
+		if(istype(AM))
+			beacon()
+
+/obj/structure/statue/calorite/fatty/Moved(atom/movable/AM)
+	beacon()
+	..()
+
+/obj/structure/statue/calorite/fatty/attackby(obj/item/W, mob/living/carbon/M, params)
+
+	if(HAS_TRAIT(M, TRAIT_LIPOIFIER_IMMUNE))
+		to_chat(M, "<span class='warning'>Nothing happens.</span>")
+	else
+		M.fatness = M.fatness + 20
+		if(M.fatness < 200)
+			to_chat(M, "<span class='warning'>The moment your hand meets the statue, you feel a little warmer...</span>")
+		if(HAS_TRAIT(M, TRAIT_FAT))
+			to_chat(M, "<span class='warning'>Upon each poke of the statue, you feel yourself get a little heavier.</span>")
+		if(HAS_TRAIT(M, TRAIT_OBESE))
+			to_chat(M, "<span class='warning'>With each touch you keep getting fatter... But the fatter you grow, the more enticed you feel to poke the statue.</span>")
+		if(HAS_TRAIT(M, TRAIT_MORBIDLYOBESE))
+			to_chat(M, "<span class='warning'>The world around you blurs as you focus on prodding the statue, your waistline widening further...</span>")
+		if(HAS_TRAIT(M, TRAIT_IMMOBILE))
+			to_chat(M, "<span class='warning'>A whispering voice gently compliments your massive body, your own mind begging to touch the statue more.</span>")
+		if(HAS_TRAIT(M, TRAIT_BLOB))
+			to_chat(M, "<span class='warning'>You can barely reach the statue past your floor-covering stomach! And yet, it still calls to you...</span>")
+	
+/obj/structure/statue/calorite/fatty/attack_hand(mob/living/carbon/M)
+	if(HAS_TRAIT(M, TRAIT_LIPOIFIER_IMMUNE))
+		to_chat(M, "<span class='warning'>Nothing happens.</span>")
+	else
+		M.fatness = M.fatness + 20
+		if(M.fatness < 200)
+			to_chat(M, "<span class='warning'>The moment your hand meets the statue, you feel a little warmer...</span>")
+		if(HAS_TRAIT(M, TRAIT_FAT))
+			to_chat(M, "<span class='warning'>Upon each poke of the statue, you feel yourself get a little heavier.</span>")
+		if(HAS_TRAIT(M, TRAIT_OBESE))
+			to_chat(M, "<span class='warning'>With each touch you keep getting fatter... But the fatter you grow, the more enticed you feel to poke the statue.</span>")
+		if(HAS_TRAIT(M, TRAIT_MORBIDLYOBESE))
+			to_chat(M, "<span class='warning'>The world around you blurs as you focus on prodding the statue, your waistline widening further...</span>")
+		if(HAS_TRAIT(M, TRAIT_IMMOBILE))
+			to_chat(M, "<span class='warning'>A whispering voice gently compliments your massive body, your own mind begging to touch the statue more.</span>")
+		if(HAS_TRAIT(M, TRAIT_BLOB))
+			to_chat(M, "<span class='warning'>You can barely reach the statue past your floor-covering stomach! And yet, it still calls to you...</span>")
+	
+/obj/structure/statue/calorite/fatty/attack_paw(mob/living/carbon/M)
+	if(HAS_TRAIT(M, TRAIT_LIPOIFIER_IMMUNE))
+		to_chat(M, "<span class='warning'>Nothing happens.</span>")
+	else
+		M.fatness = M.fatness + 20
+		if(M.fatness < 200)
+			to_chat(M, "<span class='warning'>The moment your hand meets the statue, you feel a little warmer...</span>")
+		if(HAS_TRAIT(M, TRAIT_FAT))
+			to_chat(M, "<span class='warning'>Upon each poke of the statue, you feel yourself get a little heavier.</span>")
+		if(HAS_TRAIT(M, TRAIT_OBESE))
+			to_chat(M, "<span class='warning'>With each touch you keep getting fatter... But the fatter you grow, the more enticed you feel to poke the statue.</span>")
+		if(HAS_TRAIT(M, TRAIT_MORBIDLYOBESE))
+			to_chat(M, "<span class='warning'>The world around you blurs as you focus on prodding the statue, your waistline widening further...</span>")
+		if(HAS_TRAIT(M, TRAIT_IMMOBILE))
+			to_chat(M, "<span class='warning'>A whispering voice gently compliments your massive body, your own mind begging to touch the statue more.</span>")
+		if(HAS_TRAIT(M, TRAIT_BLOB))
+			to_chat(M, "<span class='warning'>You can barely reach the statue past your floor-covering stomach! And yet, it still calls to you...</span>")
+	

code/game/turfs/simulated/floor/fancy_floor.dm

@@ -302,6 +302,11 @@
 	floor_tile = /obj/item/stack/tile/carpet/royalblue
 	canSmoothWith = list(/turf/open/floor/carpet/royalblue)
 
+/turf/open/floor/carpet/gato //GS13
+	icon = 'icons/turf/floors/carpet_gato.dmi'
+	floor_tile = /obj/item/stack/tile/carpet/gato
+	canSmoothWith = list(/turf/open/floor/carpet/gato)
+
 /turf/open/floor/carpet/narsie_act(force, ignore_mobs, probability = 20)
 	. = (prob(probability) || force)
 	for(var/I in src)

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
@@ -203,6 +204,41 @@
 /turf/open/floor/mineral/bananium/airless
 	initial_gas_mix = AIRLESS_ATMOS
 
+
+//calorite floor - GS13
+
+/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
+	///How much fatness is added to the user upon crossing?
+	var/fat_to_add = 50
+
+/turf/open/floor/mineral/calorite/Entered(mob/living/carbon/M)
+	if(!istype(M, /mob/living/carbon) || HAS_TRAIT(M, TRAIT_LIPOIFIER_IMMUNE))
+		return FALSE
+	else
+		M.fatness = M.fatness + fat_to_add 
+
+// 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")
+
+// 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")
+
 //DIAMOND
 
 /turf/open/floor/mineral/diamond
@@ -290,4 +326,4 @@
 	name = "basalt floor"
 	icon_state = "basaltstone"
 	floor_tile = /obj/item/stack/tile/mineral/basaltstone
-	icons = list("basaltstone","basaltstone_dam")
+	icons = list("basaltstone","basaltstone_dam")

code/game/turfs/simulated/minerals.dm

@@ -133,7 +133,7 @@
 /turf/closed/mineral/random
 	var/list/mineralSpawnChanceList = list(/turf/closed/mineral/uranium = 5, /turf/closed/mineral/diamond = 1, /turf/closed/mineral/gold = 10,
 		/turf/closed/mineral/silver = 12, /turf/closed/mineral/plasma = 20, /turf/closed/mineral/iron = 40, /turf/closed/mineral/titanium = 11,
-		/turf/closed/mineral/gibtonite = 4, /turf/open/floor/plating/asteroid/airless/cave = 2, /turf/closed/mineral/bscrystal = 1)
+		/turf/closed/mineral/gibtonite = 4, /turf/open/floor/plating/asteroid/airless/cave = 2, /turf/closed/mineral/bscrystal = 1, /turf/closed/mineral/calorite = 1)
 		//Currently, Adamantine won't spawn as it has no uses. -Durandan
 	var/mineralChance = 13
 	var/display_icon_state = "rock"
@@ -163,7 +163,7 @@
 	icon_state = "rock_highchance"
 	mineralChance = 25
 	mineralSpawnChanceList = list(
-		/turf/closed/mineral/uranium = 35, /turf/closed/mineral/diamond = 30, /turf/closed/mineral/gold = 45, /turf/closed/mineral/titanium = 45,
+		/turf/closed/mineral/uranium = 35, /turf/closed/mineral/diamond = 30, /turf/closed/mineral/calorite = 30, /turf/closed/mineral/gold = 45, /turf/closed/mineral/titanium = 45,
 		/turf/closed/mineral/silver = 50, /turf/closed/mineral/plasma = 50, /turf/closed/mineral/bscrystal = 20)
 
 /turf/closed/mineral/random/high_chance/volcanic
@@ -184,7 +184,7 @@
 	mineralSpawnChanceList = list(
 		/turf/closed/mineral/uranium = 2, /turf/closed/mineral/diamond = 1, /turf/closed/mineral/gold = 4, /turf/closed/mineral/titanium = 4,
 		/turf/closed/mineral/silver = 6, /turf/closed/mineral/plasma = 15, /turf/closed/mineral/iron = 40,
-		/turf/closed/mineral/gibtonite = 2, /turf/closed/mineral/bscrystal = 1)
+		/turf/closed/mineral/gibtonite = 2, /turf/closed/mineral/bscrystal = 1, /turf/closed/mineral/calorite = 1)
 
 
 /turf/closed/mineral/random/volcanic
@@ -198,7 +198,7 @@
 	mineralSpawnChanceList = list(
 		/turf/closed/mineral/uranium/volcanic = 5, /turf/closed/mineral/diamond/volcanic = 1, /turf/closed/mineral/gold/volcanic = 10, /turf/closed/mineral/titanium/volcanic = 11,
 		/turf/closed/mineral/silver/volcanic = 12, /turf/closed/mineral/plasma/volcanic = 20, /turf/closed/mineral/iron/volcanic = 40,
-		/turf/closed/mineral/gibtonite/volcanic = 4, /turf/open/floor/plating/asteroid/airless/cave/volcanic = 1, /turf/closed/mineral/bscrystal/volcanic = 1)
+		/turf/closed/mineral/gibtonite/volcanic = 4, /turf/open/floor/plating/asteroid/airless/cave/volcanic = 1, /turf/closed/mineral/bscrystal/volcanic = 1, /turf/closed/mineral/calorite = 1)
 
 
 /turf/closed/mineral/random/labormineral
@@ -355,6 +355,12 @@
 	spread = 0
 	scan_state = "rock_Bananium"
 
+/turf/closed/mineral/calorite //GS13
+	mineralType = /obj/item/stack/ore/calorite
+	mineralAmt = 3
+	spreadChance = 1
+	spread = 0
+	scan_state = "rock_Calorite"
 
 /turf/closed/mineral/bscrystal
 	mineralType = /obj/item/stack/ore/bluespace_crystal

code/game/turfs/simulated/wall/mineral_walls.dm

@@ -42,6 +42,42 @@
 	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/calorite/proc/fatten()
+	if(!active)
+		if(world.time > last_event+15)
+			active = 1
+			for(var/mob/living/carbon/human/M in orange(3,src))
+				if(HAS_TRAIT(M, TRAIT_LIPOIFIER_IMMUNE))
+					return
+				else
+					M.fatness = M.fatness + 50
+			last_event = world.time
+			active = null
+			return
+	return
+
+/turf/closed/wall/mineral/calorite/Bumped(atom/movable/AM)
+	fatten()
+	..()
+
+/turf/closed/wall/mineral/calorite/attackby(obj/item/W, mob/user, params)
+	fatten()
+	return ..()
+
+/turf/closed/wall/mineral/calorite/attack_hand(mob/user)
+	fatten()
+	. = ..()
+
+
+
 /turf/closed/wall/mineral/sandstone
 	name = "sandstone wall"
 	desc = "A wall with sandstone plating. Rough."