Red Nightshade Tweaks/Fixes/Buffs (#14178)

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm

@@ -648,7 +648,7 @@
 	taste_mult = 2
 
 /mob/living/carbon/human/proc/berserk_start()
-	to_chat(src, SPAN_DANGER("An uncontrollable rage overtakes your thoughts!"))
+	to_chat(src, SPAN_DANGER("An uncontrollable rage courses through your body and overtakes your thoughts - your blood begins to boil with fury!"))
 	add_client_color(/datum/client_color/berserk)
 	shock_stage = 0
 	SetParalysis(0)
@@ -666,17 +666,18 @@
 	adjustHalLoss(-1)
 
 /mob/living/carbon/human/proc/berserk_stop()
-	to_chat(src, SPAN_DANGER("Your rage fades away, your thoughts are clear once more!"))
+	to_chat(src, SPAN_DANGER("Your rage fades away and the boiling sensation subsides, your thoughts are clear once more."))
 	remove_client_color(/datum/client_color/berserk)
 
 /decl/reagent/toxin/berserk
 	name = "Red Nightshade"
-	description = "An illegal combat performance enhancer originating from the criminal syndicates of Mars. The drug stimulates regions of the brain responsible for violence and rage, inducing a feral, berserk state in users."
+	description = "An illegal combat performance enhancer originating from the criminal syndicates of Mars. The drug stimulates regions of the brain responsible for violence and rage, inducing a feral, berserk state in users. It is incredibly hard on the liver."
 	reagent_state = LIQUID
 	color = "#AF111C"
-	strength = 5
-	taste_description = "bitterness"
-	metabolism = REM * 2
+	strength = 3
+	overdose = 10
+	taste_description = "popping candy"
+	metabolism = REM*0.3 //10u = ~5 minutes of being berserk.
 	unaffected_species = IS_DIONA | IS_MACHINE
 
 /decl/reagent/toxin/berserk/initial_effect(var/mob/living/carbon/human/H, var/alien, var/holder)
@@ -698,9 +699,14 @@
 	M.add_chemical_effect(CE_BERSERK, 1)
 	if(M.a_intent != I_HURT)
 		M.a_intent_change(I_HURT)
-	var/obj/item/organ/internal/heart = M.internal_organs_by_name[BP_HEART]
-	if(heart)
-		M.add_chemical_effect(CE_CARDIOTOXIC, removed * 0.020)
+	if(prob(3))
+		to_chat(M, SPAN_WARNING(pick("Your blood boils with rage!", "A monster stirs within you - let it out.", "You feel an overwhelming sense of rage!", "You cannot contain your anger!", "You struggle to relax - a fury stirs within you.", "You feel an electric sensation course through your body!")))
+	if(prob(5))
+		M.emote(pick("twitch_v", "grunt"))
+
+/decl/reagent/toxin/berserk/overdose(var/mob/living/carbon/M, var/datum/reagents/holder)
+	if(prob(25))
+		M.add_chemical_effect(CE_CARDIOTOXIC, 1)
 
 /decl/reagent/toxin/spectrocybin
 	name = "Spectrocybin"

code/modules/reagents/Chemistry-Recipes.dm

@@ -754,7 +754,7 @@
 	name = "Red Nightshade"
 	id = "berserk"
 	result = /decl/reagent/toxin/berserk
-	required_reagents = list(/decl/reagent/psilocybin = 1, /decl/reagent/alcohol/moonshine = 1)
+	required_reagents = list(/decl/reagent/toxin/stimm = 1, /decl/reagent/synaptizine = 1, /decl/reagent/toxin/phoron = 0.1)
 	result_amount = 1
 
 /datum/chemical_reaction/joy

code/modules/reagents/reagent_containers/hypospray.dm

@@ -243,6 +243,14 @@
 
 	reagents_to_add = list(/decl/reagent/tricordrazine = 15, /decl/reagent/inaprovaline = 5, /decl/reagent/dexalin/plus = 5, /decl/reagent/oxycomorphine = 3, /decl/reagent/synaptizine = 2, /decl/reagent/mental/corophenidate = 5)
 
+/obj/item/reagent_containers/hypospray/autoinjector/berserk
+	name_label = "berserk injector"
+	desc = "An injector containing Red Nightshade. Used before fights to induce a berserk state."
+	volume = 5
+	amount_per_transfer_from_this = 5
+
+	reagents_to_add = list(/decl/reagent/toxin/berserk = 5)
+
 /obj/item/reagent_containers/hypospray/autoinjector/trauma
 	name = "trauma hypo-injector"
 	desc = "A special hypospray made to combat most forms of physical trauma."