From df815e99bd1a77c4c344987f1fce7c1768a3d7c5 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 21 Jun 2017 08:32:00 -0500 Subject: [PATCH] Lavaland's default atmos is now a define --- code/__DEFINES/atmospherics.dm | 2 ++ code/game/turfs/open.dm | 4 +-- code/game/turfs/simulated/chasm.dm | 6 ++-- .../game/turfs/simulated/floor/fancy_floor.dm | 2 +- .../turfs/simulated/floor/plating/asteroid.dm | 4 +-- .../turfs/simulated/floor/plating/dirt.dm | 2 +- .../turfs/simulated/floor/plating/lava.dm | 2 +- .../simulated/floor/plating/misc_plating.dm | 2 +- code/game/turfs/simulated/minerals.dm | 28 +++++++++---------- code/game/turfs/simulated/water.dm | 2 +- 10 files changed, 28 insertions(+), 26 deletions(-) diff --git a/code/__DEFINES/atmospherics.dm b/code/__DEFINES/atmospherics.dm index 0fa6a0f8d2..15381a08dd 100644 --- a/code/__DEFINES/atmospherics.dm +++ b/code/__DEFINES/atmospherics.dm @@ -171,3 +171,5 @@ #define ATMOS_PASS_PROC -1 //ask CanAtmosPass() #define ATMOS_PASS_DENSITY -2 //just check density #define CANATMOSPASS(A, O) ( A.CanAtmosPass == ATMOS_PASS_PROC ? A.CanAtmosPass(O) : ( A.CanAtmosPass == ATMOS_PASS_DENSITY ? !A.density : A.CanAtmosPass ) ) + +#define LAVALAND_DEFAULT_ATMOS "o2=14;n2=23;TEMP=300" diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm index 718451bcb0..feff081f30 100644 --- a/code/game/turfs/open.dm +++ b/code/game/turfs/open.dm @@ -27,7 +27,7 @@ icon = 'icons/turf/floors.dmi' icon_state = "necro1" baseturf = /turf/open/indestructible/necropolis - initial_gas_mix = "o2=14;n2=23;TEMP=300" + initial_gas_mix = LAVALAND_DEFAULT_ATMOS /turf/open/indestructible/necropolis/Initialize() . = ..() @@ -39,7 +39,7 @@ /turf/open/indestructible/hierophant icon = 'icons/turf/floors/hierophant_floor.dmi' - initial_gas_mix = "o2=14;n2=23;TEMP=300" + initial_gas_mix = LAVALAND_DEFAULT_ATMOS baseturf = /turf/open/indestructible/hierophant smooth = SMOOTH_TRUE diff --git a/code/game/turfs/simulated/chasm.dm b/code/game/turfs/simulated/chasm.dm index 8f0de9675d..cdc1284586 100644 --- a/code/game/turfs/simulated/chasm.dm +++ b/code/game/turfs/simulated/chasm.dm @@ -112,7 +112,7 @@ /turf/open/chasm/straight_down/lava_land_surface - initial_gas_mix = "o2=14;n2=23;TEMP=300" + initial_gas_mix = LAVALAND_DEFAULT_ATMOS planetary_atmos = TRUE baseturf = /turf/open/chasm/straight_down/lava_land_surface light_range = 1.9 //slightly less range than lava @@ -173,7 +173,7 @@ /turf/open/chasm/jungle icon = 'icons/turf/floors/junglechasm.dmi' planetary_atmos = TRUE - initial_gas_mix = "o2=14;n2=23;TEMP=300" + initial_gas_mix = LAVALAND_DEFAULT_ATMOS /turf/open/chasm/jungle/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir) underlay_appearance.icon = 'icons/turf/floors.dmi' @@ -183,4 +183,4 @@ /turf/open/chasm/straight_down/jungle icon = 'icons/turf/floors/junglechasm.dmi' planetary_atmos = TRUE - initial_gas_mix = "o2=14;n2=23;TEMP=300" \ No newline at end of file + initial_gas_mix = LAVALAND_DEFAULT_ATMOS \ No newline at end of file diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm index 375697ff9b..efa4382540 100644 --- a/code/game/turfs/simulated/floor/fancy_floor.dm +++ b/code/game/turfs/simulated/floor/fancy_floor.dm @@ -105,7 +105,7 @@ icon = 'icons/turf/floors.dmi' icon_state = "basalt" ore_type = /obj/item/weapon/ore/glass/basalt - initial_gas_mix = "o2=14;n2=23;TEMP=300" + initial_gas_mix = LAVALAND_DEFAULT_ATMOS slowdown = 0 /turf/open/floor/grass/snow/basalt/Initialize() diff --git a/code/game/turfs/simulated/floor/plating/asteroid.dm b/code/game/turfs/simulated/floor/plating/asteroid.dm index 18d81b1932..4d3e7e566b 100644 --- a/code/game/turfs/simulated/floor/plating/asteroid.dm +++ b/code/game/turfs/simulated/floor/plating/asteroid.dm @@ -137,7 +137,7 @@ ///////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/open/floor/plating/asteroid/basalt/lava_land_surface - initial_gas_mix = "o2=14;n2=23;TEMP=300" + initial_gas_mix = LAVALAND_DEFAULT_ATMOS planetary_atmos = TRUE baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface @@ -176,7 +176,7 @@ data_having_type = /turf/open/floor/plating/asteroid/airless/cave/volcanic/has_data turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface - initial_gas_mix = "o2=14;n2=23;TEMP=300" + initial_gas_mix = LAVALAND_DEFAULT_ATMOS /turf/open/floor/plating/asteroid/airless/cave/volcanic/has_data //subtype for producing a tunnel with given data has_data = TRUE diff --git a/code/game/turfs/simulated/floor/plating/dirt.dm b/code/game/turfs/simulated/floor/plating/dirt.dm index 0d13b93432..9d07c53917 100644 --- a/code/game/turfs/simulated/floor/plating/dirt.dm +++ b/code/game/turfs/simulated/floor/plating/dirt.dm @@ -4,7 +4,7 @@ icon = 'icons/turf/floors.dmi' icon_state = "dirt" baseturf = /turf/open/chasm/straight_down/jungle - initial_gas_mix = "o2=14;n2=23;TEMP=300" + initial_gas_mix = LAVALAND_DEFAULT_ATMOS planetary_atmos = TRUE /turf/open/floor/plating/dirt/dark diff --git a/code/game/turfs/simulated/floor/plating/lava.dm b/code/game/turfs/simulated/floor/plating/lava.dm index ead1e97d22..dbc73943a0 100644 --- a/code/game/turfs/simulated/floor/plating/lava.dm +++ b/code/game/turfs/simulated/floor/plating/lava.dm @@ -132,7 +132,7 @@ /turf/open/floor/plating/lava/smooth/lava_land_surface - initial_gas_mix = "o2=14;n2=23;TEMP=300" + initial_gas_mix = LAVALAND_DEFAULT_ATMOS planetary_atmos = TRUE baseturf = /turf/open/chasm/straight_down/lava_land_surface diff --git a/code/game/turfs/simulated/floor/plating/misc_plating.dm b/code/game/turfs/simulated/floor/plating/misc_plating.dm index 081b4becc6..cf0ec5531c 100644 --- a/code/game/turfs/simulated/floor/plating/misc_plating.dm +++ b/code/game/turfs/simulated/floor/plating/misc_plating.dm @@ -38,7 +38,7 @@ var/smooth_icon = 'icons/turf/floors/ash.dmi' desc = "The ground is covered in volcanic ash." baseturf = /turf/open/floor/plating/ashplanet/wateryrock //I assume this will be a chasm eventually, once this becomes an actual surface - initial_gas_mix = "o2=14;n2=23;TEMP=300" + initial_gas_mix = LAVALAND_DEFAULT_ATMOS planetary_atmos = TRUE /turf/open/floor/plating/ashplanet/Initialize() diff --git a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm index 9c3d8ed0c7..ea286f9a01 100644 --- a/code/game/turfs/simulated/minerals.dm +++ b/code/game/turfs/simulated/minerals.dm @@ -179,7 +179,7 @@ environment_type = "basalt" turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface - initial_gas_mix = "o2=14;n2=23;TEMP=300" + initial_gas_mix = LAVALAND_DEFAULT_ATMOS defer_change = 1 mineralSpawnChanceList = list( /turf/closed/mineral/uranium/volcanic = 35, /turf/closed/mineral/diamond/volcanic = 30, /turf/closed/mineral/gold/volcanic = 45, /turf/closed/mineral/titanium/volcanic = 45, @@ -200,7 +200,7 @@ environment_type = "basalt" turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface - initial_gas_mix = "o2=14;n2=23;TEMP=300" + initial_gas_mix = LAVALAND_DEFAULT_ATMOS defer_change = 1 mineralChance = 10 @@ -222,7 +222,7 @@ environment_type = "basalt" turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface - initial_gas_mix = "o2=14;n2=23;TEMP=300" + initial_gas_mix = LAVALAND_DEFAULT_ATMOS defer_change = 1 mineralSpawnChanceList = list( /turf/closed/mineral/uranium/volcanic = 3, /turf/closed/mineral/diamond/volcanic = 1, /turf/closed/mineral/gold/volcanic = 8, /turf/closed/mineral/titanium/volcanic = 8, @@ -241,7 +241,7 @@ environment_type = "basalt" turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface - initial_gas_mix = "o2=14;n2=23;TEMP=300" + initial_gas_mix = LAVALAND_DEFAULT_ATMOS defer_change = 1 @@ -255,7 +255,7 @@ environment_type = "basalt" turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface - initial_gas_mix = "o2=14;n2=23;TEMP=300" + initial_gas_mix = LAVALAND_DEFAULT_ATMOS defer_change = 1 @@ -269,7 +269,7 @@ environment_type = "basalt" turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface - initial_gas_mix = "o2=14;n2=23;TEMP=300" + initial_gas_mix = LAVALAND_DEFAULT_ATMOS defer_change = 1 @@ -283,7 +283,7 @@ environment_type = "basalt" turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface - initial_gas_mix = "o2=14;n2=23;TEMP=300" + initial_gas_mix = LAVALAND_DEFAULT_ATMOS defer_change = 1 @@ -297,7 +297,7 @@ environment_type = "basalt" turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface - initial_gas_mix = "o2=14;n2=23;TEMP=300" + initial_gas_mix = LAVALAND_DEFAULT_ATMOS defer_change = 1 @@ -311,7 +311,7 @@ environment_type = "basalt" turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface - initial_gas_mix = "o2=14;n2=23;TEMP=300" + initial_gas_mix = LAVALAND_DEFAULT_ATMOS defer_change = 1 @@ -325,7 +325,7 @@ environment_type = "basalt" turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface - initial_gas_mix = "o2=14;n2=23;TEMP=300" + initial_gas_mix = LAVALAND_DEFAULT_ATMOS defer_change = 1 @@ -348,7 +348,7 @@ environment_type = "basalt" turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface - initial_gas_mix = "o2=14;n2=23;TEMP=300" + initial_gas_mix = LAVALAND_DEFAULT_ATMOS defer_change = 1 @@ -356,7 +356,7 @@ environment_type = "basalt" turf_type = /turf/open/floor/plating/asteroid/basalt baseturf = /turf/open/floor/plating/asteroid/basalt - initial_gas_mix = "o2=14;n2=23;TEMP=300" + initial_gas_mix = LAVALAND_DEFAULT_ATMOS /turf/closed/mineral/volcanic/lava_land_surface environment_type = "basalt" @@ -372,7 +372,7 @@ smooth = SMOOTH_MORE|SMOOTH_BORDER canSmoothWith = list (/turf/closed) baseturf = /turf/open/floor/plating/ashplanet/wateryrock - initial_gas_mix = "o2=14;n2=23;TEMP=300" + initial_gas_mix = LAVALAND_DEFAULT_ATMOS environment_type = "waste" turf_type = /turf/open/floor/plating/ashplanet/rocky defer_change = 1 @@ -477,5 +477,5 @@ environment_type = "basalt" turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface - initial_gas_mix = "o2=14;n2=23;TEMP=300" + initial_gas_mix = LAVALAND_DEFAULT_ATMOS defer_change = 1 diff --git a/code/game/turfs/simulated/water.dm b/code/game/turfs/simulated/water.dm index d0208218a5..d73c5f98c2 100644 --- a/code/game/turfs/simulated/water.dm +++ b/code/game/turfs/simulated/water.dm @@ -4,7 +4,7 @@ icon = 'icons/turf/floors.dmi' icon_state = "riverwater" baseturf = /turf/open/chasm/straight_down/lava_land_surface - initial_gas_mix = "o2=14;n2=23;TEMP=300" + initial_gas_mix = LAVALAND_DEFAULT_ATMOS planetary_atmos = TRUE slowdown = 1 wet = TURF_WET_WATER