From ecabb8f7e64cfd65a546b55b6858159326b211d2 Mon Sep 17 00:00:00 2001 From: larentoun <31931237+larentoun@users.noreply.github.com> Date: Fri, 17 May 2024 15:57:45 +0300 Subject: [PATCH] Fix planetary_atmos working correctly only for lavaland + use defines for lavaland atmos (#25296) * planetary atmos is not only lavaland * use defines for lavaland temperature * use defines for lavaland air * temperature is initial --- code/__DEFINES/atmospherics_defines.dm | 3 + .../turfs/simulated/floor/asteroid_floors.dm | 18 ++-- code/game/turfs/simulated/floor/chasm.dm | 6 +- .../game/turfs/simulated/floor/fancy_floor.dm | 8 +- .../turfs/simulated/floor/indestructible.dm | 18 ++-- code/game/turfs/simulated/floor/lava.dm | 12 +-- .../turfs/simulated/floor/mineral_floors.dm | 6 +- code/game/turfs/simulated/floor/misc_floor.dm | 18 ++-- code/game/turfs/simulated/floor/plating.dm | 12 +-- code/game/turfs/simulated/minerals.dm | 90 +++++++++---------- .../environmental/LINDA_turf_tile.dm | 6 +- .../awaymissions/mission_code/beach.dm | 6 +- 12 files changed, 101 insertions(+), 102 deletions(-) diff --git a/code/__DEFINES/atmospherics_defines.dm b/code/__DEFINES/atmospherics_defines.dm index fa2355a729f..a9e2c82b71e 100644 --- a/code/__DEFINES/atmospherics_defines.dm +++ b/code/__DEFINES/atmospherics_defines.dm @@ -141,6 +141,9 @@ //LAVALAND #define LAVALAND_EQUIPMENT_EFFECT_PRESSURE 50 //what pressure you have to be under to increase the effect of equipment meant for lavaland +#define LAVALAND_TEMPERATURE 500 +#define LAVALAND_OXYGEN 8 +#define LAVALAND_NITROGEN 14 // Reactions #define N2O_DECOMPOSITION_MIN_ENERGY 1400 diff --git a/code/game/turfs/simulated/floor/asteroid_floors.dm b/code/game/turfs/simulated/floor/asteroid_floors.dm index 440f2643f92..aadfe6c447a 100644 --- a/code/game/turfs/simulated/floor/asteroid_floors.dm +++ b/code/game/turfs/simulated/floor/asteroid_floors.dm @@ -146,16 +146,16 @@ ///////Surface. The surface is warm, but survivable without a suit. Internals are required. The floors break to chasms, which drop you into the underground. /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface - oxygen = 8 - nitrogen = 14 - temperature = 500 + oxygen = LAVALAND_OXYGEN + nitrogen = LAVALAND_NITROGEN + temperature = LAVALAND_TEMPERATURE planetary_atmos = TRUE baseturf = /turf/simulated/floor/lava/mapping_lava /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface_hard - oxygen = 8 - nitrogen = 14 - temperature = 500 + oxygen = LAVALAND_OXYGEN + nitrogen = LAVALAND_NITROGEN + temperature = LAVALAND_TEMPERATURE planetary_atmos = TRUE color = COLOR_FLOOR_HARD_ROCK baseturf = /turf/simulated/floor/lava/lava_land_surface @@ -199,9 +199,9 @@ GLOBAL_LIST_INIT(megafauna_spawn_list, list(/mob/living/simple_animal/hostile/me data_having_type = /turf/simulated/floor/plating/asteroid/airless/cave/volcanic/has_data turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface - oxygen = 8 - nitrogen = 14 - temperature = 500 + oxygen = LAVALAND_OXYGEN + nitrogen = LAVALAND_NITROGEN + temperature = LAVALAND_TEMPERATURE /// subtype for producing a tunnel with given data /turf/simulated/floor/plating/asteroid/airless/cave/volcanic/has_data diff --git a/code/game/turfs/simulated/floor/chasm.dm b/code/game/turfs/simulated/floor/chasm.dm index b157d90ce11..ffacfcf3ea8 100644 --- a/code/game/turfs/simulated/floor/chasm.dm +++ b/code/game/turfs/simulated/floor/chasm.dm @@ -173,9 +173,9 @@ drop_z = z - 1 /turf/simulated/floor/chasm/straight_down/lava_land_surface - oxygen = 8 - nitrogen = 14 - temperature = 500 + oxygen = LAVALAND_OXYGEN + nitrogen = LAVALAND_NITROGEN + temperature = LAVALAND_TEMPERATURE planetary_atmos = TRUE baseturf = /turf/simulated/floor/chasm/straight_down/lava_land_surface //Chasms should not turn into lava light_range = 2 diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm index d50da939c83..310b171bc0c 100644 --- a/code/game/turfs/simulated/floor/fancy_floor.dm +++ b/code/game/turfs/simulated/floor/fancy_floor.dm @@ -17,7 +17,7 @@ if(!I.use_tool(src, user, 0, volume = I.tool_volume)) return remove_tile(user, FALSE, FALSE) - + /turf/simulated/floor/wood/get_broken_states() return list("wood-broken", "wood-broken2", "wood-broken3", "wood-broken4", "wood-broken5", "wood-broken6", "wood-broken7") @@ -53,9 +53,9 @@ temperature = 180 /turf/simulated/floor/wood/lavaland_air - nitrogen = 14 - oxygen = 8 - temperature = 500 + nitrogen = LAVALAND_NITROGEN + oxygen = LAVALAND_OXYGEN + temperature = LAVALAND_TEMPERATURE // Grass /turf/simulated/floor/grass diff --git a/code/game/turfs/simulated/floor/indestructible.dm b/code/game/turfs/simulated/floor/indestructible.dm index 6d43bd23a86..43b99723b42 100644 --- a/code/game/turfs/simulated/floor/indestructible.dm +++ b/code/game/turfs/simulated/floor/indestructible.dm @@ -44,9 +44,9 @@ icon = 'icons/turf/floors.dmi' icon_state = "necro1" baseturf = /turf/simulated/floor/indestructible/necropolis - oxygen = 8 - nitrogen = 14 - temperature = 500 + oxygen = LAVALAND_OXYGEN + nitrogen = LAVALAND_NITROGEN + temperature = LAVALAND_TEMPERATURE planetary_atmos = TRUE footstep = FOOTSTEP_LAVA barefootstep = FOOTSTEP_LAVA @@ -69,9 +69,9 @@ icon = 'icons/turf/floors/boss_floors.dmi' icon_state = "boss" baseturf = /turf/simulated/floor/indestructible/boss - oxygen = 8 - nitrogen = 14 - temperature = 500 + oxygen = LAVALAND_OXYGEN + nitrogen = LAVALAND_NITROGEN + temperature = LAVALAND_TEMPERATURE planetary_atmos = TRUE /turf/simulated/floor/indestructible/boss/air @@ -83,9 +83,9 @@ name = "floor" icon = 'icons/turf/floors/hierophant_floor.dmi' icon_state = "floor" - oxygen = 8 - nitrogen = 14 - temperature = 500 + oxygen = LAVALAND_OXYGEN + nitrogen = LAVALAND_NITROGEN + temperature = LAVALAND_TEMPERATURE planetary_atmos = TRUE smoothing_flags = SMOOTH_CORNERS diff --git a/code/game/turfs/simulated/floor/lava.dm b/code/game/turfs/simulated/floor/lava.dm index 8d32d83a35e..08ec20fb8f7 100644 --- a/code/game/turfs/simulated/floor/lava.dm +++ b/code/game/turfs/simulated/floor/lava.dm @@ -160,9 +160,9 @@ return /turf/simulated/floor/lava/lava_land_surface - temperature = 500 - oxygen = 8 - nitrogen = 14 + temperature = LAVALAND_TEMPERATURE + oxygen = LAVALAND_OXYGEN + nitrogen = LAVALAND_NITROGEN planetary_atmos = TRUE baseturf = /turf/simulated/floor/chasm/straight_down/lava_land_surface @@ -256,9 +256,9 @@ icon_state = "mappinglava" base_icon_state = "mappinglava" baseturf = /turf/simulated/floor/lava/mapping_lava - temperature = 500 - oxygen = 8 - nitrogen = 14 + temperature = LAVALAND_TEMPERATURE + oxygen = LAVALAND_OXYGEN + nitrogen = LAVALAND_NITROGEN planetary_atmos = TRUE diff --git a/code/game/turfs/simulated/floor/mineral_floors.dm b/code/game/turfs/simulated/floor/mineral_floors.dm index f1fb94e507f..aa6ea18b283 100644 --- a/code/game/turfs/simulated/floor/mineral_floors.dm +++ b/code/game/turfs/simulated/floor/mineral_floors.dm @@ -287,6 +287,6 @@ return //unburnable /turf/simulated/floor/plating/abductor/lavaland_air - temperature = 500 - oxygen = 8 - nitrogen = 14 + temperature = LAVALAND_TEMPERATURE + oxygen = LAVALAND_OXYGEN + nitrogen = LAVALAND_NITROGEN diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm index 5bd564b6b78..01452e74990 100644 --- a/code/game/turfs/simulated/floor/misc_floor.dm +++ b/code/game/turfs/simulated/floor/misc_floor.dm @@ -4,9 +4,9 @@ smoothing_flags = NONE /turf/simulated/floor/vault/lavaland_air - temperature = 500 - oxygen = 8 - nitrogen = 14 + temperature = LAVALAND_TEMPERATURE + oxygen = LAVALAND_OXYGEN + nitrogen = LAVALAND_NITROGEN planetary_atmos = TRUE baseturf = /turf/simulated/floor/chasm/straight_down/lava_land_surface @@ -146,9 +146,9 @@ return /turf/simulated/floor/noslip/lavaland - oxygen = 8 - nitrogen = 14 - temperature = 500 + oxygen = LAVALAND_OXYGEN + nitrogen = LAVALAND_NITROGEN + temperature = LAVALAND_TEMPERATURE planetary_atmos = TRUE /turf/simulated/floor/lubed @@ -234,9 +234,9 @@ uses_overlay = FALSE /turf/simulated/floor/clockwork/lavaland_air - nitrogen = 14 - oxygen = 8 - temperature = 500 + nitrogen = LAVALAND_NITROGEN + oxygen = LAVALAND_OXYGEN + temperature = LAVALAND_TEMPERATURE /turf/simulated/floor/catwalk name = "catwalk" diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index 6fd8d12ffed..61b11391ba6 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -170,9 +170,9 @@ name = "plating" /turf/simulated/floor/plating/lavaland_air - temperature = 500 - oxygen = 8 - nitrogen = 14 + temperature = LAVALAND_TEMPERATURE + oxygen = LAVALAND_OXYGEN + nitrogen = LAVALAND_NITROGEN /turf/simulated/floor/engine name = "reinforced floor" @@ -253,9 +253,9 @@ return /turf/simulated/floor/engine/cult/lavaland_air - nitrogen = 14 - oxygen = 8 - temperature = 500 + nitrogen = LAVALAND_NITROGEN + oxygen = LAVALAND_OXYGEN + temperature = LAVALAND_TEMPERATURE //air filled floors; used in atmos pressure chambers diff --git a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm index a090a32cbcf..9ce9abd5050 100644 --- a/code/game/turfs/simulated/minerals.dm +++ b/code/game/turfs/simulated/minerals.dm @@ -280,9 +280,9 @@ environment_type = "basalt" turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/simulated/floor/lava/mapping_lava - oxygen = 8 - nitrogen = 14 - temperature = 500 + oxygen = LAVALAND_OXYGEN + nitrogen = LAVALAND_NITROGEN + temperature = LAVALAND_TEMPERATURE defer_change = 1 mineralSpawnChanceList = list( /turf/simulated/mineral/uranium/volcanic = 35, /turf/simulated/mineral/diamond/volcanic = 30, /turf/simulated/mineral/gold/volcanic = 45, /turf/simulated/mineral/titanium/volcanic = 45, @@ -300,9 +300,9 @@ environment_type = "basalt" turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/simulated/floor/lava/mapping_lava - oxygen = 8 - nitrogen = 14 - temperature = 500 + oxygen = LAVALAND_OXYGEN + nitrogen = LAVALAND_NITROGEN + temperature = LAVALAND_TEMPERATURE defer_change = 1 mineralChance = 10 @@ -329,9 +329,9 @@ environment_type = "basalt" turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/simulated/floor/lava/mapping_lava - oxygen = 8 - nitrogen = 14 - temperature = 500 + oxygen = LAVALAND_OXYGEN + nitrogen = LAVALAND_NITROGEN + temperature = LAVALAND_TEMPERATURE defer_change = 1 mineralSpawnChanceList = list( /turf/simulated/mineral/uranium/volcanic = 3, /turf/simulated/mineral/diamond/volcanic = 1, /turf/simulated/mineral/gold/volcanic = 8, /turf/simulated/mineral/titanium/volcanic = 8, @@ -349,9 +349,9 @@ environment_type = "basalt" turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface - oxygen = 8 - nitrogen = 14 - temperature = 500 + oxygen = LAVALAND_OXYGEN + nitrogen = LAVALAND_NITROGEN + temperature = LAVALAND_TEMPERATURE defer_change = 1 /turf/simulated/mineral/uranium @@ -364,9 +364,9 @@ environment_type = "basalt" turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface - oxygen = 8 - nitrogen = 14 - temperature = 500 + oxygen = LAVALAND_OXYGEN + nitrogen = LAVALAND_NITROGEN + temperature = LAVALAND_TEMPERATURE defer_change = 1 /turf/simulated/mineral/diamond @@ -379,9 +379,9 @@ environment_type = "basalt" turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface - oxygen = 8 - nitrogen = 14 - temperature = 500 + oxygen = LAVALAND_OXYGEN + nitrogen = LAVALAND_NITROGEN + temperature = LAVALAND_TEMPERATURE defer_change = 1 /turf/simulated/mineral/gold @@ -394,9 +394,9 @@ environment_type = "basalt" turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface - oxygen = 8 - nitrogen = 14 - temperature = 500 + oxygen = LAVALAND_OXYGEN + nitrogen = LAVALAND_NITROGEN + temperature = LAVALAND_TEMPERATURE defer_change = 1 /turf/simulated/mineral/silver @@ -409,9 +409,9 @@ environment_type = "basalt" turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface - oxygen = 8 - nitrogen = 14 - temperature = 500 + oxygen = LAVALAND_OXYGEN + nitrogen = LAVALAND_NITROGEN + temperature = LAVALAND_TEMPERATURE defer_change = 1 /turf/simulated/mineral/titanium @@ -424,9 +424,9 @@ environment_type = "basalt" turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface - oxygen = 8 - nitrogen = 14 - temperature = 500 + oxygen = LAVALAND_OXYGEN + nitrogen = LAVALAND_NITROGEN + temperature = LAVALAND_TEMPERATURE defer_change = 1 /turf/simulated/mineral/plasma @@ -439,9 +439,9 @@ environment_type = "basalt" turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface - oxygen = 8 - nitrogen = 14 - temperature = 500 + oxygen = LAVALAND_OXYGEN + nitrogen = LAVALAND_NITROGEN + temperature = LAVALAND_TEMPERATURE defer_change = 1 /turf/simulated/mineral/clown @@ -455,9 +455,9 @@ environment_type = "basalt" turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface - oxygen = 8 - nitrogen = 14 - temperature = 500 + oxygen = LAVALAND_OXYGEN + nitrogen = LAVALAND_NITROGEN + temperature = LAVALAND_TEMPERATURE defer_change = 1 /turf/simulated/mineral/mime @@ -470,9 +470,9 @@ environment_type = "basalt" turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface - oxygen = 8 - nitrogen = 14 - temperature = 500 + oxygen = LAVALAND_OXYGEN + nitrogen = LAVALAND_NITROGEN + temperature = LAVALAND_TEMPERATURE defer_change = 1 /turf/simulated/mineral/bscrystal @@ -486,18 +486,18 @@ environment_type = "basalt" turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface - oxygen = 8 - nitrogen = 14 - temperature = 500 + oxygen = LAVALAND_OXYGEN + nitrogen = LAVALAND_NITROGEN + temperature = LAVALAND_TEMPERATURE defer_change = 1 /turf/simulated/mineral/volcanic environment_type = "basalt" turf_type = /turf/simulated/floor/plating/asteroid/basalt baseturf = /turf/simulated/floor/plating/asteroid/basalt - oxygen = 8 - nitrogen = 14 - temperature = 500 + oxygen = LAVALAND_OXYGEN + nitrogen = LAVALAND_NITROGEN + temperature = LAVALAND_TEMPERATURE /turf/simulated/mineral/volcanic/lava_land_surface environment_type = "basalt" @@ -610,9 +610,9 @@ environment_type = "basalt" turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface - oxygen = 8 - nitrogen = 14 - temperature = 500 + oxygen = LAVALAND_OXYGEN + nitrogen = LAVALAND_NITROGEN + temperature = LAVALAND_TEMPERATURE defer_change = 1 #undef GIBTONITE_UNSTRUCK diff --git a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm index c3706032100..82cd7383c15 100644 --- a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm +++ b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm @@ -198,8 +198,6 @@ if(our_excited_group) last_share_check() -#define LAVALAND_TEMPERATURE 500 - if(planetary_atmos) //share our air with the "atmosphere" "above" the turf var/datum/gas_mixture/G = new G.oxygen = oxygen @@ -208,7 +206,7 @@ G.toxins = toxins G.sleeping_agent = sleeping_agent G.agent_b = agent_b - G.temperature = LAVALAND_TEMPERATURE // Temperature is modified at runtime; we only care about the turf's initial temperature + G.temperature = initial(temperature) // Temperature is modified at runtime; we only care about the turf's initial temperature G.archive() if(!air.compare(G)) if(!our_excited_group) @@ -218,8 +216,6 @@ air.share(G, adjacent_turfs_length) last_share_check() -#undef LAVALAND_TEMPERATURE - air.react() update_visuals() diff --git a/code/modules/awaymissions/mission_code/beach.dm b/code/modules/awaymissions/mission_code/beach.dm index 0fc750def0b..980dd94765c 100644 --- a/code/modules/awaymissions/mission_code/beach.dm +++ b/code/modules/awaymissions/mission_code/beach.dm @@ -114,9 +114,9 @@ linkedcontroller.decalinpool += A /turf/simulated/floor/beach/away/water/lavaland_air - nitrogen = 14 - oxygen = 8 - temperature = 500 + nitrogen = LAVALAND_NITROGEN + oxygen = LAVALAND_OXYGEN + temperature = LAVALAND_TEMPERATURE planetary_atmos = TRUE /// for boundary "walls"