Added some new drinks to the bar. This includes Erika Surprise, Anti-freeze, snowwhite, syndicate bomb, irish car bomb, devils kiss, demons blood, changeling sting, booger, barefoot, aloe, andalusia and alliescocktail.

Added monkey suit and sexy mime suit to theatre costume storage. Credits for sprites goes to Pybro.

Added the holy flask into chaplains office.

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

code/WorkInProgress/Chemistry-Reagents.dm

@@ -2809,6 +2809,44 @@ datum
 				..()
 				return
 
+		booger
+			name = "Booger"
+			id = "booger"
+			description = "Ewww..."
+			reagent_state = LIQUID
+			color = "#A68310" // rgb: 166, 131, 16
+
+			on_mob_life(var/mob/living/M as mob)
+				if(!data) data = 1
+				data++
+				M.dizziness +=4
+				if(data >= 55 && data <165)
+					if (!M.stuttering) M.stuttering = 1
+					M.stuttering += 4
+				else if(data >= 165 && prob(33))
+					M.confused = max(M:confused+4,0)
+				..()
+				return
+
+		devilskiss
+			name = "Devils Kiss"
+			id = "devilskiss"
+			description = "Creepy time!"
+			reagent_state = LIQUID
+			color = "#A68310" // rgb: 166, 131, 16
+
+			on_mob_life(var/mob/living/M as mob)
+				if(!data) data = 1
+				data++
+				M.dizziness +=4
+				if(data >= 55 && data <165)
+					if (!M.stuttering) M.stuttering = 1
+					M.stuttering += 4
+				else if(data >= 165 && prob(33))
+					M.confused = max(M:confused+4,0)
+				..()
+				return
+
 		bloody_mary
 			name = "Bloody Mary"
 			id = "bloodymary"
@@ -3156,6 +3194,82 @@ datum
 				..()
 				return
 
+		antifreeze
+			name = "Anti-freeze"
+			id = "antifreeze"
+			description = "Ultimate refreshment."
+			reagent_state = LIQUID
+			color = "#664300" // rgb: 102, 67, 0
+
+			on_mob_life(var/mob/living/M as mob)
+				if(!data) data = 1
+				data++
+				M.dizziness +=5
+				if(data >= 55 && data <115)
+					if (!M.stuttering) M.stuttering = 1
+					M.stuttering += 5
+				else if(data >= 115 && prob(33))
+					M.confused = max(M:confused+5,0)
+				..()
+				return
+
+		barefoot
+			name = "Barefoot"
+			id = "barefoot"
+			description = "Barefoot and pregnant"
+			reagent_state = LIQUID
+			color = "#664300" // rgb: 102, 67, 0
+
+			on_mob_life(var/mob/living/M as mob)
+				if(!data) data = 1
+				data++
+				M.dizziness +=5
+				if(data >= 55 && data <115)
+					if (!M.stuttering) M.stuttering = 1
+					M.stuttering += 5
+				else if(data >= 115 && prob(33))
+					M.confused = max(M:confused+5,0)
+				..()
+				return
+
+		snowwhite
+			name = "Snow White"
+			id = "snowwhite"
+			description = "A cold refreshment"
+			reagent_state = LIQUID
+			color = "#664300" // rgb: 102, 67, 0
+
+			on_mob_life(var/mob/living/M as mob)
+				if(!data) data = 1
+				data++
+				M.dizziness +=4
+				if(data >= 55 && data <115)
+					if (!M.stuttering) M.stuttering = 1
+					M.stuttering += 4
+				else if(data >= 115 && prob(30))
+					M.confused = max(M:confused+4,0)
+				..()
+				return
+
+		demonsblood
+			name = "Demons Blood"
+			id = "demonsblood"
+			description = "AHHHH!!!!"
+			reagent_state = LIQUID
+			color = "#664300" // rgb: 102, 67, 0
+
+			on_mob_life(var/mob/living/M as mob)
+				if(!data) data = 1
+				data++
+				M.dizziness +=10
+				if(data >= 55 && data <115)
+					if (!M.stuttering) M.stuttering = 1
+					M.stuttering += 10
+				else if(data >= 115 && prob(90))
+					M.confused = max(M:confused+10,10)
+				..()
+				return
+
 		vodkatonic
 			name = "Vodka and Tonic"
 			id = "vodkatonic"
@@ -3322,6 +3436,63 @@ datum
 				..()
 				return
 
+		aloe
+			name = "Aloe"
+			id = "aloe"
+			description = "So very, very, very good."
+			reagent_state = LIQUID
+			color = "#664300" // rgb: 102, 67, 0
+
+			on_mob_life(var/mob/living/M as mob)
+				if(!data) data = 1
+				data++
+				M.dizziness +=2
+				if(data >= 90 && data <250)
+					if (!M.stuttering) M.stuttering = 1
+					M.stuttering += 2
+				else if(data >= 250 && prob(33))
+					M.confused = max(M:confused+2,0)
+				..()
+				return
+
+		andalusia
+			name = "Andalusia"
+			id = "andalusia"
+			description = "A nice, strange named drink."
+			reagent_state = LIQUID
+			color = "#664300" // rgb: 102, 67, 0
+
+			on_mob_life(var/mob/living/M as mob)
+				if(!data) data = 1
+				data++
+				M.dizziness +=8
+				if(data >= 90 && data <250)
+					if (!M.stuttering) M.stuttering = 1
+					M.stuttering += 1
+				else if(data >= 250 && prob(33))
+					M.confused = max(M:confused+2,0)
+				..()
+				return
+
+		alliescocktail
+			name = "Allies Cocktail"
+			id = "alliescocktail"
+			description = "A drink made from your allies."
+			reagent_state = LIQUID
+			color = "#664300" // rgb: 102, 67, 0
+
+			on_mob_life(var/mob/living/M as mob)
+				if(!data) data = 1
+				data++
+				M.dizziness +=4
+				if(data >= 90 && data <250)
+					if (!M.stuttering) M.stuttering = 1
+					M.stuttering += 7
+				else if(data >= 250 && prob(60))
+					M.confused = max(M:confused+8,0)
+				..()
+				return
+
 		soy_latte
 			name = "Soy Latte"
 			id = "soy_latte"
@@ -3538,4 +3709,80 @@ datum
 				..()
 				return
 
+		changelingsting
+			name = "Changeling Sting"
+			id = "changelingsting"
+			description = "A stingy drink."
+			reagent_state = LIQUID
+			color = "#2E6671" // rgb: 46, 102, 113
+
+			on_mob_life(var/mob/living/M as mob)
+				if(!data) data = 1
+				data++
+				M.dizziness +=5
+				if(data >= 55 && data <115)
+					if (!M.stuttering) M.stuttering = 1
+					M.stuttering += 5
+				else if(data >= 115 && prob(33))
+					M.confused = max(M:confused+15,15)
+				..()
+				return
+
+		irishcarbomb
+			name = "Irish Car Bomb"
+			id = "irishcarbomb"
+			description = "An irish car bomb"
+			reagent_state = LIQUID
+			color = "#2E6671" // rgb: 46, 102, 113
+
+			on_mob_life(var/mob/living/M as mob)
+				if(!data) data = 1
+				data++
+				M.dizziness +=5
+				if(data >= 55 && data <115)
+					if (!M.stuttering) M.stuttering = 1
+					M.stuttering += 5
+				else if(data >= 115 && prob(33))
+					M.confused = max(M:confused+15,15)
+				..()
+				return
+
+		syndicatebomb
+			name = "Syndicate Bomb"
+			id = "syndicatebomb"
+			description = "A Syndicate bomb"
+			reagent_state = LIQUID
+			color = "#2E6671" // rgb: 46, 102, 113
+
+			on_mob_life(var/mob/living/M as mob)
+				if(!data) data = 1
+				data++
+				M.dizziness +=10
+				if(data >= 55 && data <115)
+					if (!M.stuttering) M.stuttering = 1
+					M.stuttering += 10
+				else if(data >= 115 && prob(33))
+					M.confused = max(M:confused+15,15)
+				..()
+				return
+
+		erikasurprise
+			name = "Erika Surprise"
+			id = "erikasurprise"
+			description = "A surprise of Erika"
+			reagent_state = LIQUID
+			color = "#2E6671" // rgb: 46, 102, 113
+
+			on_mob_life(var/mob/living/M as mob)
+				if(!data) data = 1
+				data++
+				M.dizziness +=30
+				if(data >= 55 && data <115)
+					if (!M.stuttering) M.stuttering = 1
+					M.stuttering += 30
+				else if(data >= 115 && prob(60))
+					M.confused = max(M:confused+15,15)
+				..()
+				return
+
 

code/WorkInProgress/Chemistry-Recipes.dm

@@ -1140,3 +1140,100 @@ datum
 			result = "singulo"
 			required_reagents = list("vodka" = 5, "radium" = 1, "acid" = 1, "wine" = 5)
 			result_amount = 10
+
+		aloe
+			name = "Aloe"
+			id = "aloe"
+			result = "aloe"
+			required_reagents = list("cream" = 1, "whiskey" = 1)
+			result_amount = 2
+
+		andalusia
+			name = "Andalusia"
+			id = "andalusia"
+			result = "andalusia"
+			required_reagents = list("rum" = 1, "whiskey" = 1, "lemonjuice" = 1)
+			result_amount = 3
+
+		alliescocktail
+			name = "Allies Cocktail"
+			id = "alliescocktail"
+			result = "alliescocktail"
+			required_reagents = list("gin" = 1, "vermouth" = 1)
+			result_amount = 2
+
+		snowwhite
+			name = "Snow White"
+			id = "snowwhite"
+			result = "snowwhite"
+			required_reagents = list("beer" = 1, "lemon_lime" = 1)
+			result_amount = 2
+
+		devilskiss
+			name = "Devils Kiss"
+			id = "devilskiss"
+			result = "devilskiss"
+			required_reagents = list("blood" = 1, "kahlua" = 1, "rum" = 1)
+			result_amount = 3
+
+		demonsblood
+			name = "Demons Blood"
+			id = "demonsblood"
+			result = "demonsblood"
+			required_reagents = list("rum" = 1, "spacemountainwind" = 1, "blood" = 1, "dr_gibb" = 1)
+			result_amount = 4
+
+		changelingsting
+			name = "Changeling Sting"
+			id = "changelingsting"
+			result = "changelingsting"
+			required_reagents = list("orangejuice" = 1, "limejuice" = 1, "lemonjuice" = 1, "vodka" = 1)
+			result_amount = 4
+
+		booger
+			name = "Booger"
+			id = "booger"
+			result = "booger"
+			required_reagents = list("cream" = 1, "banana" = 1, "rum" = 1, "watermelonjuice" = 1)
+			result_amount = 4
+
+		antifreeze
+			name = "Anti-freeze"
+			id = "antifreeze"
+			result = "antifreeze"
+			required_reagents = list("vodka" = 2, "cream" = 1, "ice" = 1)
+			result_amount = 4
+
+		barefoot
+			name = "Barefoot"
+			id = "barefoot"
+			result = "barefoot"
+			required_reagents = list("vodka" = 1, "cream" = 1, "vermouth" = 1, "whiskey" = 1)
+			result_amount = 4
+
+		irishcarbomb
+			name = "Irish Car Bomb"
+			id = "irishcarbomb"
+			result = "irishcarbomb"
+			required_reagents = list("ale" = 1, "cream" = 1, "whiskey" = 1)
+			result_amount = 3
+
+		syndicatebomb
+			name = "Syndicate Bomb"
+			id = "syndicatebomb"
+			result = "syndicatebomb"
+			required_reagents = list("beer" = 1, "cola" = 1, "whiskey" = 1)
+			result_amount = 3
+
+		erikasurprise
+			name = "Erika Surprise"
+			id = "erikasurprise"
+			result = "erikasurprise"
+			required_reagents = list("ale" = 1, "limejuice" = 1, "whiskey" = 1, "banana" = 1, "ice" = 1)
+			result_amount = 5
+
+
+
+
+
+

code/WorkInProgress/Chemistry-Tools.dm

@@ -2962,6 +2962,58 @@
 					icon_state = "singulo"
 					name = "Singulo"
 					desc = "A blue-space beverage."
+				if("aloe")
+					icon_state = "aloe"
+					name = "Aloe"
+					desc = "Very, very, very good."
+				if("andalusia")
+					icon_state = "andalusia"
+					name = "Andalusia"
+					desc = "A nice, strange named drink."
+				if("alliescocktail")
+					icon_state = "alliescocktail"
+					name = "Allies cocktail"
+					desc = "A drink made from your allies."
+				if("snowwhite")
+					icon_state = "snowwhite"
+					name = "Snow White"
+					desc = "A cold refreshment."
+				if("antifreeze")
+					icon_state = "antifreeze"
+					name = "Anti-freeze"
+					desc = "The ultimate refreshment."
+				if("barefoot")
+					icon_state = "b&p"
+					name = "Barefoot"
+					desc = "Barefoot and pregnant"
+				if("demonsblood")
+					icon_state = "demonsblood"
+					name = "Demons Blood"
+					desc = "Scary....so...scary...AHHH!!!"
+				if("booger")
+					icon_state = "booger"
+					name = "Booger"
+					desc = "Ewww..."
+				if("devilskiss")
+					icon_state = "devilskiss"
+					name = "Devils Kiss"
+					desc = "Creepy time!"
+				if("changelingsting")
+					icon_state = "changelingsting"
+					name = "Changeling sting"
+					desc = "A stingy drink."
+				if("irishcarbomb")
+					icon_state = "irishcarbomb"
+					name = "Irish Car Bomb"
+					desc = "An irish car bomb."
+				if("syndicatebomb")
+					icon_state = "syndicatebomb"
+					name = "Syndicate Bomb"
+					desc = "A syndicate bomb."
+				if("erikasurprise")
+					icon_state = "erikasurprise"
+					name = "Erika Surprise"
+					desc = "A surprise of Erika"
 				else
 					icon_state ="glass_brown"
 					name = "Glass of ..what?"

code/defines/obj/clothing/jumpsuit.dm

@@ -431,6 +431,13 @@
 	item_state = "mime"
 	color = "mime"
 
+/obj/item/clothing/under/sexymime
+	name = "Sexy Mime Outfit"
+	desc = "It's not very colourful."
+	icon_state = "sexymime"
+	item_state = "sexymime"
+	color = "sexymime"
+
 /obj/item/clothing/under/waiter
 	name = "Waiter Outfit"
 	desc = "There is a special pocket for tip."

code/defines/obj/clothing/mask.dm

@@ -125,6 +125,19 @@
 	name = "mime mask"
 	desc = "It looks a little creepy"
 	icon_state = "mime"
+	item_state = "mime"
+
+/obj/item/clothing/mask/gas/monkeymask
+	name = "monkey mask"
+	desc = "This looks very strange...."
+	icon_state = "monkeymask"
+	item_state = "monkeymask"
+
+/obj/item/clothing/mask/gas/sexymime
+	name = "sexy mime mask"
+	desc = "Super creepy..."
+	icon_state = "sexymime"
+	item_state = "sexymime"
 
 /obj/item/clothing/mask/gas/fakemoustache
 	name = "fake moustache"

code/defines/obj/clothing/suit.dm

@@ -652,6 +652,14 @@
 	body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS|FEET|HEAD
 	armor = list(melee = 5, bullet = 2, laser = 2, taser = 2, bomb = 0, bio = 0, rad = 0)
 
+/obj/item/clothing/suit/monkeysuit
+	name = "Monkey Suit"
+	desc = "A suit that looks like a primate"
+	icon_state = "monkeysuit"
+	item_state = "monkeysuit"
+	body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS|FEET|HANDS
+	armor = list(melee = 5, bullet = 2, laser = 2, taser = 2, bomb = 0, bio = 0, rad = 0)
+
 /obj/item/clothing/suit/holidaypriest
 	name = "Holiday Priest"
 	desc = "This is a nice holiday my son."

maps/tgstation.2.0.7.dmm

@@ -1665,7 +1665,7 @@
 "aGa" = (/obj/crematorium,/turf/simulated/floor{icon_state = "dark"},/area/chapel/office)
 "aGb" = (/obj/machinery/crema_switch{pixel_x = 25},/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor{icon_state = "dark"},/area/chapel/office)
 "aGc" = (/obj/table/woodentable,/obj/machinery/light/lamp{pixel_y = 10},/obj/item/weapon/paper{info = "Glauds! How rorm it would be to pell back to the bewl and distunk them, distunk the whole delcot, let the drokes discren them. But you are the gostak. The gostak distims the doshes. And no glaud will vorl them from you."},/turf/simulated/floor{icon_state = "grimy"},/area/chapel/office)
-"aGd" = (/obj/table/woodentable,/obj/item/weapon/pen,/turf/simulated/floor{icon_state = "grimy"},/area/chapel/office)
+"aGd" = (/obj/table/woodentable,/obj/item/weapon/pen,/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater,/turf/simulated/floor{icon_state = "grimy"},/area/chapel/office)
 "aGe" = (/obj/table/woodentable,/obj/item/device/multitool,/turf/simulated/floor{icon_state = "grimy"},/area/chapel/office)
 "aGf" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor{icon_state = "dark"},/area/chapel/main)
 "aGg" = (/obj/stool/chair{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/chapel/main)
@@ -1797,7 +1797,7 @@
 "aIC" = (/obj/closet{pixel_x = 5; pixel_y = -2},/turf/simulated/floor{icon_state = "grimy"},/area/crew_quarters/theatre)
 "aID" = (/obj/rack,/obj/item/clothing/glasses/eyepatch,/obj/item/clothing/head/bandana,/obj/item/clothing/head/pirate,/obj/item/clothing/suit/pirate,/obj/item/clothing/under/pirate,/turf/simulated/floor{icon_state = "grimy"},/area/crew_quarters/theatre)
 "aIE" = (/obj/rack,/obj/item/clothing/head/ushanka,/obj/item/clothing/under/soviet,/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "grimy"},/area/crew_quarters/theatre)
-"aIF" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/item/device/radio/intercom{pixel_y = 25},/turf/simulated/floor,/area/crew_quarters/theatre)
+"aIF" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/item/device/radio/intercom{pixel_y = 25},/obj/rack,/obj/item/clothing/under/sexymime,/obj/item/clothing/mask/gas/sexymime,/turf/simulated/floor,/area/crew_quarters/theatre)
 "aIG" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; icon_state = "intact-r-f"; level = 1; name = "pipe"},/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor,/area/crew_quarters/theatre)
 "aIH" = (/obj/rack,/obj/item/clothing/under/schoolgirl,/obj/item/clothing/head/rabbitears,/obj/item/clothing/under/blackskirt,/obj/item/clothing/glasses/blindfold,/obj/item/clothing/head/beret,/obj/item/clothing/head/kitty,/turf/simulated/floor,/area/crew_quarters/theatre)
 "aII" = (/obj/morgue,/obj/machinery/light,/turf/simulated/floor{icon_state = "dark"},/area/chapel/office)
@@ -1889,7 +1889,7 @@
 "aKq" = (/obj/machinery/camera{c_tag = "Theatre West"; c_tag_order = 999; dir = 4},/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/theatre)
 "aKr" = (/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/theatre)
 "aKs" = (/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/theatre)
-"aKt" = (/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor,/area/crew_quarters/theatre)
+"aKt" = (/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/rack,/obj/item/clothing/suit/monkeysuit,/obj/item/clothing/mask/gas/monkeymask,/turf/simulated/floor,/area/crew_quarters/theatre)
 "aKu" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; icon_state = "intact-r-f"; level = 1; name = "pipe"},/turf/simulated/floor,/area/crew_quarters/theatre)
 "aKv" = (/obj/rack,/obj/item/clothing/head/flatcap,/obj/item/clothing/under/gimmick/rank/captain/suit,/obj/item/clothing/suit/labcoat/mad,/obj/item/clothing/glasses/gglasses,/turf/simulated/floor,/area/crew_quarters/theatre)
 "aKw" = (/obj/machinery/atmospherics/pipe/manifold{color = "blue"; dir = 8; icon_state = "manifold-b-f"; level = 1; name = "pipe manifold"},/turf/simulated/wall,/area/crew_quarters/theatre)
@@ -6662,7 +6662,7 @@
 "cyf" = (/turf/unsimulated/floor{dir = 1; icon_state = "chapel"},/area/wizard_station)
 "cyg" = (/turf/unsimulated/floor{dir = 4; icon_state = "chapel"},/area/wizard_station)
 "cyh" = (/obj/item/weapon/spacecash,/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"},/area/planet/clown)
-"cyi" = (/mob/living/carbon/metroid{desc = "A tamed other thing. Very smart looking."; icon = 'icons/obj/otherthing.dmi'; icon_state = "otherthing"; name = "Tamed Otherthing"; toxloss = 0; voice_message = "gurgles"; voice_name = "otherthing"},/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station)
+"cyi" = (/mob/living/carbon/metroid{desc = "A tamed other thing. Very smart looking."; icon = 'otherthing.dmi'; icon_state = "otherthing"; name = "Tamed Otherthing"; toxloss = 0; voice_message = "gurgles"; voice_name = "otherthing"},/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station)
 "cyj" = (/obj/grille,/obj/window/reinforced,/obj/window/reinforced{dir = 4},/obj/window/reinforced{dir = 8},/turf/unsimulated/floor,/area/wizard_station)
 "cyk" = (/obj/stool,/turf/unsimulated/floor{dir = 2; icon_state = "carpetside"},/area/wizard_station)
 "cyl" = (/turf/unsimulated/floor{dir = 8; icon_state = "chapel"},/area/wizard_station)

tgstation.dme

@@ -266,6 +266,7 @@
 #include "code\defines\obj\vending.dm"
 #include "code\defines\obj\weapon.dm"
 #include "code\defines\obj\window.dm"
+#include "code\defines\obj\clothing\costume.dm"
 #include "code\defines\obj\clothing\ears.dm"
 #include "code\defines\obj\clothing\gimmick.dm"
 #include "code\defines\obj\clothing\glasses.dm"
@@ -858,6 +859,5 @@
 #include "code\WorkInProgress\recycling\scrap.dm"
 #include "code\WorkInProgress\recycling\sortingmachinery.dm"
 #include "interface\skin.dmf"
-#include "maps\TestingMap.dmm"
 #include "maps\tgstation.2.0.7.dmm"
 // END_INCLUDE