Syntiflesh update:

- Syntiflesh is going to be used in surgery to give people new faces. - syntiflesh can be used in any recipe that requires normal meat. - syntiflesh is made from 5 units of blood and 1 unit of clonexydone. Plasma as a catalyst -5 units of Plasma will be required as a catalyst in: Dexalin, Clonexydone, and Lepozine (requires copper as reagent now). -NOTE: Catalysts are not consumed in reactions! Clonexydone and cryoxydone - result per reaction is three (it used to equal 10 per 3 unit reaction, that made no sense). - Cryoxydone remove a slight amount of cloning damage at 170K. Drinks - 4 new drinks! Atomic Bomb, 3 mile island ice tea, patron, and goldschlager! - Look in the recipe code for how to mix each of them up. Sprites: -Added new Ore sprite for uranium, by Aru - Drink and bottle sprites by Aru - Manipulated Atomic bomb (drink) sprite from Aru and me. - Unused yellowcake sprite (I need to tweak it a little more) Food -Stream lined some food (removed WATER Reagents) - Modified the nutriment value of other foods based on ingredients. -Remember, Amanita is a poisonous mushroom! And, food made from it is also toxic. Several new and exciting items added to reagent grinder: -Bananas, carrots, liberty caps, chili peppers (ice too), and nettles. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1742 316c924e-a436-60f5-8080-3fe189b3f50e
2026-08-23 12:08:28 +01:00 · 2011-06-30 07:24:33 +00:00
parent 85da59dfb0
commit 6b3476ed20
11 changed files with 330 additions and 102 deletions
@@ -504,7 +504,14 @@
 		/obj/item/stack/sheet/clown = "banana",
 		/obj/item/stack/sheet/silver = "silver",
 		/obj/item/stack/sheet/gold = "gold",
+		/obj/item/weapon/reagent_containers/food/snacks/grown/banana = "banana",
+		/obj/item/weapon/reagent_containers/food/snacks/grown/carrot = "imidazoline",
 		/obj/item/weapon/reagent_containers/food/snacks/grown/corn = "cornoil",
+		/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap = "psilocybin",
+		/obj/item/weapon/reagent_containers/food/snacks/grown/chili = "capsaicin",
+		/obj/item/weapon/reagent_containers/food/snacks/grown/icepepper = "frostoil",
+		/obj/item/weapon/grown/nettle = "acid",
+		/obj/item/weapon/grown/deathnettle = "pacid",
 	)

 /obj/machinery/reagentgrinder/New()
@@ -625,7 +632,20 @@
 	else if (O.potency == -1)
 		return 5
 	else
-		return round(5*sqrt(O.potency))
+		return round(O.potency / 5)
+
+/obj/machinery/reagentgrinder/proc/get_grownweapon_id(var/obj/item/weapon/grown/O)
+	for (var/i in allowed_items)
+		if (istype(O, i))
+			return allowed_items[i]
+
+/obj/machinery/reagentgrinder/proc/get_grownweapon_amount(var/obj/item/weapon/grown/O)
+	if (!istype(O))
+		return 5
+	else if (O.potency == -1)
+		return 5
+	else
+		return round(O.potency)

 /obj/machinery/reagentgrinder/proc/get_grind_id(var/obj/item/stack/sheet/O)
 	for (var/i in allowed_items)
@@ -636,12 +656,12 @@
 	return 20

 /obj/machinery/reagentgrinder/proc/grind()
-	power_change() //it is a portable machine
+	power_change()
 	if(stat & (NOPOWER|BROKEN))
 		return
 	if (!beaker || beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
 		return
-	playsound(src.loc, 'juicer.ogg', 50, 1)
+	playsound(src.loc, 'juicer.ogg', 20, 1)
 	for (var/obj/item/weapon/reagent_containers/food/snacks/O in src.contents)
 		var/r_id = get_juice_id(O)
 		beaker.reagents.add_reagent(r_id,get_juice_amount(O))
@@ -652,5 +672,11 @@
 		var/g_id = get_grind_id(O)
 		beaker.reagents.add_reagent(g_id,get_grind_amount(O))
 		del(O)
+		if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
+			break
+	for (var/obj/item/weapon/grown/O in src.contents)
+		var/g_id = get_grownweapon_id(O)
+		beaker.reagents.add_reagent(g_id,get_grownweapon_amount(O))
+		del(O)
 		if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
 			break
@@ -227,27 +227,6 @@ datum
 						T.wet_overlay = null
 					return

-		bilk
-			name = "Bilk"
-			id = "bilk"
-			description = "This appears to be beer mixed with milk. Disgusting."
-			reagent_state = LIQUID
-			on_mob_life(var/mob/living/M as mob)
-				if(M:bruteloss && prob(10)) M:heal_organ_damage(1,0)
-				M:nutrition += 2
-				if(!data) data = 1
-				data++
-				M.make_dizzy(3)
-				M:jitteriness = max(M:jitteriness-3,0)
-				if(data >= 25)
-					if (!M:stuttering) M:stuttering = 1
-					M:stuttering += 3
-				if(data >= 40 && prob(33))
-					if (!M:confused) M:confused = 1
-					M:confused += 2
-				..()
-				return
-
 		anti_toxin
 			name = "Anti-Toxin (Dylovene)"
 			id = "anti_toxin"
@@ -1134,6 +1113,7 @@ datum
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
 				if(M.bodytemperature < 170)
+					if(M:cloneloss) M:cloneloss = max(0, M:cloneloss-1)
 					if(M:oxyloss) M:oxyloss = max(0, M:oxyloss-3)
 					M:heal_organ_damage(3,3)
 					if(M:toxloss) M:toxloss = max(0, M:toxloss-3)
@@ -1291,6 +1271,7 @@ datum
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
 				if(!data) data = 1
+				data++
 				switch(data)
 					if(1)
 						M:confused += 2
@@ -1300,7 +1281,6 @@ datum
 					if(51 to INFINITY)
 						M:sleeping += 1
 						M:toxloss += (data - 50)
-				data++
 				..()
 				return

@@ -2099,6 +2079,97 @@ datum

 /////////////////////////////////////////////////////////////////cocktail entities//////////////////////////////////////////////

+		bilk
+			name = "Bilk"
+			id = "bilk"
+			description = "This appears to be beer mixed with milk. Disgusting."
+			reagent_state = LIQUID
+			on_mob_life(var/mob/living/M as mob)
+				if(M:bruteloss && prob(10)) M:heal_organ_damage(1,0)
+				M:nutrition += 2
+				if(!data) data = 1
+				data++
+				M.make_dizzy(3)
+				M:jitteriness = max(M:jitteriness-3,0)
+				if(data >= 25)
+					if (!M:stuttering) M:stuttering = 1
+					M:stuttering += 3
+				if(data >= 40 && prob(33))
+					if (!M:confused) M:confused = 1
+					M:confused += 2
+				..()
+				return
+
+		atomicbomb
+			name = "Atomic Bomb"
+			id = "atomicbomb"
+			description = "Nuclear proliferation never tasted so good."
+			reagent_state = LIQUID
+			on_mob_life(var/mob/living/M as mob)
+				M.druggy = max(M.druggy, 50)
+				M.confused = max(M:confused+2,0)
+				M.make_dizzy(10)
+				if (!M.stuttering) M.stuttering = 1
+				M.stuttering += 3
+				if(!data) data = 1
+				data++
+				switch(data)
+					if(51 to INFINITY)
+						M:sleeping += 1
+				..()
+				return
+
+		threemileisland
+			name = "THree Mile Island Iced Tea"
+			id = "threemileisland"
+			description = "Made for a woman, strong enough for a man."
+			reagent_state = LIQUID
+			on_mob_life(var/mob/living/M as mob)
+				if(!data) data = 1
+				data++
+				M.dizziness +=3
+				M.druggy = max(M.druggy, 50)
+				if(data >= 35 && data <90)
+					if (!M.stuttering) M.stuttering = 1
+					M.stuttering += 3
+				else if(data >= 90)
+					M.confused = max(M:confused+2,0)
+				..()
+				return
+
+		goldschlager
+			name = "Goldschlager"
+			id = "goldschlager"
+			description = "100 proof cinnamon schnapps, made for alcoholic teen girls on spring break."
+			reagent_state = LIQUID
+			on_mob_life(var/mob/living/M as mob)
+				if(!data) data = 1
+				data++
+				M.dizziness +=3
+				if(data >= 45 && data <125)
+					if (!M.stuttering) M.stuttering = 1
+					M.stuttering += 3
+				else if(data >= 125 && prob(33))
+					M.confused = max(M:confused+2,0)
+				..()
+				return
+
+		patron
+			name = "Patron"
+			id = "patron"
+			description = "Tequila with silver in it, a favorite of alcoholic women in the club scene."
+			reagent_state = LIQUID
+			on_mob_life(var/mob/living/M as mob)
+				if(!data) data = 1
+				data++
+				M.dizziness +=3
+				if(data >= 45 && data <125)
+					if (!M.stuttering) M.stuttering = 1
+					M.stuttering += 3
+				else if(data >= 125 && prob(33))
+					M.confused = max(M:confused+2,0)
+				..()
+				return

 		gintonic
 			name = "Gin and Tonic"
@@ -14,13 +14,6 @@ datum

 		//I recommend you set the result amount to the total volume of all components.

-		bilk
-			name = "Bilk"
-			id = "bilk"
-			result = "bilk"
-			required_reagents = list("milk" = 1, "beer" = 1)
-			result_amount = 2
-
 		explosion_potassium
 			name = "Explosion"
 			id = "explosion_potassium"
@@ -152,7 +145,8 @@ datum
 			name = "Leporazine"
 			id = "leporazine"
 			result = "leporazine"
-			required_reagents = list("silicon" = 1, "plasma" = 1, )
+			required_reagents = list("silicon" = 1, "copper" = 1)
+			required_catalysts = list("plasma" = 5)
 			result_amount = 2

 		cryptobiolin
@@ -180,8 +174,9 @@ datum
 			name = "Dexalin"
 			id = "dexalin"
 			result = "dexalin"
-			required_reagents = list("plasma" = 1, "oxygen" = 1)
-			result_amount = 2
+			required_reagents = list("oxygen" = 2)
+			required_catalysts = list("plasma" = 5)
+			result_amount = 1

 		dexalinp
 			name = "Dexalin Plus"
@@ -216,14 +211,15 @@ datum
 			id = "cryoxadone"
 			result = "cryoxadone"
 			required_reagents = list("dexalin" = 1, "water" = 1, "oxygen" = 1)
-			result_amount = 10
+			result_amount = 3

 		clonexadone
 			name = "Clonexadone"
 			id = "clonexadone"
 			result = "clonexadone"
-			required_reagents = list("plasma" = 1, "cryoxadone" = 1, "sodium" = 1)
-			result_amount = 10
+			required_reagents = list("cryoxadone" = 1, "sodium" = 1)
+			required_catalysts = list("plasma" = 5)
+			result_amount = 2

 		spaceacillin
 			name = "Spaceacillin"
@@ -526,6 +522,18 @@ datum
 				new /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesewheel(location)
 				return

+		syntiflesh
+			name = "Syntiflesh"
+			id = "syntiflesh"
+			result = null
+			required_reagents = list("blood" = 5)
+			required_catalysts = list("clonexadone" = 1)
+			result_amount = 1
+			on_reaction(var/datum/reagents/holder, var/created_volume)
+				var/location = get_turf(holder.my_atom)
+				new /obj/item/weapon/syntiflesh(location)
+				return
+
 		hot_ramen
 			name = "Hot Ramen"
 			id = "hot_ramen"
@@ -543,6 +551,27 @@ datum

 ////////////////////////////////////////// COCKTAILS //////////////////////////////////////

+		goldschlager
+			name = "Goldschlager"
+			id = "goldschlager"
+			result = "goldschlager"
+			required_reagents = list("vodka" = 10, "gold" = 1)
+			result_amount = 10
+
+		patron
+			name = "Patron"
+			id = "patron"
+			result = "patron"
+			required_reagents = list("tequilla" = 10, "silver" = 1)
+			result_amount = 10
+
+		bilk
+			name = "Bilk"
+			id = "bilk"
+			result = "bilk"
+			required_reagents = list("milk" = 1, "beer" = 1)
+			result_amount = 2
+
 		icetea
 			name = "Iced Tea"
 			id = "icetea"
@@ -724,6 +753,13 @@ datum
 			required_reagents = list("irishcream" = 1, "kahlua" = 1, "cognac" = 1)
 			result_amount = 3

+		atomicbomb
+			name = "Atomic Bomb"
+			id = "atomicbomb"
+			result = "atomicbomb"
+			required_reagents = list("b52" = 10, "uranium" = 1)
+			result_amount = 10
+
 		margarita
 			name = "Margarita"
 			id = "margarita"
@@ -738,6 +774,13 @@ datum
 			required_reagents = list("vodka" = 1, "gin" = 1, "tequilla" = 1, "cubalibre" = 1)
 			result_amount = 4

+		threemileisland
+			name = "Three Mile Island Iced Tea"
+			id = "threemileisland"
+			result = "threemileisland"
+			required_reagents = list("longislandicedtea" = 10, "uranium" = 1)
+			result_amount = 10
+
 		whiskeysoda
 			name = "Whiskey Soda"
 			id = "whiskeysoda"
@@ -2162,6 +2162,14 @@
 		..()
 		reagents.add_reagent("tequilla", 100)

+/obj/item/weapon/reagent_containers/food/drinks/bottle/patron
+	name = "Wrapp Artiste Patron"
+	desc = "Silver laced tequilla, served in space night clubs across the galaxy."
+	icon_state = "patronbottle"
+	New()
+		..()
+		reagents.add_reagent("patron", 100)
+
 /obj/item/weapon/reagent_containers/food/drinks/bottle/rum
 	name = "Captain Pete's Cuban Spiced Rum"
 	desc = "This isn't just rum, oh no. It's practically GRIFF in a bottle."
@@ -2186,6 +2194,14 @@
 		..()
 		reagents.add_reagent("kahlua", 100)

+/obj/item/weapon/reagent_containers/food/drinks/bottle/goldschlager
+	name = "College Girl Goldschlager"
+	desc = "Because they are the only ones who will drink 100 proof cinnamon schnapps."
+	icon_state = "goldschlagerbottle"
+	New()
+		..()
+		reagents.add_reagent("goldschlager", 100)
+
 /obj/item/weapon/reagent_containers/food/drinks/bottle/cognac
 	name = "Chateau De Baton Premium Cognac"
 	desc = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. You might as well not scream 'SHITCURITY' this time."
@@ -2451,6 +2467,10 @@
 					icon_state = "glass_red"
 					name = "Glass of Tomato juice"
 					desc = "Are you sure this is tomato juice?"
+				if("blood")
+					icon_state = "glass_red"
+					name = "Glass of Tomato juice"
+					desc = "Are you sure this is tomato juice?"
 				if("limejuice")
 					icon_state = "glass_green"
 					name = "Glass of Lime juice"
@@ -2467,6 +2487,10 @@
 					icon_state = "ginvodkaglass"
 					name = "Glass of vodka"
 					desc = "The glass contain wodka. Xynta."
+				if("goldschlager")
+					icon_state = "ginvodkaglass"
+					name = "Glass of goldschlager"
+					desc = "100 proof that teen girls will drink anything with gold in it."
 				if("wine")
 					icon_state = "wineglass"
 					name = "Glass of wine"
@@ -2487,6 +2511,10 @@
 					icon_state = "tequillaglass"
 					name = "Glass of Tequilla"
 					desc = "Now all that's missing is the weird colored shades!"
+				if("patron")
+					icon_state = "patronglass"
+					name = "Glass of Patron"
+					desc = "Drinking patron in the bar, with all the subpar ladies."
 				if("rum")
 					icon_state = "rumglass"
 					name = "Glass of Rum"
@@ -2567,10 +2595,18 @@
 					icon_state = "b52glass"
 					name = "B-52"
 					desc = "Kahlua, Irish Cream, and congac. You will get bombed."
+				if("atomicbomb")
+					icon_state = "atomicbombglass"
+					name = "Atomic Bomb"
+					desc = "Nanotrasen cannot take legal responsibility for your actions after imbibing."
 				if("longislandicedtea")
 					icon_state = "longislandicedteaglass"
 					name = "Long Island Iced Tea"
 					desc = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only."
+				if("threemileisland")
+					icon_state = "threemileislandglass"
+					name = "Three Mile Island Ice Tea"
+					desc = "A glass of this is sure to prevent a melt down."
 				if("margarita")
 					icon_state = "margaritaglass"
 					name = "Margarita"