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

merge with tgstation's r4618, removed some broken bs12 merges (organs, pain)

Browse Source 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2012-09-06 13:09:20 +10:00
parent dc3f6f2239
commit ad75e6b352
17 changed files with 230 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/ZAS/FEA_gas_mixture.dm
View File

@@ -4,6 +4,9 @@ What are the archived variables for?
This prevents race conditions that arise based on the order of tile processing.
*/
#define QUANTIZE(variable) (round(variable,0.0001))
#define TRANSFER_FRACTION 5 //What fraction (1/#) of the air difference to try and transfer
datum
gas //These are used for the "Trace Gases" stuff, but is buggy.
sleeping_agent

2
code/ZAS/Fire.dm
View File

@@ -344,4 +344,4 @@ datum/gas_mixture/proc/calculate_firelevel(obj/liquid_fuel/liquid)
apply_damage(0.4*mx*arms_exposure, BURN, "l_arm", 0, 0, "Fire")
apply_damage(0.4*mx*arms_exposure, BURN, "r_arm", 0, 0, "Fire")
flash_pain()
//flash_pain()