diff --git a/code/__defines/atmos.dm b/code/__defines/atmos.dm index 53bbe67edd..8212e4c911 100644 --- a/code/__defines/atmos.dm +++ b/code/__defines/atmos.dm @@ -57,15 +57,15 @@ //These control the speed at which fire burns #define FIRE_GAS_BURNRATE_MULT 1 -#define FIRE_LIQUID_BURNRATE_MULT 1 +#define FIRE_LIQUID_BURNRATE_MULT 0.225 //If the fire is burning slower than this rate then the reaction is going too slow to be self sustaining and the fire burns itself out. //This ensures that fires don't grind to a near-halt while still remaining active forever. #define FIRE_GAS_MIN_BURNRATE 0.01 -#define FIRE_LIQUD_MIN_BURNRATE 0.01 +#define FIRE_LIQUD_MIN_BURNRATE 0.0025 //How many moles of fuel are contained within one solid/liquid fuel volume unit -#define LIQUIDFUEL_AMOUNT_TO_MOL 1 //mol/volume unit +#define LIQUIDFUEL_AMOUNT_TO_MOL 0.45 //mol/volume unit // XGM gas flags. #define XGM_GAS_FUEL 1 diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index d61dcd50d6..e9caee3cab 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -36,7 +36,7 @@ qdel(air_contents) processing_objects.Remove(src) - + if(istype(loc, /obj/item/device/transfer_valve)) var/obj/item/device/transfer_valve/TTV = loc TTV.remove_tank(src) @@ -120,7 +120,7 @@ location = loc.loc else if(istype(loc, /mob/living/carbon)) location = loc - + var/using_internal if(istype(location)) if(location.internal==src) @@ -267,19 +267,19 @@ var/range = (pressure-TANK_FRAGMENT_PRESSURE)/TANK_FRAGMENT_SCALE explosion( - get_turf(loc), - round(min(BOMBCAP_DVSTN_RADIUS, range*0.25)), - round(min(BOMBCAP_HEAVY_RADIUS, range*0.50)), - round(min(BOMBCAP_LIGHT_RADIUS, range*1.00)), - round(min(BOMBCAP_FLASH_RADIUS, range*1.50)), + get_turf(loc), + round(min(BOMBCAP_DVSTN_RADIUS, range*0.25)), + round(min(BOMBCAP_HEAVY_RADIUS, range*0.50)), + round(min(BOMBCAP_LIGHT_RADIUS, range*1.00)), + round(min(BOMBCAP_FLASH_RADIUS, range*1.50)), ) qdel(src) else if(pressure > TANK_RUPTURE_PRESSURE) #ifdef FIREDBG - log_debug("\blue[x],[y] tank is rupturing: [pressure] kPa, integrity [integrity]") + log_debug("[x],[y] tank is rupturing: [pressure] kPa, integrity [integrity]") #endif - + if(integrity <= 0) var/turf/simulated/T = get_turf(src) if(!T) @@ -292,9 +292,9 @@ else if(pressure > TANK_LEAK_PRESSURE) #ifdef FIREDBG - log_debug("\blue[x],[y] tank is leaking: [pressure] kPa, integrity [integrity]") + log_debug("[x],[y] tank is leaking: [pressure] kPa, integrity [integrity]") #endif - + if(integrity <= 0) var/turf/simulated/T = get_turf(src) if(!T) diff --git a/code/modules/holodeck/HolodeckControl.dm b/code/modules/holodeck/HolodeckControl.dm index 2a4d1df794..eea4d6d6e8 100644 --- a/code/modules/holodeck/HolodeckControl.dm +++ b/code/modules/holodeck/HolodeckControl.dm @@ -42,13 +42,13 @@ dat += "