Delicious Nuka cola is back, with a bottled sprite for its glass (don't question why it turns a glass into a bottle and back again, it is just physics).

Seriously don't remove ice cups from the booze O mat, it is meant to use a cheap Styrofoam cup as its sprite (that's the look I was going for when I made it, after all.. what else would you use?).

Synaptizine is now useful. It reduces weakness/ stun/ silence/ drowsiness/ paralysis to zero. Meaning you can't be stunned, or knocked down for more than a moment. it is great for when a rogue borg rolls around or if you need to revive some one who was stunned by a shocked door (but not killed by it) or if you just need to get away from those dang security officers. It'll do more too, but it is pretty much anti-zombie powder (just it can't cancel the toxic effects of zombie powder).

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2143 316c924e-a436-60f5-8080-3fe189b3f50e

code/modules/chemical/Chemistry-Reagents.dm

@@ -1260,10 +1260,11 @@ datum
 
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
-				M:drowsyness = max(M:drowsyness-5, 0)
-				if(M:paralysis) M:paralysis--
-				if(M:stunned) M:stunned--
-				if(M:weakened) M:weakened--
+				M:silent = 0
+				M:drowsyness = 0
+				M:paralysis = 0
+				M:stunned = 0
+				M:weakened = 0
 				..()
 				return
 
@@ -2207,7 +2208,7 @@ datum
 				..()
 				return
 
-/*		nuka_cola
+		nuka_cola
 			name = "Nuka Cola"
 			id = "nuka_cola"
 			description = "Cola, cola never changes."
@@ -2224,7 +2225,7 @@ datum
 					M.bodytemperature = max(310, M.bodytemperature-5)
 				M:nutrition += 1
 				..()
-				return*/
+				return
 
 		spacemountainwind
 			name = "Space Mountain Wind"

code/modules/chemical/Chemistry-Recipes.dm

@@ -772,6 +772,7 @@ datum
 
 ////////////////////////////////////////// COCKTAILS //////////////////////////////////////
 
+
 		goldschlager
 			name = "Goldschlager"
 			id = "goldschlager"
@@ -807,6 +808,13 @@ datum
 			required_reagents = list("ice" = 1, "coffee" = 3)
 			result_amount = 4
 
+		nuka_cola
+			name = "Nuka Cola"
+			id = "nuka_cola"
+			result = "nuka_cola"
+			required_reagents = list("uranium" = 1, "cola" = 6)
+			result_amount = 6
+
 		moonshine
 			name = "Moonshine"
 			id = "moonshine"
@@ -1139,13 +1147,6 @@ datum
 			required_reagents = list("rum" = 1, "water" = 1)
 			result_amount = 2
 
-		nuka_cola
-			name = "Nuka Cola"
-			id = "nuka_cola"
-			result = "nuka_cola"
-			required_reagents = list("uranium" = 1, "cola" = 5)
-			result_amount = 5
-
 		soy_latte
 			name = "Soy Latte"
 			id = "soy_latte"

code/modules/chemical/Chemistry-Tools.dm

@@ -2790,6 +2790,10 @@
 					icon_state  = "glass_brown"
 					name = "Glass of Space Cola"
 					desc = "A glass of refreshing Space Cola"
+				if("nuka_cola")
+					icon_state = "nuka_colaglass"
+					name = "Nuka Cola"
+					desc = "Don't cry, Don't raise your eye, It's only nuclear wasteland"
 				if("orangejuice")
 					icon_state = "glass_orange"
 					name = "Glass of Orange juice"
@@ -3087,10 +3091,6 @@
 					icon_state = "grogglass"
 					name = "Grog"
 					desc = "A fine and cepa drink for Space."
-				if("nuka_cola")
-					icon_state = "nuka_colaglass"
-					name = "Nuka Cola"
-					desc = "A high quality Cola promised to make you jitter."
 				if("soy_latte")
 					icon_state = "soy_latte"
 					name = "Soy Latte"