Chemistry Tweaks

code/modules/reagents/Chemistry-Reagents.dm

@@ -2264,46 +2264,6 @@ datum
 				..()
 				return
 
-
-		potassium_chloride
-			name = "Potassium Chloride"
-			id = "potassium_chloride"
-			description = "A delicious salt that stops the heart when injected into cardiac muscle."
-			reagent_state = SOLID
-			color = "#FFFFFF" // rgb: 255,255,255
-			overdose = 30
-
-			on_mob_life(var/mob/living/carbon/M as mob)
-				var/mob/living/carbon/human/H = M
-				if(H.stat != 1)
-					if (volume >= overdose)
-						if(H.losebreath >= 10)
-							H.losebreath = max(10, H.losebreath-10)
-						H.adjustOxyLoss(2)
-						H.Weaken(10)
-				..()
-				return
-
-		potassium_chlorophoride
-			name = "Potassium Chlorophoride"
-			id = "potassium_chlorophoride"
-			description = "A specific chemical based on Potassium Chloride to stop the heart for surgery. Not safe to eat!"
-			reagent_state = SOLID
-			color = "#FFFFFF" // rgb: 255,255,255
-			overdose = 20
-
-			on_mob_life(var/mob/living/carbon/M as mob)
-				if(ishuman(M))
-					var/mob/living/carbon/human/H = M
-					if(H.stat != 1)
-						if(H.losebreath >= 10)
-							H.losebreath = max(10, M.losebreath-10)
-						H.adjustOxyLoss(2)
-						H.Weaken(10)
-				..()
-				return
-
-
 /////////////////////////Food Reagents////////////////////////////
 // Part of the food code. Nutriment is used instead of the old "heal_amt" code. Also is where all the food
 // 	condiments, additives, and such go.
@@ -3631,6 +3591,11 @@ datum
 				reagent_state = LIQUID
 				color = "#664300" // rgb: 102, 67, 0
 
+				on_mob_life(var/mob/living/M as mob)
+					M.Stun(2)
+					..()
+					return
+
 			changelingsting
 				name = "Changeling Sting"
 				id = "changelingsting"
@@ -3868,10 +3833,6 @@ datum
 				reagent_state = LIQUID
 				color = "#664300" // rgb: 102, 67, 0
 
-				on_mob_life(var/mob/living/M as mob)
-					..()
-					M.stunned = 4
-					return
 
 			neurotoxin
 				name = "Neurotoxin"
@@ -3881,12 +3842,22 @@ datum
 				color = "#2E2E61" // rgb: 46, 46, 97
 
 				on_mob_life(var/mob/living/M as mob)
+					M.weakened = max(M.weakened, 3)
+					if(!data)
+						data = 1
+					data++
+					M.dizziness +=6
+					if(data >= 15 && data <45)
+						if (!M.slurring)
+							M.slurring = 1
+						M.slurring += 3
+					else if(data >= 45 && prob(50) && data <55)
+						M.confused = max(M.confused+3,0)
+					else if(data >=55)
+						M.druggy = max(M.druggy, 55)
+					else if(data >=200)
+						M.adjustToxLoss(2)
 					..()
-					if(!M) M = holder.my_atom
-					M:adjustOxyLoss(0.5)
-					M:adjustOxyLoss(0.5)
-					M:weakened = max(M:weakened, 15)
-					M:silent = max(M:silent, 15)
 					return
 
 			bananahonk

code/modules/reagents/Chemistry-Recipes.dm

@@ -338,8 +338,8 @@ datum
 			name = "Glycerol"
 			id = "glycerol"
 			result = "glycerol"
-			required_reagents = list("cornoil" = 3, "sacid" = 2)
-			result_amount = 5
+			required_reagents = list("cornoil" = 3, "sacid" = 1)
+			result_amount = 1
 
 		nitroglycerin
 			name = "Nitroglycerin"
@@ -459,20 +459,6 @@ datum
 			required_reagents = list("ethanol" = 1, "chlorine" = 3, "water" = 1)
 			result_amount = 1
 
-		potassium_chloride
-			name = "Potassium Chloride"
-			id = "potassium_chloride"
-			result = "potassium_chloride"
-			required_reagents = list("sodiumchloride" = 1, "potassium" = 1)
-			result_amount = 2
-
-		potassium_chlorophoride
-			name = "Potassium Chlorophoride"
-			id = "potassium_chlorophoride"
-			result = "potassium_chlorophoride"
-			required_reagents = list("potassium_chloride" = 1, "plasma" = 1, "chloralhydrate" = 1)
-			result_amount = 4
-
 		stoxin
 			name = "Sleep Toxin"
 			id = "stoxin"
@@ -484,8 +470,8 @@ datum
 			name = "Zombie Powder"
 			id = "zombiepowder"
 			result = "zombiepowder"
-			required_reagents = list("carpotoxin" = 1, "stoxin" = 1, "copper" = 1)
-			result_amount = 3
+			required_reagents = list("carpotoxin" = 5, "stoxin" = 5, "copper" = 5)
+			result_amount = 2
 
 		mutetoxin
 			name = "Mute toxin"

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -1243,8 +1243,7 @@
 	icon_state = "chinese2"
 	New()
 		..()
-		reagents.add_reagent("nutriment", 5)
-		reagents.add_reagent("carpotoxin", 1)
+		reagents.add_reagent("nutriment", 6)
 		bitesize = 2
 
 /obj/item/weapon/reagent_containers/food/snacks/chinese/newdles

code/modules/reagents/reagent_containers/syringes.dm

@@ -64,11 +64,11 @@
 			user << "\red This syringe is broken!"
 			return
 
-		if (user.a_intent == "harm" && ismob(target))
+/*		if (user.a_intent == "harm" && ismob(target))
 			if((M_CLUMSY in user.mutations) && prob(50))
 				target = user
 			syringestab(target, user)
-			return
+			return */
 
 
 		switch(mode)

code/modules/research/designs/weapon_designs.dm

@@ -78,7 +78,7 @@
 	build_path = /obj/item/weapon/gun/energy/lasercannon
 	locked = 1
 	category = list("Weapons")
-	
+
 /datum/design/receiver
 	name = "Modular Receiver"
 	desc = "A prototype modular receiver and trigger assembly for a variety of firearms."
@@ -129,7 +129,6 @@
 	build_type = PROTOLATHE
 	materials = list("$metal" = 5000, "$glass" = 1000)
 	build_path = /obj/item/weapon/gun/syringe/rapidsyringe
-	locked = 1
 	category = list("Weapons")
 
 /datum/design/stunshell