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

Merge pull request #3642 from Citadel-Station-13/upstream-merge-32051

Browse Source 
[MIRROR] More radiation balance changes and fixes
This commit is contained in:
LetterJay
2017-10-29 02:41:44 -04:00
committed by GitHub
parent 341c2e748b cabc69c66d
commit 74a33169cb
14 changed files with 213 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+2 -2
View File
@@ -454,7 +454,7 @@
/datum/reagent/medicine/potass_iodide/on_mob_life(mob/living/M)
if(M.radiation > 0)
M.radiation -= min(M.radiation, 4)
M.radiation -= min(M.radiation, 8)
..()
/datum/reagent/medicine/pen_acid
@@ -466,7 +466,7 @@
metabolization_rate = 0.5 * REAGENTS_METABOLISM
/datum/reagent/medicine/pen_acid/on_mob_life(mob/living/M)
M.radiation -= max(M.radiation-RAD_MOB_SAFE, 0)/100
M.radiation -= max(M.radiation-RAD_MOB_SAFE, 0)/50
M.adjustToxLoss(-2*REM, 0)
for(var/datum/reagent/R in M.reagents.reagent_list)
if(R != src)