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

Merge branch 'master' into upstream-merge-31601

Browse Source
This commit is contained in:
LetterJay
2017-10-14 10:17:16 -04:00
committed by GitHub
parent c28932e4d4 2d2adfbee5
commit d6903bcf3c
101 changed files with 4200 additions and 11173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+2 -5
View File
@@ -454,7 +454,7 @@
/datum/reagent/medicine/potass_iodide/on_mob_life(mob/living/M)
if(M.radiation > 0)
M.radiation--
M.radiation-=2
..()
/datum/reagent/medicine/pen_acid
@@ -466,11 +466,8 @@
metabolization_rate = 0.5 * REAGENTS_METABOLISM
/datum/reagent/medicine/pen_acid/on_mob_life(mob/living/M)
if(M.radiation > 0)
M.radiation -= 4
M.radiation -= min(M.radiation, 8)
M.adjustToxLoss(-2*REM, 0)
if(M.radiation < 0)
M.radiation = 0
for(var/datum/reagent/R in M.reagents.reagent_list)
if(R != src)
M.reagents.remove_reagent(R.id,2)