From 8ba3609a4d8320030c9191d83527e6c15c86be80 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Mon, 10 Jun 2019 00:06:48 -0700
Subject: [PATCH] god why fuck

---
 code/game/objects/items/implants/implant_misc.dm         | 2 +-
 code/modules/antagonists/changeling/powers/adrenaline.dm | 2 +-
 code/modules/mob/living/living.dm                        | 9 +++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/code/game/objects/items/implants/implant_misc.dm b/code/game/objects/items/implants/implant_misc.dm
index 889f702ee7..3a4295c61e 100644
--- a/code/game/objects/items/implants/implant_misc.dm
+++ b/code/game/objects/items/implants/implant_misc.dm
@@ -33,7 +33,7 @@
 /obj/item/implant/adrenalin/activate()
 	. = ..()
 	uses--
-	imp_in.do_adrenaline(150, TRUE, 0, 0, TRUE, list("inaprovaline" = 3, "synaptizine" = 10, "omnizine" = 10, "stimulants" = 10), "<span class='boldnotice'>You feel a sudden surge of energy!</span>")
+	imp_in.do_adrenaline(150, TRUE, 0, 0, TRUE, list("inaprovaline" = 3, "synaptizine" = 10, "regen_jelly" = 10, "stimulants" = 10), "<span class='boldnotice'>You feel a sudden surge of energy!</span>")
 	to_chat(imp_in, "<span class='notice'>You feel a sudden surge of energy!</span>")
 	if(!uses)
 		qdel(src)
diff --git a/code/modules/antagonists/changeling/powers/adrenaline.dm b/code/modules/antagonists/changeling/powers/adrenaline.dm
index 323fc6fd80..479c25070b 100644
--- a/code/modules/antagonists/changeling/powers/adrenaline.dm
+++ b/code/modules/antagonists/changeling/powers/adrenaline.dm
@@ -12,5 +12,5 @@
 
 //Recover from stuns.
 /obj/effect/proc_holder/changeling/adrenaline/sting_action(mob/living/user)
-	user.do_adrenaline(0, FALSE, 70, 0, TRUE, list("epinephrine" = 3, "changelingmeth" = 10, "mannitol" = 10, "omnizine" = 10, "changelingadrenaline" = 5), "<span class='notice'>Energy rushes through us.</span>", 20, 0.75, 0)
+	user.do_adrenaline(0, FALSE, 70, 0, TRUE, list("epinephrine" = 3, "changelingmeth" = 10, "mannitol" = 10, "regen_jelly" = 10, "changelingadrenaline" = 5), "<span class='notice'>Energy rushes through us.</span>", 20, 0.75, 0)
 	return TRUE
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index c10367d24e..69168caad1 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -1189,12 +1189,13 @@
 			clamp_unconscious_to = 0,
 			clamp_immobility_to = 0,
 			reset_misc = TRUE,
-			healing_chems = list("inaprovaline" = 3, "synaptizine" = 10, "omnizine" = 10, "stimulants" = 10),
+			healing_chems = list("inaprovaline" = 3, "synaptizine" = 10, "regen_jelly" = 10, "stimulants" = 10),
 			message = "<span class='boldnotice'>You feel a surge of energy!</span>",
 			stamina_buffer_boost = 0,				//restores stamina buffer rather than just health
 			scale_stamina_loss_recovery,			//defaults to null. if this is set, restores loss * this stamina. make sure it's a fraction.
 			stamina_loss_recovery_bypass = 0		//amount of stamina loss to ignore during calculation
 		)
+	to_chat(src, message)
 	if(AmountSleeping() > clamp_unconscious_to)
 		SetSleeping(clamp_unconscious_to)
 	if(AmountUnconscious() > clamp_unconscious_to)
@@ -1203,10 +1204,10 @@
 		SetStun(clamp_immobility_to)
 	if(AmountKnockdown() > clamp_immobility_to)
 		SetKnockdown(clamp_immobility_to)
-	adjustStaminaLoss(max(0, -stamina_boost))
-	adjustStaminaLossBuffered(max(0, -stamina_buffer_boost))
+	adjustStaminaLoss(min(0, -stamina_boost))
+	adjustStaminaLossBuffered(min(0, -stamina_buffer_boost))
 	if(scale_stamina_loss_recovery)
-		adjustStaminaLoss(max(-((getStaminaLoss() - stamina_loss_recovery_bypass) * scale_stamina_loss_recovery), 0))
+		adjustStaminaLoss(min(-((getStaminaLoss() - stamina_loss_recovery_bypass) * scale_stamina_loss_recovery), 0))
 	if(put_on_feet)
 		resting = FALSE
 		lying = FALSE