diff --git a/code/modules/mob/living/carbon/shock.dm b/code/modules/mob/living/carbon/shock.dm
index 4a4be2997c8..258067ebdde 100644
--- a/code/modules/mob/living/carbon/shock.dm
+++ b/code/modules/mob/living/carbon/shock.dm
@@ -11,12 +11,10 @@
 	1	* src.getCloneLoss() + 		\
 	1	* src.halloss
 
-	if(reagents.has_reagent("acetaminophen"))
-		src.traumatic_shock -= 40
-	if(reagents.has_reagent("morphine"))
-		src.traumatic_shock -= 60
-	if(reagents.has_reagent("hydrocodone"))
-		src.traumatic_shock -= 200
+	if(reagents)
+		for(var/datum/reagent/R in reagents.reagent_list)
+			if(R.shock_reduction)
+				src.traumatic_shock -= R.shock_reduction // now you too can varedit cyanide to reduce shock by 1000 - Iamgoofball
 	if(src.slurring)
 		src.traumatic_shock -= 10
 	if(src.analgesic)
diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index 830ecee82d1..b36e2b54930 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -864,6 +864,7 @@ datum
 			description = "Most probably know this as Tylenol. This chemical is a mild, simple painkiller."
 			reagent_state = LIQUID
 			color = "#C855DC"
+			shock_reduction = 40
 			metabolization_rate = 0.2 // Lasts 2.5 minutes for 15 units
 
 			on_mob_life(var/mob/living/M as mob) // what the fuck are you idiots smoking
@@ -906,6 +907,7 @@ datum
 			reagent_state = LIQUID
 			color = "#C805DC"
 			metabolization_rate = 0.3 // Lasts 1.5 minutes for 15 units
+			shock_reduction = 200
 
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
diff --git a/code/modules/reagents/newchem/drugs.dm b/code/modules/reagents/newchem/drugs.dm
index d31da3512d2..6b3e34759db 100644
--- a/code/modules/reagents/newchem/drugs.dm
+++ b/code/modules/reagents/newchem/drugs.dm
@@ -188,8 +188,8 @@ datum/reagent/crank/addiction_act_stage4(var/mob/living/M as mob)
 		if(I)
 			M.drop_item()
 	..()
-	if(prob(20))
-		M.adjustToxLoss(5)
+	if(prob(50))
+		M.adjustToxLoss(10)
 	M.adjustBrainLoss(pick(0.5, 0.6, 0.7, 0.8, 0.9, 1))
 	return
 
diff --git a/code/modules/reagents/newchem/medicine.dm b/code/modules/reagents/newchem/medicine.dm
index 567f22a2ba0..4ff8737df4c 100644
--- a/code/modules/reagents/newchem/medicine.dm
+++ b/code/modules/reagents/newchem/medicine.dm
@@ -430,7 +430,7 @@ datum/reagent/morphine
 	var/cycle_count = 0
 	overdose_threshold = 30
 	addiction_threshold = 25
-
+	shock_reduction = 60
 
 datum/reagent/morphine/on_mob_life(var/mob/living/M as mob)
 	if(!M) M = holder.my_atom