From 967a535aeb5ae5da0bf4189736ad43ed91f00f31 Mon Sep 17 00:00:00 2001
From: Ignari-Coldstorm <43045900+Ignari-Coldstorm@users.noreply.github.com>
Date: Wed, 26 Sep 2018 14:07:00 -0500
Subject: [PATCH] New Reagent, Universalizes Survival Medipen (#7570)

* New Reagent, Universalizes Survival Medipen

Adds an alternate regenerative jelly for the survival medipens used in mining. Replaces the tricord and omnizine in medipens with 15u of Neo Jelly. Makes medipens finally useful for slime miners. When ODed on Neo Jelly, causes heavy brute/burn and minor oxyloss and causes no toxin damage.

* code alter

adds * to the REM.

* additional code fix

removes the M.adjustToxLoss line, and corrects code text to 52 units injected, from 57.
---
 .../chemistry/reagents/medicine_reagents.dm   | 25 +++++++++++++++++++
 .../reagents/reagent_containers/hypospray.dm  |  6 ++---
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index aaa7e30de0..aa7566597b 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -1056,6 +1056,31 @@
 	..()
 	. = 1
 
+/datum/reagent/medicine/neo_jelly
+    name = "Neo Jelly"
+    id = "neo_jelly"
+    description = "Gradually regenerates all types of damage, without harming slime anatomy.Can OD"
+    reagent_state = LIQUID
+    metabolization_rate = 1 * REAGENTS_METABOLISM
+    color = "#91D865"
+    overdose_threshold = 30
+    taste_description = "jelly"
+
+/datum/reagent/medicine/neo_jelly/on_mob_life(mob/living/carbon/M)
+    M.adjustBruteLoss(-1.5*REM, 0)
+    M.adjustFireLoss(-1.5*REM, 0)
+    M.adjustOxyLoss(-1.5*REM, 0)
+    M.adjustToxLoss(-1.5*REM, 0, TRUE) //heals TOXINLOVERs
+    . = 1
+    ..()
+
+/datum/reagent/medicine/neo_jelly/overdose_process(mob/living/M)
+    M.adjustOxyLoss(2.6*REM, 0)
+    M.adjustBruteLoss(3.5*REM, 0)
+    M.adjustFireLoss(3.5*REM, 0)
+    ..()
+    . = 1
+
 /datum/reagent/medicine/earthsblood //Created by ambrosia gaia plants
 	name = "Earthsblood"
 	id = "earthsblood"
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index 1fa8b408cd..b88f680dbb 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -156,9 +156,9 @@
 	name = "survival medipen"
 	desc = "A medipen for surviving in the harshest of environments, heals and protects from environmental hazards. WARNING: Do not inject more than one pen in quick succession."
 	icon_state = "stimpen"
-	volume = 57
-	amount_per_transfer_from_this = 57
-	list_reagents = list("salbutamol" = 10, "leporazine" = 15, "tricordrazine" = 15, "epinephrine" = 10, "lavaland_extract" = 2, "omnizine" = 5)
+	volume = 52
+	amount_per_transfer_from_this = 52
+	list_reagents = list("salbutamol" = 10, "leporazine" = 15, "neo_jelly" = 15, "epinephrine" = 10, "lavaland_extract" = 2)
 
 /obj/item/reagent_containers/hypospray/medipen/species_mutator
 	name = "species mutator medipen"