cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

geyser POI active edge (#10625)

Browse Source
This commit is contained in:
tacoguy7765093
2025-04-13 15:33:25 -05:00
committed by GitHub
parent bb895bfec9
commit e197d84b62
7 changed files with 1192 additions and 1936 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modular_chomp/code/game/objects/random/mapping.dm
View File

@@ -125,3 +125,16 @@ Make this if you can figure out a way to do it for every area in that z level ex
if(A)
A.flags |= PHASE_SHIELDED
qdel(src)
//For active edges in Sif POIs
/obj/random/turf/lava/sif
name = "random Lava spawn sif"
desc = "This is a random lava spawn. Programmed to spawn lava with sif temps"
override_outdoors = TRUE
turf_outdoors = OUTDOORS_NO
/obj/random/turf/lava/sif/item_to_spawn()
return pick(prob(5);/turf/simulated/floor/lava/external,
prob(3);/turf/simulated/floor/outdoors/rocks/caves,
prob(1);/turf/simulated/mineral/ignore_mapgen/cave)

34
modular_chomp/icons/turf/flooring/flooring_premade.dm
View File

@@ -1,6 +1,40 @@
#define O2SIF 0.181
#define N2SIF 0.819
#define MOLES_CELLSIF 114.50978
#define MOLES_O2SIF (MOLES_CELLSIF * O2SIF) // O2 value on Sif(18%)
#define MOLES_N2SIF (MOLES_CELLSIF * N2SIF) // N2 value on Sif(82%)
#define TEMPERATURE_SIF 243.15 // Roughly -30C / -22F
#define TEMPERATURE_ALTSIF 225.15
//Atmosphere properties //CHOMP Comment: I guess this THOR planetary information should go here. THOR is a hot humid jungle.
#define THOR_ONE_ATMOSPHERE 101.5 //kPa
#define THOR_AVG_TEMP 313 //kelvin
#define THOR_PER_N2 0.65 //percent
#define THOR_PER_O2 0.35
#define THOR_PER_N2O 0.00 //Currently no capacity to 'start' a turf with this. See turf.dm
#define THOR_PER_CO2 0.00
#define THOR_PER_PHORON 0.00
//Math only beyond this point
#define THOR_MOL_PER_TURF (THOR_ONE_ATMOSPHERE*CELL_VOLUME/(THOR_AVG_TEMP*R_IDEAL_GAS_EQUATION))
#define THOR_MOL_N2 (THOR_MOL_PER_TURF * THOR_PER_N2)
#define THOR_MOL_O2 (THOR_MOL_PER_TURF * THOR_PER_O2)
#define THOR_MOL_N2O (THOR_MOL_PER_TURF * THOR_PER_N2O)
#define THOR_MOL_CO2 (THOR_MOL_PER_TURF * THOR_PER_CO2)
#define THOR_MOL_PHORON (THOR_MOL_PER_TURF * THOR_PER_PHORON)
// Custom snow presets for the cryosauna
/turf/simulated/floor/snow/snow2/cryosauna
temperature = 263.15 // All we're doing here is manually setting the temperature
/turf/simulated/floor/wood/cryosauna
temperature = 263.15 // All we're doing here is manually setting the temperature
/turf/simulated/floor/lava/external
oxygen = MOLES_O2SIF
nitrogen = MOLES_N2SIF
temperature = TEMPERATURE_SIF

31
modular_chomp/maps/southern_cross/overmap/planets/thor/thor.dm
View File

@@ -1,20 +1,21 @@
//Atmosphere properties //CHOMP Comment: I guess this THOR planetary information should go here. THOR is a gas giant, it ain't gonna be getting very many other maps.
#define THOR_ONE_ATMOSPHERE 101.5 //kPa
#define THOR_AVG_TEMP 313 //kelvin
//MOVED TO modular_chomp/icons/turf/flooring/flooring_premade.dm
// //Atmosphere properties //CHOMP Comment: I guess this THOR planetary information should go here. THOR is a gas giant, it ain't gonna be getting very many other maps.
// #define THOR_ONE_ATMOSPHERE 101.5 //kPa
// #define THOR_AVG_TEMP 313 //kelvin
#define THOR_PER_N2 0.65 //percent
#define THOR_PER_O2 0.35
#define THOR_PER_N2O 0.00 //Currently no capacity to 'start' a turf with this. See turf.dm
#define THOR_PER_CO2 0.00
#define THOR_PER_PHORON 0.00
// #define THOR_PER_N2 0.65 //percent
// #define THOR_PER_O2 0.35
// #define THOR_PER_N2O 0.00 //Currently no capacity to 'start' a turf with this. See turf.dm
// #define THOR_PER_CO2 0.00
// #define THOR_PER_PHORON 0.00
//Math only beyond this point
#define THOR_MOL_PER_TURF (THOR_ONE_ATMOSPHERE*CELL_VOLUME/(THOR_AVG_TEMP*R_IDEAL_GAS_EQUATION))
#define THOR_MOL_N2 (THOR_MOL_PER_TURF * THOR_PER_N2)
#define THOR_MOL_O2 (THOR_MOL_PER_TURF * THOR_PER_O2)
#define THOR_MOL_N2O (THOR_MOL_PER_TURF * THOR_PER_N2O)
#define THOR_MOL_CO2 (THOR_MOL_PER_TURF * THOR_PER_CO2)
#define THOR_MOL_PHORON (THOR_MOL_PER_TURF * THOR_PER_PHORON)
// //Math only beyond this point
// #define THOR_MOL_PER_TURF (THOR_ONE_ATMOSPHERE*CELL_VOLUME/(THOR_AVG_TEMP*R_IDEAL_GAS_EQUATION))
// #define THOR_MOL_N2 (THOR_MOL_PER_TURF * THOR_PER_N2)
// #define THOR_MOL_O2 (THOR_MOL_PER_TURF * THOR_PER_O2)
// #define THOR_MOL_N2O (THOR_MOL_PER_TURF * THOR_PER_N2O)
// #define THOR_MOL_CO2 (THOR_MOL_PER_TURF * THOR_PER_CO2)
// #define THOR_MOL_PHORON (THOR_MOL_PER_TURF * THOR_PER_PHORON)
//Turfmakers
#define THOR_SET_ATMOS nitrogen=THOR_MOL_N2;oxygen=THOR_MOL_O2;carbon_dioxide=THOR_MOL_CO2;phoron=THOR_MOL_PHORON;temperature=THOR_AVG_TEMP

16
modular_chomp/maps/southern_cross/turfs/outdoors.dm
View File

@@ -1,14 +1,14 @@
// Sif Planetside stuff
#define O2SIF 0.181
#define N2SIF 0.819
// // Sif Planetside stuff Defined in flooring_premade.dm
// #define O2SIF 0.181
// #define N2SIF 0.819
#define MOLES_CELLSIF 114.50978
// #define MOLES_CELLSIF 114.50978
#define MOLES_O2SIF (MOLES_CELLSIF * O2SIF) // O2 value on Sif(18%)
#define MOLES_N2SIF (MOLES_CELLSIF * N2SIF) // N2 value on Sif(82%)
// #define MOLES_O2SIF (MOLES_CELLSIF * O2SIF) // O2 value on Sif(18%)
// #define MOLES_N2SIF (MOLES_CELLSIF * N2SIF) // N2 value on Sif(82%)
#define TEMPERATURE_SIF 243.15 // Roughly -30C / -22F
#define TEMPERATURE_ALTSIF 225.15
// #define TEMPERATURE_SIF 243.15 // Roughly -30C / -22F
// #define TEMPERATURE_ALTSIF 225.15
/turf/simulated/floor/outdoors/mud/sif/planetuse

6
modular_chomp/maps/submaps/surface_submaps/mountains/Geyser1.dmm
View File

@@ -6,12 +6,12 @@
/turf/simulated/floor/outdoors/rocks/caves,
/area/submap/cave/geyser_1)
"c" = (
/obj/random/turf/lava,
/obj/random/turf/lava/sif,
/turf/simulated/floor/outdoors/rocks/caves,
/area/submap/cave/geyser_1)
"d" = (
/obj/random/outcrop,
/obj/random/turf/lava,
/obj/random/turf/lava/sif,
/turf/simulated/floor/outdoors/rocks/caves,
/area/submap/cave/geyser_1)
"e" = (
@@ -35,7 +35,7 @@
},
/area/submap/cave/geyser_1)
"g" = (
/obj/random/turf/lava,
/obj/random/turf/lava/sif,
/obj/random/outcrop,
/turf/simulated/floor/outdoors/rocks/caves,
/area/submap/cave/geyser_1)

3004
modular_chomp/maps/virtual_reality/constructVR.dmm
View File

File diff suppressed because it is too large Load Diff

24
modular_chomp/maps/~turfpacks/turfpacks.dm
View File

@@ -94,3 +94,27 @@
#undef TURFPACK_N2
#undef TURFPACK_PHORON
#undef TURFPACK_CO2
// THOR ATMOS
#define TURFPACK_PACKNAME thor
#define TURFPACK_TEMP THOR_AVG_TEMP
#define TURFPACK_O2 THOR_MOL_O2
#define TURFPACK_N2 THOR_MOL_N2
#define TURFPACK_PHORON 0
#define TURFPACK_CO2 THOR_MOL_CO2
#include "packs_sim/turfpacks_sim_tiled.dm"
#include "packs_sim/turfpacks_sim_outdoors.dm"
#include "packs_sim/turfpacks_sim_walls.dm"
#include "packs_sim/turfpacks_sim_special.dm"
#include "packs_unsim/turfpacks_unsim_tiled.dm"
#include "packs_unsim/turfpacks_unsim_outdoors.dm"
#include "packs_unsim/turfpacks_unsim_walls.dm"
#include "packs_unsim/turfpacks_unsim_special.dm"
#undef TURFPACK_PACKNAME
#undef TURFPACK_TEMP
#undef TURFPACK_O2
#undef TURFPACK_N2
#undef TURFPACK_PHORON
#undef TURFPACK_CO2