diff --git a/baystation12.dme b/baystation12.dme
index 18ee361f931..d1f08cd421e 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -642,6 +642,7 @@
 #include "code\game\objects\weapons.dm"
 #include "code\game\objects\closets\walllocker.dm"
 #include "code\game\objects\effects\aliens.dm"
+#include "code\game\objects\effects\barsign.dm"
 #include "code\game\objects\effects\biomass_rift.dm"
 #include "code\game\objects\effects\bump_teleporter.dm"
 #include "code\game\objects\effects\effect_system.dm"
@@ -672,6 +673,7 @@
 #include "code\game\objects\items\blueprints.dm"
 #include "code\game\objects\items\bodybag.dm"
 #include "code\game\objects\items\candle.dm"
+#include "code\game\objects\items\contraband.dm"
 #include "code\game\objects\items\crayons.dm"
 #include "code\game\objects\items\latexballoon.dm"
 #include "code\game\objects\items\shooting_range.dm"
diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm
index fa5b43e69c4..ea7727b1bb9 100755
--- a/code/datums/supplypacks.dm
+++ b/code/datums/supplypacks.dm
@@ -16,6 +16,7 @@
 	var/access = null
 	var/hidden = 0
 	var/contraband = 0
+	var/group
 
 /datum/supply_packs/New()
 	manifest += "<ul>"
@@ -100,7 +101,9 @@
 					/obj/item/weapon/reagent_containers/food/drinks/beer,
 					/obj/item/weapon/reagent_containers/food/drinks/beer,
 					/obj/item/weapon/reagent_containers/food/drinks/beer,
-					/obj/item/weapon/reagent_containers/food/drinks/beer)
+					/obj/item/weapon/reagent_containers/food/drinks/beer,
+					/obj/item/weapon/cigpacket/dromedaryco,
+					/obj/item/weapon/lipstick/random)
 	cost = 20
 	containertype = /obj/structure/closet/crate
 	containername = "Party equipment"
@@ -597,14 +600,85 @@
 	manifest += "Contains any [num_contained] of:"
 	..()
 
+/datum/supply_packs/artscrafts
+	name = "Arts and Crafts supplies"
+	contains = list("/obj/item/weapon/storage/crayonbox",
+	"/obj/item/weapon/camera_test",
+	"/obj/item/weapon/camera_film",
+	"/obj/item/weapon/camera_film",
+	"/obj/item/weapon/storage/photo_album",
+	"/obj/item/weapon/packageWrap",
+	"/obj/item/weapon/reagent_containers/glass/paint/red",
+	"/obj/item/weapon/reagent_containers/glass/paint/green",
+	"/obj/item/weapon/reagent_containers/glass/paint/blue",
+	"/obj/item/weapon/reagent_containers/glass/paint/yellow",
+	"/obj/item/weapon/reagent_containers/glass/paint/violet",
+	"/obj/item/weapon/reagent_containers/glass/paint/black",
+	"/obj/item/weapon/reagent_containers/glass/paint/white",
+	"/obj/item/weapon/reagent_containers/glass/paint/remover",
+	"/obj/item/weapon/wrapping_paper",
+	"/obj/item/weapon/wrapping_paper",
+	"/obj/item/weapon/wrapping_paper",
+	"/obj/item/weapon/contraband/poster")
+	cost = 5
+	containertype = "/obj/structure/closet/crate"
+	containername = "Arts and Crafts crate"
+
 
 /datum/supply_packs/randomised/contraband
 	num_contained = 5
-	contains = list(/obj/item/weapon/contraband/poster,
-					/obj/item/weapon/cigpacket/dromedaryco,
-					/obj/item/weapon/lipstick/random)
+	contains = list("/obj/item/seeds/bloodtomatoseed",
+	"/obj/item/weapon/storage/pill_bottle/zoom",
+	"/obj/item/weapon/storage/pill_bottle/happy",
+	"/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe")
 	name = "Contraband crate"
 	cost = 30
 	containertype = /obj/structure/closet/crate
-	containername = "Contraband crate"
+	containername = "Unlabeled crate"
 	contraband = 1
+
+/datum/supply_packs/boxes
+	name = "Empty Box supplies"
+	contains = list("/obj/item/weapon/storage/box",
+	"/obj/item/weapon/storage/box",
+	"/obj/item/weapon/storage/box",
+	"/obj/item/weapon/storage/box",
+	"/obj/item/weapon/storage/box",
+	"/obj/item/weapon/storage/box",
+	"/obj/item/weapon/storage/box",
+	"/obj/item/weapon/storage/box",
+	"/obj/item/weapon/storage/box",
+	"/obj/item/weapon/storage/box",)
+	cost = 5
+	containertype = "/obj/structure/closet/crate"
+	containername = "Empty Box crate"
+
+/datum/supply_packs/surgery
+	name = "Surgery crate"
+	contains = list("/obj/item/weapon/cautery",
+					"/obj/item/weapon/surgicaldrill",
+					"/obj/item/clothing/mask/breath/medical",
+					"/obj/item/weapon/tank/anesthetic",
+					"/obj/item/weapon/FixOVein",
+					"/obj/item/weapon/hemostat",
+					"/obj/item/weapon/scalpel",
+					"/obj/item/weapon/surgical_tool/bonegel",
+					"/obj/item/weapon/retractor",
+					"/obj/item/weapon/surgical_tool/bonesetter",
+					"/obj/item/weapon/circular_saw")
+	cost = 25
+	containertype = "/obj/structure/closet/crate/secure"
+	containername = "Surgery crate"
+	access = access_medical
+	group = "Medical / Science"
+
+/datum/supply_packs/sterile
+	name = "Sterile equipment crate"
+	contains = list("/obj/item/clothing/under/rank/medical/green",
+					"/obj/item/clothing/under/rank/medical/green",
+					"/obj/item/weapon/storage/stma_kit",
+					"/obj/item/weapon/storage/lglo_kit")
+	cost = 10
+	containertype = "/obj/structure/closet/crate"
+	containername = "Sterile equipment crate"
+	group = "Medical / Science"
\ No newline at end of file
diff --git a/code/game/objects/effects/decals/contraband.dm b/code/game/objects/effects/decals/contraband.dm
index 3d13f2d9694..f0d2409a461 100644
--- a/code/game/objects/effects/decals/contraband.dm
+++ b/code/game/objects/effects/decals/contraband.dm
@@ -12,7 +12,7 @@
 
 /obj/item/weapon/contraband/poster
 	name = "rolled-up poster"
-	desc = "The poster comes with its own automatic adhesive mechanism, for easy pinning to any vertical surface. Its vulgar themes have marked it as Contraband aboard Nanotrasen© Space Facilities."
+	desc = "The poster comes with its own automatic adhesive mechanism, for easy pinning to any vertical surface."
 	icon_state = "rolled_poster"
 	var/serial_number = 0
 	var/obj/effect/decal/poster/resulting_poster = null //The poster that will be created is initialised and stored through contraband/poster's constructor
diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm
index b6ec76b788d..952a297abc1 100644
--- a/code/game/supplyshuttle.dm
+++ b/code/game/supplyshuttle.dm
@@ -322,6 +322,7 @@ var/list/mechtoys = list(
 			//manifest finalisation
 			slip.info += "</ul><br>"
 			slip.info += "CHECK CONTENTS AND STAMP BELOW THE LINE TO CONFIRM RECEIPT OF GOODS<hr>"
+			if (SP.contraband) slip.loc = null	//we are out of blanks for Form #44-D Ordering Illicit Drugs.
 
 		while(0<mech_redeem)
 			if(!clear_turfs.len)	break
diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
index 67e97089c42..c24d507f531 100644
--- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
@@ -241,6 +241,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
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index a4ec79f0a81..aea97a84d5d 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -181,3 +181,22 @@
 	New()
 		..()
 		reagents.add_reagent("bicaridine", 30)
+
+/obj/item/weapon/reagent_containers/pill/happy
+	name = "Happy pill"
+	desc = "Happy happy joy joy!"
+	icon_state = "pill18"
+	New()
+		..()
+		reagents.add_reagent("space_drugs", 15)
+		reagents.add_reagent("sugar", 15)
+
+/obj/item/weapon/reagent_containers/pill/zoom
+	name = "Zoom pill"
+	desc = "Zoooom!"
+	icon_state = "pill18"
+	New()
+		..()
+		reagents.add_reagent("impedrezene", 10)
+		reagents.add_reagent("synaptizine", 5)
+		reagents.add_reagent("hyperzine", 5)
\ No newline at end of file