diff --git a/.gitignore b/.gitignore index f12223e2c4..c1e9211514 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ *.rsc *.dmb *.lk -info.json \ No newline at end of file +info.json +/config/admins.txt diff --git a/baystation12.dme b/baystation12.dme index 7da8618031..d0fb518406 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -173,7 +173,6 @@ #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/BirdMan" #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Rust" #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Supermatter" -#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Supermatter/backup" #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Tajara" #define FILE_DIR "code/WorkInProgress/Chinsky" #define FILE_DIR "code/WorkInProgress/mapload" diff --git a/code/ZAS/ZAS_Zones.dm b/code/ZAS/ZAS_Zones.dm index 2c249a7567..0484b08fcf 100644 --- a/code/ZAS/ZAS_Zones.dm +++ b/code/ZAS/ZAS_Zones.dm @@ -248,12 +248,12 @@ zone/proc/process() //Air Movement// //////////////// -var/list/sharing_lookup_table = list(6, 11, 15, 18, 20, 21) +var/list/sharing_lookup_table = list(0.06, 0.11, 0.15, 0.18, 0.20, 0.21) proc/ShareRatio(datum/gas_mixture/A, datum/gas_mixture/B, connecting_tiles) //Shares a specific ratio of gas between mixtures using simple weighted averages. var - ratio = 21 + ratio = 0.21 size = max(1,A.group_multiplier) share_size = max(1,B.group_multiplier) @@ -336,7 +336,7 @@ proc/ShareSpace(datum/gas_mixture/A, list/unsimulated_tiles) unsim_temperature += T.temperature/unsimulated_tiles.len var - ratio = 21 + ratio = 0.21 old_pressure = A.return_pressure()