Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods

2019-04-13 02:47:34 -05:00
parent 03a174d21f dd85f6aac3
commit 5f1db72ba3
60 changed files with 564 additions and 325 deletions
@@ -62,7 +62,6 @@
 	)

 	var/list/upgrade_reagents3 = list(
-		"glycerol",
 		"mine_salve",
 		"toxin"
 	)
@@ -463,6 +463,19 @@
 		M.radiation -= min(M.radiation, 8)
 	..()

+/datum/reagent/medicine/prussian_blue
+	name = "Prussian Blue"
+	id = "prussian_blue"
+	description = "Efficiently restores heavy radiation damage."
+	reagent_state = LIQUID
+	color = "#003153" // RGB 0, 49, 83
+	metabolization_rate = 0.5 * REAGENTS_METABOLISM
+
+/datum/reagent/medicine/prussian_blue/on_mob_life(mob/living/carbon/M)
+	if(M.radiation > 0)
+		M.radiation -= min(M.radiation, 20)
+	..()
+
 /datum/reagent/medicine/pen_acid
 	name = "Pentetic Acid"
 	id = "pen_acid"