shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-31727

Browse Source
This commit is contained in:
deathride58
2017-12-10 21:51:51 +00:00
committed by GitHub
parent 988baf6781 b66e664f11
commit 7179547be4
205 changed files with 2604 additions and 1534 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/organs/lungs.dm
+4 -3
View File
@@ -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)