Merge pull request #4294 from Citadel-Station-13/upstream-merge-33390

[MIRROR] cleans up atmos defines

code/modules/atmospherics/gasmixtures/reactions.dm

@@ -1,5 +1,3 @@
-#define NO_REACTION	0
-#define REACTING	1
 //Plasma fire properties
 #define OXYGEN_BURN_RATE_BASE				1.4
 #define PLASMA_BURN_RATE_DELTA				9
@@ -359,9 +357,6 @@
 		if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
 			air.temperature = max(((air.temperature*old_heat_capacity - energy_taken)/new_heat_capacity),TCMB)
 
-
-#undef REACTING
-#undef NO_REACTION
 #undef OXYGEN_BURN_RATE_BASE
 #undef PLASMA_BURN_RATE_DELTA
 #undef PLASMA_UPPER_TEMPERATURE
@@ -386,4 +381,4 @@
 #undef CATALYST_COEFFICENT
 #undef FUSION_PURITY_THRESHOLD
 #undef FUSION_HEAT_DROPOFF
-#undef NOBLIUM_FORMATION_ENERGY
+#undef NOBLIUM_FORMATION_ENERGY

code/modules/surgery/organs/lungs.dm

@@ -28,7 +28,8 @@
 	var/safe_toxins_max = 0.05
 	var/SA_para_min = 1 //Sleeping agent
 	var/SA_sleep_min = 5 //Sleeping agent
-	var/BZ_trip_balls_min = 1 //BZ gas.
+	var/BZ_trip_balls_min = 1 //BZ gas
+	var/gas_stimulation_min = 0.002 //Nitryl and Stimulum
 
 	var/oxy_breath_dam_min = MIN_TOXIC_GAS_DAMAGE
 	var/oxy_breath_dam_max = MAX_TOXIC_GAS_DAMAGE
@@ -274,14 +275,14 @@
 		else
 			H.adjustFireLoss(nitryl_pp/4)
 		gas_breathed = breath_gases[/datum/gas/nitryl][MOLES]
-		if (gas_breathed > GAS_STIM_MINIMUM)
+		if (gas_breathed > gas_stimulation_min)
 			H.reagents.add_reagent("nitryl_gas",1)
 
 		breath_gases[/datum/gas/nitryl][MOLES]-=gas_breathed
 		gas_breathed = 0
 	// Stimulum
 		gas_breathed = breath_gases[/datum/gas/stimulum][MOLES]
-		if (gas_breathed > GAS_STIM_MINIMUM)
+		if (gas_breathed > gas_stimulation_min)
 			H.reagents.add_reagent("stimulum",1)
 		breath_gases[/datum/gas/stimulum][MOLES]-=gas_breathed
 		handle_breath_temperature(breath, H)