diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index af2f39ba8ae..bb314e8ac23 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -3102,7 +3102,7 @@ datum
 		brave_bull
 			name = "Brave Bull"
 			id = "bravebull"
-			description = "A strange yet pleasurable mixture made of vodka, tomato and lime juice. Or at least you THINK the red stuff is tomato juice."
+			description = "It's just as effective as Dutch-Courage!."
 			reagent_state = LIQUID
 			color = "#664300" // rgb: 102, 67, 0
 
@@ -3140,7 +3140,7 @@ datum
 		toxins_special
 			name = "Toxins Special"
 			id = "toxinsspecial"
-			description = "This thing is FLAMING!. CALL THE DAMN SHUTTLE!"
+			description = "This thing is ON FIRE!. CALL THE DAMN SHUTTLE!"
 			reagent_state = LIQUID
 			color = "#664300" // rgb: 102, 67, 0
 
@@ -3390,7 +3390,7 @@ datum
 		whiskeysoda
 			name = "Whiskey Soda"
 			id = "whiskeysoda"
-			description = "Ultimate refreshment."
+			description = "For the more refined griffon."
 			reagent_state = LIQUID
 			color = "#664300" // rgb: 102, 67, 0
 
@@ -3525,7 +3525,7 @@ datum
 		bahama_mama
 			name = "Bahama mama"
 			id = "bahama_mama"
-			description = "Tropic cocktail."
+			description = "Tropical cocktail."
 			reagent_state = LIQUID
 			color = "#664300" // rgb: 102, 67, 0
 
@@ -3731,7 +3731,7 @@ datum
 		alliescocktail
 			name = "Allies Cocktail"
 			id = "alliescocktail"
-			description = "A drink made from your allies."
+			description = "A drink made from your allies, not as sweet as when made from your enemies."
 			reagent_state = LIQUID
 			color = "#664300" // rgb: 102, 67, 0
 
@@ -3790,7 +3790,7 @@ datum
 		acid_spit
 			name = "Acid Spit"
 			id = "acidspit"
-			description = "A drink by Nanotrasen. Made from live aliens."
+			description = "A drink for the daring, can be deadly if incorrectly prepared!"
 			reagent_state = LIQUID
 			color = "#365000" // rgb: 54, 80, 0
 
@@ -3809,12 +3809,12 @@ datum
 		amasec
 			name = "Amasec"
 			id = "amasec"
-			description = "Official drink of the Imperium."
+			description = "Official drink of the Nanotrasen Gun-Club!"
 			reagent_state = LIQUID
 			color = "#664300" // rgb: 102, 67, 0
 
 			on_mob_life(var/mob/living/M as mob)
-				M.stunned = 4
+				M.stunned = 1
 				if(!data) data = 1
 				data++
 				M.dizziness +=4
@@ -3835,10 +3835,7 @@ datum
 
 			on_mob_life(var/mob/living/carbon/M as mob)
 				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)
+				M.weakened = max(M.weakened, 3)
 				if(!data) data = 1
 				data++
 				M.dizziness +=6
@@ -3857,7 +3854,7 @@ datum
 		hippies_delight
 			name = "Hippie's Delight"
 			id = "hippiesdelight"
-			description = "A drink enjoyed by people during the 1960's."
+			description = "You just don't get it maaaan."
 			reagent_state = LIQUID
 			color = "#664300" // rgb: 102, 67, 0
 
@@ -3948,7 +3945,7 @@ datum
 		changelingsting
 			name = "Changeling Sting"
 			id = "changelingsting"
-			description = "A stingy drink."
+			description = "You take a tiny sip and feel a burning sensation..."
 			reagent_state = LIQUID
 			color = "#2E6671" // rgb: 46, 102, 113
 
@@ -3986,7 +3983,7 @@ datum
 		syndicatebomb
 			name = "Syndicate Bomb"
 			id = "syndicatebomb"
-			description = "A Syndicate bomb"
+			description = "Tastes like terrorism!"
 			reagent_state = LIQUID
 			color = "#2E6671" // rgb: 46, 102, 113
 
diff --git a/html/changelog.html b/html/changelog.html
index 3b9b1cd6dfe..71b0d6d6bb1 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -33,7 +33,7 @@
 <table align='center' class="top">
 	<tr>
 		<td valign='top'>
-			<font size='2'><b>Coders:</b> TLE, NEO, Errorage, muskets, veryinky, Skie, Noise, Numbers, Agouri, Noka, Urist McDorf, Uhangi, Darem, Mport, rastaf0, Doohl, Superxpdude, Rockdtben, ConstantA, Petethegoat, Kor, Polymorph, Carn, Nodrak, Donkie, Sieve, Giacom<br></font>
+			<font size='2'><b>Coders:</b> TLE, NEO, Errorage, muskets, veryinky, Skie, Noise, Numbers, Agouri, Noka, Urist McDorf, Uhangi, Darem, Mport, rastaf0, Doohl, Superxpdude, Rockdtben, ConstantA, Petethegoat, Kor, Polymorph, Carn, Nodrak, Donkie, Sieve, Giacom, trubble_bass.<br></font>
 			<font size='2'><b>Spriters:</b> Agouri, Cheridan, Cruazy Guest, Deeaych, Deuryn, Matty406, Microwave, ShiftyEyesShady, Skie, Uhangi, Veyveyr, Petethegoat, Kor, Ricotez, Ausops, TankNut<br></font>
 			<font size='2'><b>Sounds:</b> Skie, Lasty/Vinyl<br></font>
 			<font size='2'><b>Thanks to:</b> Baystation 12, CDK Station devs, GoonStation devs, the original SpaceStation developers and Invisty for the title image<br></font>
@@ -49,6 +49,14 @@ should be listed in the changelog upon commit tho. Thanks. -->
 
 <!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
 
+<div class="commit sansserif">
+	<h2 class="date">August 25, 2012</h2>
+	<h3 class="author">trubble_bass updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="tweak">Nerfed the Neurotoxin drink, it is now less effective than a stunbaton. But more effective than a Beepsky Smash.</li>
+		<li class="tweak">Updated descriptions on various cocktails to be more accurate or more relevant to the drink itself.</li>
+	</ul>
+</div>
 
 <div class="commit sansserif">
 	<h2 class="date">August 25, 2012</h2>