Merge pull request #3395 from Citadel-Station-13/upstream-merge-31731

[MIRROR] [s] Fixes camera mobs becoming contaminated and other tweaks
2017-10-15 10:20:04 -04:00
parent 5b4bb85ca1 5c95c983af
commit b02e9c6a90
20 changed files with 45 additions and 39 deletions
@@ -454,7 +454,7 @@

 /datum/reagent/medicine/potass_iodide/on_mob_life(mob/living/M)
 	if(M.radiation > 0)
-		M.radiation-=2
+		M.radiation -= min(M.radiation, 4)
 	..()

 /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 -= min(M.radiation, 8)
+	M.radiation -= min(M.radiation, log(M.radiation)*10)
 	M.adjustToxLoss(-2*REM, 0)
 	for(var/datum/reagent/R in M.reagents.reagent_list)
 		if(R != src)