From abb12d1366d26f767f5e00005ba3ef145bd00b19 Mon Sep 17 00:00:00 2001
From: caelaislinn <cael_aislinn@yahoo.com.au>
Date: Thu, 14 Jun 2012 23:54:14 +1000
Subject: [PATCH] added some new contraband items - absinthe, a strong alcohol
 with an LSD-like effect - deadrum, a poisonously sweet form of rum - cigars -
 blood tomato seeds - liberty cap seeds - plump helmet seeds

* Cigars are also [still] obtainable from cigarette vending machines, if you have a coin

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
---
 code/defines/obj/supplypacks.dm             |  3 +-
 code/modules/chemical/Chemistry-Reagents.dm | 35 +++++++++++++++++++++
 code/modules/chemical/Chemistry-Tools.dm    | 16 ++++++++++
 3 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/code/defines/obj/supplypacks.dm b/code/defines/obj/supplypacks.dm
index 7e39e7e50fb..a3cc02acca2 100755
--- a/code/defines/obj/supplypacks.dm
+++ b/code/defines/obj/supplypacks.dm
@@ -804,7 +804,8 @@
 
 /datum/supply_packs/randomised/contraband
 	num_contained = 5
-	contains = list("/obj/item/weapon/contraband/poster","/obj/item/weapon/cigpacket/dromedaryco") //We randomly pick 5 items from this list through the constructor, look below
+	//We randomly pick 5 items from this list through the constructor, look below
+	contains = list("/obj/item/weapon/contraband/poster","/obj/item/weapon/cigpacket/dromedaryco","/obj/item/clothing/mask/cigarette/cigar/havana", "/obj/item/seeds/plumphelmet", "/obj/item/seeds/libertycap", "/obj/item/seeds/bloodtomato", "/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe" )
 	name = "Contraband crate"
 	cost = 30
 	containertype = "/obj/structure/closet/crate"
diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm
index f033f30f5d1..21aeb9a5c0a 100644
--- a/code/modules/chemical/Chemistry-Reagents.dm
+++ b/code/modules/chemical/Chemistry-Reagents.dm
@@ -2749,12 +2749,47 @@ datum
 				color = "#664300" // rgb: 102, 67, 0
 				dizzy_adj = 3
 
+			absinthe
+				name = "Absinthe"
+				id = "absinthe"
+				description = "Watch out that the Green Fairy doesn't come for you!"
+				color = "#33EE00" // rgb: lots, ??, ??
+				dizzy_adj = 5
+				slur_start = 25
+				confused_start = 100
+
+				//copy paste from LSD... shoot me
+				on_mob_life(var/mob/M)
+					if(!M) M = holder.my_atom
+					if(!data) data = 1
+					data++
+					M:hallucination += 5
+					if(volume > REAGENTS_OVERDOSE)
+						M:adjustToxLoss(1)
+	//				if(data >= 100)
+	//					M:adjustToxLoss(0.1)
+					..()
+					return
+
 			rum
 				name = "Rum"
 				id = "rum"
 				description = "Yohoho and all that."
 				color = "#664300" // rgb: 102, 67, 0
 
+			deadrum
+				name = "Deadrum"
+				id = "rum"
+				description = "Popular with the sailors. Not very popular with everyone else."
+				color = "#664300" // rgb: 102, 67, 0
+
+				on_mob_life(var/mob/living/M as mob)
+					..()
+					M.dizziness +=5
+					if(volume > REAGENTS_OVERDOSE)
+						M:adjustToxLoss(1)
+					return
+
 			vodka
 				name = "Vodka"
 				id = "vodka"
diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm
index 26bb307ea34..29e992315b5 100644
--- a/code/modules/chemical/Chemistry-Tools.dm
+++ b/code/modules/chemical/Chemistry-Tools.dm
@@ -3009,6 +3009,14 @@
 		..()
 		reagents.add_reagent("rum", 100)
 
+/obj/item/weapon/reagent_containers/food/drinks/bottle/deadrum
+	name = "Deadrum Bumbo"
+	desc = "Tastes a lot sweeter than ordinary rum (that's to help disguise the kick)."
+	icon_state = "deadrumbottle"
+	New()
+		..()
+		reagents.add_reagent("deadrum", 100)
+
 /obj/item/weapon/reagent_containers/food/drinks/bottle/holywater
 	name = "Flask of Holy Water"
 	desc = "A flask of the chaplain's holy water."
@@ -3057,6 +3065,14 @@
 		..()
 		reagents.add_reagent("wine", 100)
 
+/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe
+	name = "Jailbreaker Verte"
+	desc = "Twenty-fourth century Green Fairy, one sip of this and you just know you're gonna have a good time."
+	icon_state = "absinthebottle"
+	New()
+		..()
+		reagents.add_reagent("absinthe", 100)
+
 //////////////////////////JUICES AND STUFF ///////////////////////
 
 /obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice