pushing

code/__DEFINES/atmospherics.dm

@@ -210,8 +210,6 @@
 #define KITCHEN_COLDROOM_ATMOS "o2=33;n2=124;TEMP=193.15"
 /// used in the holodeck burn test program
 #define BURNMIX_ATMOS "o2=2500;plasma=5000;TEMP=370"
-/// used in rockplanet
-#define ROCKPLANET_DEFAULT_ATMOS "co2=95;n2=3;TEMP=210.15"
 //ATMOSPHERICS DEPARTMENT GAS TANK TURFS
 #define ATMOS_TANK_N2O "n2o=6000;TEMP=293.15"
 #define ATMOS_TANK_CO2 "co2=50000;TEMP=293.15"
@@ -226,11 +224,16 @@
 //PLANETARY
 /// what pressure you have to be under to increase the effect of equipment meant for lavaland
 #define LAVALAND_EQUIPMENT_EFFECT_PRESSURE 90
-#define ICEMOON_DEFAULT_ATMOS "ICEMOON_ATMOS"
 #define GAS_GIANT_ATMOS "GAS_GIANT_ATMOS"
 #define PLASMA_GIANT_ATMOS "PLASMA_GIANT_ATMOS"
-#define WASTEPLANET_DEFAULT_ATMOS "WASTEPLANET_ATMOS"
+#define DEFAULT_ATMOS_DETECTOR "plasma=70000;TEMP=293.15"
 #define LAVALAND_DEFAULT_ATMOS "LAVALAND_ATMOS"
+#define ICEMOON_DEFAULT_ATMOS "ICEMOON_ATMOS"
+#define WASTEPLANET_DEFAULT_ATMOS "WASTEPLANET_ATMOS"
+#define ROCKPLANET_DEFAULT_ATMOS "ROCKPLANET_ATMOS"
+#define BEACHPLANET_DEFAULT_ATMOS "BEACHPLANET_ATMOS"
+#define JUNGLEPLANET_DEFAULT_ATMOS "JUNGLEPLANET_ATMOS"
+#define SANDPLANET_DEFAULT_ATMOS "SANDPLANET_ATMOS"
 
 
 //ATMOS MIX IDS

code/__DEFINES/species.dm

@@ -16,7 +16,7 @@
 /// This is the divisor which handles how much of the temperature difference between the current body temperature and 310.15K (optimal temperature) humans auto-regenerate each tick. The higher the number, the slower the recovery. This is applied each tick, so long as the mob is alive.
 #define HUMAN_BODYTEMP_AUTORECOVERY_DIVISOR 22
 /// Minimum amount of kelvin moved toward 310K per tick. So long as abs(310.15 - bodytemp) is more than 50.
-#define HUMAN_BODYTEMP_AUTORECOVERY_MINIMUM 6
+#define HUMAN_BODYTEMP_AUTORECOVERY_MINIMUM 12
 ///Similar to the HUMAN_BODYTEMP_AUTORECOVERY_DIVISOR, but this is the divisor which is applied at the stage that follows autorecovery. This is the divisor which comes into play when the human's loc temperature is lower than their body temperature. Make it lower to lose bodytemp faster.
 #define HUMAN_BODYTEMP_COLD_DIVISOR 20
 /// Similar to the HUMAN_BODYTEMP_AUTORECOVERY_DIVISOR, but this is the divisor which is applied at the stage that follows autorecovery. This is the divisor which comes into play when the human's loc temperature is higher than their body temperature. Make it lower to gain bodytemp faster.

code/datums/atmosphere/planetary.dm

@@ -50,9 +50,138 @@
 	minimum_pressure = HAZARD_LOW_PRESSURE + 10
 	maximum_pressure = LAVALAND_EQUIPMENT_EFFECT_PRESSURE - 1
 
-	minimum_temp = 180
-	maximum_temp = 180
 
+	minimum_temp = 80 //fucking cold to
+	maximum_temp = 200 //still cold
+
+
+//wasteplanet
+
+/datum/atmosphere/wasteplanet
+	id = WASTEPLANET_DEFAULT_ATMOS
+
+
+	base_gases = list(
+		GAS_O2=7,
+		GAS_N2=10,
+	)
+	normal_gases = list(
+		GAS_O2=7,
+		GAS_O2=3,
+		GAS_N2=5,
+		GAS_N2=2
+	)
+	restricted_gases = list(
+		GAS_H2O=1,
+	)
+	restricted_chance = 10
+
+	minimum_pressure = ONE_ATMOSPHERE - 30
+	maximum_pressure = ONE_ATMOSPHERE + 100
+
+	minimum_temp = T20C + 1
+	maximum_temp = T20C + 80
+
+//sandplanet
+/datum/atmosphere/whitesands
+	id = SANDPLANET_DEFAULT_ATMOS
+
+	base_gases = list(
+		GAS_O2=5,
+		GAS_N2=10,
+	)
+	normal_gases = list(
+		GAS_O2=10,
+		GAS_N2=10,
+		GAS_CO2=10,
+	)
+	restricted_gases = list(
+		GAS_PLASMA=0.1,
+		GAS_H2O=0.1,
+	)
+	restricted_chance = 50
+
+	minimum_pressure = HAZARD_LOW_PRESSURE + 10
+	maximum_pressure = LAVALAND_EQUIPMENT_EFFECT_PRESSURE - 1
+
+	minimum_temp = 120
+	maximum_temp = 210 //No longer always 180
+
+//Jungleplanet
+
+/datum/atmosphere/jungleplanet
+	id = JUNGLEPLANET_DEFAULT_ATMOS
+
+	base_gases = list(
+		GAS_O2=15,
+		GAS_N2=60,
+		GAS_CO2=1,
+	)
+	normal_gases = list(
+		GAS_O2=1,
+		GAS_N2=4,
+		GAS_H2O=2,
+	)
+	restricted_gases = list(
+		GAS_CO2=0.1,
+	)
+	restricted_chance = 0
+
+	minimum_pressure = 101.3
+	maximum_pressure = 135.7 //Nonsense values
+
+	minimum_temp = T20C + 10
+	maximum_temp = T20C + 40
+
+//welcome to the beach
+
+/datum/atmosphere/beach
+	id = BEACHPLANET_DEFAULT_ATMOS
+
+	base_gases = list(
+		GAS_O2=10,
+		GAS_N2=40,
+	)
+	normal_gases = list(
+		GAS_O2=1,
+		GAS_N2=4,
+	)
+	restricted_gases = list(
+		GAS_PLASMA=0.1,
+	)
+	restricted_chance = 0
+
+	minimum_pressure = 101.3
+	maximum_pressure = 135.7
+
+	minimum_temp = T20C - 10
+	maximum_temp = T20C + 10
+
+//rockplanets have lots of CO2 and are moderately cold.
+/datum/atmosphere/rockplanet
+
+	id = ROCKPLANET_DEFAULT_ATMOS
+
+	base_gases = list(
+		GAS_CO2=5,
+		GAS_N2=1,
+	)
+	normal_gases = list(
+		GAS_CO2=3,
+		GAS_N2=1,
+	)
+	restricted_gases = list(
+		GAS_PLASMA=0.1,
+	)
+	restricted_chance = 0
+
+	minimum_pressure = 101.3
+	maximum_pressure = 135.7
+
+	minimum_temp = 200
+	maximum_temp = 230
+
+// gas giants
 /datum/atmosphere/gas_giant
 	id = GAS_GIANT_ATMOS
 
@@ -92,28 +221,3 @@
 		GAS_PLASMA=0.1,
 	)
 	restricted_chance = 1
-
-/datum/atmosphere/wasteplanet
-	id = WASTEPLANET_DEFAULT_ATMOS
-
-
-	base_gases = list(
-		GAS_O2=7,
-		GAS_N2=10,
-	)
-	normal_gases = list(
-		GAS_O2=7,
-		GAS_O2=3,
-		GAS_N2=5,
-		GAS_N2=2
-	)
-	restricted_gases = list(
-		GAS_H2O=1,
-	)
-	restricted_chance = 10
-
-	minimum_pressure = ONE_ATMOSPHERE - 30
-	maximum_pressure = ONE_ATMOSPHERE + 100
-
-	minimum_temp = T20C + 1
-	maximum_temp = T20C + 80

code/datums/mapgen/Whitesandsatmos.dm

@@ -1,28 +1,3 @@
 #define WHITESANDS_WALL_ENV "rock"
 #define WHITESANDS_SAND_ENV "sand"
 #define WHITESANDS_DRIED_ENV "dried_up"
-#define WHITESANDS_ATMOS "ws_atmos"
-
-/datum/atmosphere/whitesands
-	id = WHITESANDS_ATMOS
-
-	base_gases = list(
-		GAS_O2=5,
-		GAS_N2=10,
-	)
-	normal_gases = list(
-		GAS_O2=10,
-		GAS_N2=10,
-		GAS_CO2=10,
-	)
-	restricted_gases = list(
-		GAS_PLASMA=0.1,
-		GAS_H2O=0.1,
-	)
-	restricted_chance = 50
-
-	minimum_pressure = HAZARD_LOW_PRESSURE + 10
-	maximum_pressure = LAVALAND_EQUIPMENT_EFFECT_PRESSURE - 1
-
-	minimum_temp = 180
-	maximum_temp = 180

code/game/turfs/closed/minerals.dm

@@ -673,7 +673,7 @@
 	environment_type = WHITESANDS_WALL_ENV
 	turf_type = /turf/open/floor/plating/asteroid/whitesands
 	baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried
-	initial_gas_mix = WHITESANDS_ATMOS
+	initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
 	defer_change = TRUE
 	has_borders = TRUE
 
@@ -683,7 +683,7 @@
 	environment_type = WHITESANDS_WALL_ENV
 	turf_type = /turf/open/floor/plating/asteroid/whitesands
 	baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried
-	initial_gas_mix = WHITESANDS_ATMOS
+	initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
 	defer_change = TRUE
 	has_borders = TRUE
 
@@ -693,7 +693,7 @@
 	environment_type = WHITESANDS_WALL_ENV
 	turf_type = /turf/open/floor/plating/asteroid/whitesands
 	baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried
-	initial_gas_mix = WHITESANDS_ATMOS
+	initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
 	defer_change = TRUE
 	has_borders = TRUE
 
@@ -703,7 +703,7 @@
 	environment_type = WHITESANDS_WALL_ENV
 	turf_type = /turf/open/floor/plating/asteroid/whitesands
 	baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried
-	initial_gas_mix = WHITESANDS_ATMOS
+	initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
 	defer_change = TRUE
 	has_borders = TRUE
 
@@ -713,7 +713,7 @@
 	environment_type = WHITESANDS_WALL_ENV
 	turf_type = /turf/open/floor/plating/asteroid/whitesands
 	baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried
-	initial_gas_mix = WHITESANDS_ATMOS
+	initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
 	defer_change = TRUE
 	has_borders = TRUE
 
@@ -723,7 +723,7 @@
 	environment_type = WHITESANDS_WALL_ENV
 	turf_type = /turf/open/floor/plating/asteroid/whitesands
 	baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried
-	initial_gas_mix = WHITESANDS_ATMOS
+	initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
 	defer_change = TRUE
 	has_borders = TRUE
 
@@ -739,7 +739,7 @@
 	mineralSpawnChanceList = list(/obj/item/stack/ore/uranium = 5, /obj/item/stack/ore/diamond = 3, /obj/item/stack/ore/gold = 10,
 		/obj/item/stack/ore/silver = 10, /obj/item/stack/ore/plasma = 15, /obj/item/stack/ore/iron = 45, /obj/item/stack/ore/titanium = 11,
 		/turf/closed/mineral/gibtonite/whitesands = 4, /turf/open/floor/plating/asteroid/whitesands = 2, /obj/item/stack/ore/bluespace_crystal = 4)
-	initial_gas_mix = WHITESANDS_ATMOS
+	initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
 	defer_change = TRUE
 	has_borders = TRUE
 
@@ -750,7 +750,7 @@
 	environment_type = WHITESANDS_WALL_ENV
 	turf_type = /turf/open/floor/plating/asteroid/whitesands
 	baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried
-	initial_gas_mix = WHITESANDS_ATMOS
+	initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
 	defer_change = TRUE
 	has_borders = TRUE
 
@@ -760,7 +760,7 @@
 	environment_type = WHITESANDS_WALL_ENV
 	turf_type = /turf/open/floor/plating/asteroid/whitesands
 	baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried
-	initial_gas_mix = WHITESANDS_ATMOS
+	initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
 	defer_change = TRUE
 	has_borders = TRUE
 
@@ -770,7 +770,7 @@
 	environment_type = WHITESANDS_WALL_ENV
 	turf_type = /turf/open/floor/plating/asteroid/whitesands
 	baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried
-	initial_gas_mix = WHITESANDS_ATMOS
+	initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
 	defer_change = TRUE
 	has_borders = TRUE
 

code/game/turfs/open/acid.dm

@@ -145,4 +145,4 @@
 
 /turf/open/water/acid/whitesands
 	planetary_atmos = TRUE
-	initial_gas_mix = WHITESANDS_ATMOS
+	initial_gas_mix = SANDPLANET_DEFAULT_ATMOS

code/game/turfs/open/floor/plating/beach.dm

@@ -4,7 +4,7 @@
 	icon_state = "sand"
 	base_icon_state = "sand"
 	baseturfs = /turf/open/floor/plating/asteroid/sand
-	initial_gas_mix = OPENTURF_DEFAULT_ATMOS //custom atmos? lots of oxygen, hot?
+	initial_gas_mix = BEACHPLANET_DEFAULT_ATMOS //custom atmos? lots of oxygen, hot?
 	digResult = /obj/item/stack/ore/glass
 	planetary_atmos = TRUE
 	digResult = /obj/item/stack/ore/glass/beach

code/game/turfs/open/floor/plating/icemoon.dm

@@ -94,7 +94,7 @@
 
 /turf/open/floor/plating/asteroid/snow/lit/whitesands
 	baseturfs = /turf/open/floor/plating/asteroid/whitesands/lit
-	initial_gas_mix = WHITESANDS_ATMOS
+	initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
 
 /turf/open/floor/plating/asteroid/snow/lit/rockplanet
 	baseturfs = /turf/open/floor/plating/asteroid/rockplanet/lit

code/game/turfs/open/floor/plating/planet.dm

@@ -23,7 +23,7 @@
 /turf/open/floor/plating/dirt/jungle
 	slowdown = 0.5
 	baseturfs = /turf/open/floor/plating/dirt/jungle
-	initial_gas_mix = OPENTURF_DEFAULT_ATMOS
+	initial_gas_mix = JUNGLEPLANET_DEFAULT_ATMOS
 
 /turf/open/floor/plating/dirt/jungle/lit
 	baseturfs = /turf/open/floor/plating/dirt/jungle/lit

code/game/turfs/open/floor/plating/whitesands.dm

@@ -6,7 +6,7 @@
 	icon_plating = "sand"
 	planetary_atmos = TRUE
 	base_icon_state = WHITESANDS_SAND_ENV
-	initial_gas_mix = WHITESANDS_ATMOS //Fallback, and used to tell the AACs that this is the exterior
+	initial_gas_mix = SANDPLANET_DEFAULT_ATMOS //Fallback, and used to tell the AACs that this is the exterior
 	digResult = /obj/item/stack/ore/glass/whitesands
 
 /turf/open/floor/plating/asteroid/whitesands/lit
@@ -33,10 +33,10 @@
 	baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried/lit
 
 /turf/open/floor/plating/grass/whitesands
-	initial_gas_mix = WHITESANDS_ATMOS
+	initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
 
 /turf/open/floor/plating/asteroid/basalt/whitesands
-	initial_gas_mix = WHITESANDS_ATMOS
+	initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
 	planetary_atmos = TRUE
 	baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried
 	icon_state = "whitesands_basalt0"
@@ -55,7 +55,7 @@
 	base_icon_state = "grass"
 	baseturfs = /turf/open/floor/plating/asteroid/whitesands
 	turf_type = /turf/open/floor/plating/asteroid/whitesands/grass
-	initial_gas_mix = WHITESANDS_ATMOS
+	initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
 	planetary_atmos = TRUE
 	smoothing_flags = SMOOTH_BITMASK
 	smoothing_groups = list(SMOOTH_GROUP_TURF_OPEN, SMOOTH_GROUP_FLOOR_GRASS)