Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation

This commit is contained in:
Crazylemon64
2016-08-03 13:31:42 -07:00
65 changed files with 174 additions and 2702 deletions
+1 -4
View File
@@ -114,7 +114,4 @@
// Atmos pipe limits
#define MAX_OUTPUT_PRESSURE 4500 // (kPa) What pressure pumps and powered equipment max out at.
#define MAX_TRANSFER_RATE 200 // (L/s) Maximum speed powered equipment can work at.
// Sound Limits
#define SOUND_MINIMUM_PRESSURE 10
#define MAX_TRANSFER_RATE 200 // (L/s) Maximum speed powered equipment can work at.
+5 -1
View File
@@ -263,4 +263,8 @@
#define LAVA_PROOF -2
#define FIRE_PROOF -1
#define FLAMMABLE 0
#define ON_FIRE 1
#define ON_FIRE 1
// Sound
#define SOUND_MINIMUM_PRESSURE 10
#define FALLOFF_SOUNDS 0.5