shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9836 from Ghommie/Ghommie-cit364

Browse Source 
Ports "Uses defines for turf atmos"
This commit is contained in:
kevinz000
2019-11-19 21:32:42 -07:00
committed by GitHub
parent 837f17edcf 641ddebed1
commit 755559bb66
15 changed files with 67 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/atmospherics.dm
+14
View File
@@ -147,6 +147,20 @@
#define CANATMOSPASS(A, O) ( A.CanAtmosPass == ATMOS_PASS_PROC ? A.CanAtmosPass(O) : ( A.CanAtmosPass == ATMOS_PASS_DENSITY ? !A.density : A.CanAtmosPass ) )
#define CANVERTICALATMOSPASS(A, O) ( A.CanAtmosPassVertical == ATMOS_PASS_PROC ? A.CanAtmosPass(O, TRUE) : ( A.CanAtmosPassVertical == ATMOS_PASS_DENSITY ? !A.density : A.CanAtmosPassVertical ) )
//OPEN TURF ATMOS
#define OPENTURF_DEFAULT_ATMOS "o2=22;n2=82;TEMP=293.15" //the default air mix that open turfs spawn
#define TCOMMS_ATMOS "n2=100;TEMP=80" //-193,15°C telecommunications. also used for xenobiology slime killrooms
#define AIRLESS_ATMOS "TEMP=2.7" //space
#define FROZEN_ATMOS "o2=22;n2=82;TEMP=180" //-93.15°C snow and ice turfs
#define BURNMIX_ATMOS "o2=2500;plasma=5000;TEMP=370" //used in the holodeck burn test program
//ATMOSPHERICS DEPARTMENT GAS TANK TURFS
#define ATMOS_TANK_N2O "n2o=6000;TEMP=293.15"
#define ATMOS_TANK_CO2 "co2=50000;TEMP=293.15"
#define ATMOS_TANK_PLASMA "plasma=70000;TEMP=293.15"
#define ATMOS_TANK_O2 "o2=100000;TEMP=293.15"
#define ATMOS_TANK_N2 "n2=100000;TEMP=293.15"
#define ATMOS_TANK_AIRMIX "o2=2644;n2=10580;TEMP=293.15"
//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_DEFAULT_ATMOS "o2=14;n2=23;TEMP=300"
code/game/mecha/mech_bay.dm
+1 -1
View File
@@ -9,7 +9,7 @@
/turf/open/floor/mech_bay_recharge_floor/airless
icon_state = "recharge_floor_asteroid"
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/obj/machinery/mech_bay_recharge_port
name = "mech bay power port"
code/game/turfs/open.dm
+2 -2
View File
@@ -111,7 +111,7 @@
icon_state = "necro[rand(2,3)]"
/turf/open/indestructible/necropolis/air
initial_gas_mix = "o2=22;n2=82;TEMP=293.15"
initial_gas_mix = OPENTURF_DEFAULT_ATMOS
/turf/open/indestructible/boss //you put stone tiles on this and use it as a base
name = "necropolis floor"
@@ -121,7 +121,7 @@
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
/turf/open/indestructible/boss/air
initial_gas_mix = "o2=22;n2=82;TEMP=293.15"
initial_gas_mix = OPENTURF_DEFAULT_ATMOS
/turf/open/indestructible/hierophant
icon = 'icons/turf/floors/hierophant_floor.dmi'
code/game/turfs/simulated/floor/fancy_floor.dm
+2 -2
View File
@@ -65,7 +65,7 @@
temperature = 255.37
/turf/open/floor/wood/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/grass
name = "grass patch"
@@ -105,7 +105,7 @@
ore_type = /obj/item/stack/sheet/mineral/snow
planetary_atmos = TRUE
floor_tile = null
initial_gas_mix = "o2=22;n2=82;TEMP=180"
initial_gas_mix = FROZEN_ATMOS
slowdown = 2
bullet_sizzle = TRUE
footstep = FOOTSTEP_SAND
code/game/turfs/simulated/floor/mineral_floor.dm
+8 -8
View File
@@ -84,31 +84,31 @@
broken_states = list("titanium_dam1","titanium_dam2","titanium_dam3","titanium_dam4","titanium_dam5")
/turf/open/floor/mineral/titanium/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/mineral/titanium/yellow
icon_state = "titanium_yellow"
/turf/open/floor/mineral/titanium/yellow/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/mineral/titanium/blue
icon_state = "titanium_blue"
/turf/open/floor/mineral/titanium/blue/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/mineral/titanium/white
icon_state = "titanium_white"
/turf/open/floor/mineral/titanium/white/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/mineral/titanium/purple
icon_state = "titanium_purple"
/turf/open/floor/mineral/titanium/purple/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
//PLASTITANIUM (syndieshuttle)
/turf/open/floor/mineral/plastitanium
@@ -118,13 +118,13 @@
broken_states = list("plastitanium_dam1","plastitanium_dam2","plastitanium_dam3","plastitanium_dam4","plastitanium_dam5")
/turf/open/floor/mineral/plastitanium/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/mineral/plastitanium/red
icon_state = "plastitanium_red"
/turf/open/floor/mineral/plastitanium/red/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/mineral/plastitanium/red/brig
name = "brig floor"
@@ -170,7 +170,7 @@
spam_flag = world.time + 10
/turf/open/floor/mineral/bananium/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
//DIAMOND
code/game/turfs/simulated/floor/misc_floor.dm
+6 -6
View File
@@ -45,10 +45,10 @@
on = FALSE
/turf/open/floor/circuit/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/circuit/telecomms
initial_gas_mix = "n2=100;TEMP=80"
initial_gas_mix = TCOMMS_ATMOS
/turf/open/floor/circuit/telecomms/mainframe
name = "mainframe base"
@@ -72,10 +72,10 @@
floor_tile = /obj/item/stack/tile/circuit/green/anim
/turf/open/floor/circuit/green/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/circuit/green/telecomms
initial_gas_mix = "n2=100;TEMP=80"
initial_gas_mix = TCOMMS_ATMOS
/turf/open/floor/circuit/green/telecomms/mainframe
name = "mainframe base"
@@ -96,10 +96,10 @@
floor_tile = /obj/item/stack/tile/circuit/red/anim
/turf/open/floor/circuit/red/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/circuit/red/telecomms
initial_gas_mix = "n2=100;TEMP=80"
initial_gas_mix = TCOMMS_ATMOS
/turf/open/floor/pod
name = "pod floor"
code/game/turfs/simulated/floor/plasteel_floor.dm
+7 -7
View File
@@ -16,17 +16,17 @@
/turf/open/floor/plasteel/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/plasteel/telecomms
initial_gas_mix = "n2=100;TEMP=80"
initial_gas_mix = TCOMMS_ATMOS
/turf/open/floor/plasteel/dark
icon_state = "darkfull"
/turf/open/floor/plasteel/dark/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/plasteel/dark/telecomms
initial_gas_mix = "n2=100;TEMP=80"
initial_gas_mix = TCOMMS_ATMOS
/turf/open/floor/plasteel/airless/dark
icon_state = "darkfull"
/turf/open/floor/plasteel/dark/side
@@ -50,7 +50,7 @@
/turf/open/floor/plasteel/airless/white/corner
icon_state = "whitecorner"
/turf/open/floor/plasteel/white/telecomms
initial_gas_mix = "n2=100;TEMP=80"
initial_gas_mix = TCOMMS_ATMOS
/turf/open/floor/plasteel/yellowsiding
@@ -82,7 +82,7 @@
/turf/open/floor/plasteel/freezer
icon_state = "freezerfloor"
/turf/open/floor/plasteel/freezer/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/plasteel/grimy
icon_state = "grimy"
@@ -111,7 +111,7 @@
/turf/open/floor/plasteel/cult/narsie_act()
return
/turf/open/floor/plasteel/cult/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/plasteel/stairs
code/game/turfs/simulated/floor/plating/asteroid.dm
+5 -5
View File
@@ -103,7 +103,7 @@
/turf/open/floor/plating/asteroid/basalt/airless
baseturfs = /turf/open/floor/plating/asteroid/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/plating/asteroid/basalt/Initialize()
. = ..()
@@ -131,7 +131,7 @@
/turf/open/floor/plating/asteroid/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
turf_type = /turf/open/floor/plating/asteroid/airless
@@ -307,7 +307,7 @@
baseturfs = /turf/open/floor/plating/asteroid/snow
icon_state = "snow"
icon_plating = "snow"
initial_gas_mix = "o2=22;n2=82;TEMP=180"
initial_gas_mix = FROZEN_ATMOS
slowdown = 2
environment_type = "snow"
flags_1 = NONE
@@ -344,11 +344,11 @@
return FALSE
/turf/open/floor/plating/asteroid/snow/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/plating/asteroid/snow/temperatre
initial_gas_mix = "o2=22;n2=82;TEMP=255.37"
/turf/open/floor/plating/asteroid/snow/atmosphere
initial_gas_mix = "o2=22;n2=82;TEMP=180"
initial_gas_mix = FROZEN_ATMOS
planetary_atmos = FALSE
code/game/turfs/simulated/floor/plating/misc_plating.dm
+3 -3
View File
@@ -1,7 +1,7 @@
/turf/open/floor/plating/airless
icon_state = "plating"
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/plating/abductor
name = "alien floor"
@@ -172,7 +172,7 @@
desc = "A sheet of solid ice. Looks slippery."
icon = 'icons/turf/floors/ice_turf.dmi'
icon_state = "unsmooth"
initial_gas_mix = "o2=22;n2=82;TEMP=180"
initial_gas_mix = FROZEN_ATMOS
temperature = 180
planetary_atmos = TRUE
baseturfs = /turf/open/floor/plating/ice
@@ -215,7 +215,7 @@
desc = "A section of heated plating, helps keep the snow from stacking up too high."
icon = 'icons/turf/snow.dmi'
icon_state = "snowplating"
initial_gas_mix = "o2=22;n2=82;TEMP=180"
initial_gas_mix = FROZEN_ATMOS
temperature = 180
attachment_holes = FALSE
planetary_atmos = TRUE
code/game/turfs/simulated/floor/reinf_floor.dm
+9 -9
View File
@@ -17,7 +17,7 @@
to_chat(user, "<span class='notice'>The reinforcement rods are <b>wrenched</b> firmly in place.</span>")
/turf/open/floor/engine/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/engine/break_tile()
return //unbreakable
@@ -98,28 +98,28 @@
/turf/open/floor/engine/n2o
article = "an"
name = "\improper N2O floor"
initial_gas_mix = "n2o=6000;TEMP=293.15"
initial_gas_mix = ATMOS_TANK_N2O
/turf/open/floor/engine/co2
name = "\improper CO2 floor"
initial_gas_mix = "co2=50000;TEMP=293.15"
initial_gas_mix = ATMOS_TANK_CO2
/turf/open/floor/engine/plasma
name = "plasma floor"
initial_gas_mix = "plasma=70000;TEMP=293.15"
initial_gas_mix = ATMOS_TANK_PLASMA
/turf/open/floor/engine/o2
name = "\improper O2 floor"
initial_gas_mix = "o2=100000;TEMP=293.15"
initial_gas_mix = ATMOS_TANK_O2
/turf/open/floor/engine/n2
article = "an"
name = "\improper N2 floor"
initial_gas_mix = "n2=100000;TEMP=293.15"
initial_gas_mix = ATMOS_TANK_N2
/turf/open/floor/engine/air
name = "air floor"
initial_gas_mix = "o2=2644;n2=10580;TEMP=293.15"
initial_gas_mix = ATMOS_TANK_AIRMIX
@@ -159,8 +159,8 @@
addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 8)
/turf/open/floor/engine/cult/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/engine/vacuum
name = "vacuum floor"
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
code/game/turfs/simulated/lava.dm
+2 -2
View File
@@ -30,7 +30,7 @@
return
/turf/open/lava/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
/turf/open/lava/Entered(atom/movable/AM)
if(burn_stuff(AM))
@@ -158,4 +158,4 @@
baseturfs = /turf/open/lava/smooth/lava_land_surface
/turf/open/lava/smooth/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
code/game/turfs/simulated/minerals.dm
+5 -5
View File
@@ -8,7 +8,7 @@
smooth = SMOOTH_MORE|SMOOTH_BORDER
canSmoothWith = null
baseturfs = /turf/open/floor/plating/asteroid/airless
initial_gas_mix = "TEMP=2.7"
initial_gas_mix = AIRLESS_ATMOS
opacity = 1
density = TRUE
blocks_air = 1
@@ -241,7 +241,7 @@
smooth_icon = 'icons/turf/walls/icerock_wall.dmi'
turf_type = /turf/open/floor/plating/asteroid/snow/ice
baseturfs = /turf/open/floor/plating/asteroid/snow/ice
initial_gas_mix = "o2=22;n2=82;TEMP=180"
initial_gas_mix = FROZEN_ATMOS
defer_change = TRUE
@@ -278,7 +278,7 @@
smooth_icon = 'icons/turf/walls/icerock_wall.dmi'
turf_type = /turf/open/floor/plating/asteroid/snow/ice
baseturfs = /turf/open/floor/plating/asteroid/snow/ice
initial_gas_mix = "o2=22;n2=82;TEMP=180"
initial_gas_mix = FROZEN_ATMOS
defer_change = TRUE
@@ -343,7 +343,7 @@
smooth_icon = 'icons/turf/walls/icerock_wall.dmi'
turf_type = /turf/open/floor/plating/asteroid/snow/ice
baseturfs = /turf/open/floor/plating/asteroid/snow/ice
initial_gas_mix = "o2=22;n2=82;TEMP=180"
initial_gas_mix = FROZEN_ATMOS
defer_change = TRUE
@@ -404,7 +404,7 @@
smooth = SMOOTH_MORE|SMOOTH_BORDER
canSmoothWith = list (/turf/closed)
baseturfs = /turf/open/floor/plating/asteroid/snow
initial_gas_mix = "o2=22;n2=82;TEMP=180"
initial_gas_mix = FROZEN_ATMOS
environment_type = "snow"
turf_type = /turf/open/floor/plating/asteroid/snow
defer_change = TRUE
code/modules/atmospherics/environmental/LINDA_turf_tile.dm
+1 -1
View File
@@ -15,7 +15,7 @@
//used for mapping and for breathing while in walls (because that's a thing that needs to be accounted for...)
//string parsed by /datum/gas/proc/copy_from_turf
var/initial_gas_mix = "o2=22;n2=82;TEMP=293.15"
var/initial_gas_mix = OPENTURF_DEFAULT_ATMOS
//approximation of MOLES_O2STANDARD and MOLES_N2STANDARD pending byond allowing constant expressions to be embedded in constant strings
// If someone will place 0 of some gas there, SHIT WILL BREAK. Do not do that.
code/modules/awaymissions/mission_code/snowdin.dm
+1 -1
View File
@@ -154,7 +154,7 @@
//liquid plasma!!!!!!//
/turf/open/floor/plasteel/dark/snowdin
initial_gas_mix = "o2=22;n2=82;TEMP=180"
initial_gas_mix = FROZEN_ATMOS
planetary_atmos = 1
temperature = 180
code/modules/holodeck/turfs.dm
+1 -1
View File
@@ -21,7 +21,7 @@
/turf/open/floor/holofloor/plating/burnmix
name = "burn-mix floor"
initial_gas_mix = "o2=2500;plasma=5000;TEMP=370"
initial_gas_mix = BURNMIX_ATMOS
/turf/open/floor/holofloor/grass
gender = PLURAL