From 0a43036eae95c4cff630eac68ba183bb95a00710 Mon Sep 17 00:00:00 2001
From: Sishen <sishen1542@gmail.com>
Date: Fri, 21 Jun 2019 20:01:19 -0400
Subject: [PATCH] hugboxing slimepeople one thing at a time

---
 .../antagonists/changeling/powers/panacea.dm    |  2 +-
 code/modules/projectiles/guns/misc/medbeam.dm   |  2 +-
 .../chemistry/reagents/medicine_reagents.dm     | 17 +++++++++++++++++
 .../chemistry/reagents/toxin_reagents.dm        |  2 +-
 .../reagents/chemistry/recipes/medicine.dm      |  6 ++++++
 5 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/code/modules/antagonists/changeling/powers/panacea.dm b/code/modules/antagonists/changeling/powers/panacea.dm
index 9f7a36f214..8d571d21e3 100644
--- a/code/modules/antagonists/changeling/powers/panacea.dm
+++ b/code/modules/antagonists/changeling/powers/panacea.dm
@@ -29,7 +29,7 @@
 		O.forceMove(get_turf(user))
 
 	user.reagents.add_reagent("mutadone", 10)
-	user.reagents.add_reagent("pen_acid", 20)
+	user.reagents.add_reagent("pen_jelly", 20)
 	user.reagents.add_reagent("antihol", 10)
 	user.reagents.add_reagent("mannitol", 25)
 
diff --git a/code/modules/projectiles/guns/misc/medbeam.dm b/code/modules/projectiles/guns/misc/medbeam.dm
index 17c0f63955..7bdefe5e91 100644
--- a/code/modules/projectiles/guns/misc/medbeam.dm
+++ b/code/modules/projectiles/guns/misc/medbeam.dm
@@ -116,7 +116,7 @@
 		new /obj/effect/temp_visual/heal(get_turf(target), "#80F5FF")
 	target.adjustBruteLoss(-4)
 	target.adjustFireLoss(-4)
-	target.adjustToxLoss(-1)
+	target.adjustToxLoss(-1, forced = TRUE)
 	target.adjustOxyLoss(-1)
 	return
 
diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index 07a2a9c02a..458d2cd752 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -493,6 +493,23 @@
 	..()
 	. = 1
 
+/datum/reagent/medicine/pen_jelly
+	name = "Pentetic Jelly"
+	id = "pen_jelly"
+	description = "Reduces massive amounts of radiation and toxin damage while purging other chemicals from the body. Slimepeople friendly!"
+	reagent_state = LIQUID
+	color = "#E6FFF0"
+	metabolization_rate = 0.5 * REAGENTS_METABOLISM
+
+/datum/reagent/medicine/pen_jelly/on_mob_life(mob/living/carbon/M)
+	M.radiation -= max(M.radiation-RAD_MOB_SAFE, 0)/50
+	M.adjustToxLoss(-2*REM, 0, TRUE) //HEALS TOXINOVERS
+	for(var/datum/reagent/R in M.reagents.reagent_list)
+		if(R != src)
+			M.reagents.remove_reagent(R.id,2)
+	..()
+	. = 1
+
 /datum/reagent/medicine/sal_acid
 	name = "Salicyclic Acid"
 	id = "sal_acid"
diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
index 8be95efb83..11b12c7942 100644
--- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
@@ -798,7 +798,7 @@
 
 /datum/reagent/toxin/anacea/on_mob_life(mob/living/carbon/M)
 	var/remove_amt = 5
-	if(holder.has_reagent("calomel") || holder.has_reagent("pen_acid"))
+	if(holder.has_reagent("calomel") || holder.has_reagent("pen_acid") || holder.has_reagent("pen_jelly"))
 		remove_amt = 0.5
 	for(var/datum/reagent/medicine/R in M.reagents.reagent_list)
 		M.reagents.remove_reagent(R.id,remove_amt)
diff --git a/code/modules/reagents/chemistry/recipes/medicine.dm b/code/modules/reagents/chemistry/recipes/medicine.dm
index dc7c32d925..9cfb761e32 100644
--- a/code/modules/reagents/chemistry/recipes/medicine.dm
+++ b/code/modules/reagents/chemistry/recipes/medicine.dm
@@ -94,6 +94,12 @@
 	results = list("pen_acid" = 6)
 	required_reagents = list("welding_fuel" = 1, "chlorine" = 1, "ammonia" = 1, "formaldehyde" = 1, "sodium" = 1, "cyanide" = 1)
 
+/datum/chemical_reaction/pen_jelly
+	name = "Pentetic Jelly"
+	id = "pen_jelly"
+	results = list("pen_acid" = 2)
+	required_reagents = list("pen_acid" = 1, "slimejelly" = 1)
+
 /datum/chemical_reaction/sal_acid
 	name = "Salicyclic Acid"
 	id = "sal_acid"