diff --git a/baystation12.dme b/baystation12.dme
index 3535be05090..3ca192c2781 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -101,12 +101,8 @@
 #define FILE_DIR "code/modules/mob/living/carbon"
 #define FILE_DIR "code/modules/mob/living/carbon/alien"
 #define FILE_DIR "code/modules/mob/living/carbon/alien/humanoid"
-#define FILE_DIR "code/modules/mob/living/carbon/alien/humanoid/caste"
 #define FILE_DIR "code/modules/mob/living/carbon/alien/larva"
-#define FILE_DIR "code/modules/mob/living/carbon/alien/special"
-#define FILE_DIR "code/modules/mob/living/carbon/brain"
 #define FILE_DIR "code/modules/mob/living/carbon/human"
-#define FILE_DIR "code/modules/mob/living/carbon/metroid"
 #define FILE_DIR "code/modules/mob/living/carbon/monkey"
 #define FILE_DIR "code/modules/mob/living/silicon"
 #define FILE_DIR "code/modules/mob/living/silicon/ai"
@@ -179,7 +175,6 @@
 // END_PREFERENCES
 // BEGIN_INCLUDE
 #include "code\names.dm"
-#include "code\setup.dm"
 #include "code\stylesheet.dm"
 #include "code\ATMOSPHERICS\atmospherics.dm"
 #include "code\ATMOSPHERICS\datum_pipe_network.dm"
@@ -790,71 +785,14 @@
 #include "code\modules\mob\living\say.dm"
 #include "code\modules\mob\living\blob\blob.dm"
 #include "code\modules\mob\living\carbon\carbon.dm"
-#include "code\modules\mob\living\carbon\alien\say.dm"
-#include "code\modules\mob\living\carbon\alien\humanoid\alien_powers.dm"
-#include "code\modules\mob\living\carbon\alien\humanoid\death.dm"
-#include "code\modules\mob\living\carbon\alien\humanoid\emote.dm"
-#include "code\modules\mob\living\carbon\alien\humanoid\hud.dm"
-#include "code\modules\mob\living\carbon\alien\humanoid\humanoid.dm"
 #include "code\modules\mob\living\carbon\alien\humanoid\life.dm"
-#include "code\modules\mob\living\carbon\alien\humanoid\login.dm"
-#include "code\modules\mob\living\carbon\alien\humanoid\queen.dm"
-#include "code\modules\mob\living\carbon\alien\humanoid\caste\drone.dm"
-#include "code\modules\mob\living\carbon\alien\humanoid\caste\hunter.dm"
-#include "code\modules\mob\living\carbon\alien\humanoid\caste\sentinel.dm"
-#include "code\modules\mob\living\carbon\alien\larva\death.dm"
-#include "code\modules\mob\living\carbon\alien\larva\emote.dm"
-#include "code\modules\mob\living\carbon\alien\larva\hud.dm"
 #include "code\modules\mob\living\carbon\alien\larva\larva.dm"
 #include "code\modules\mob\living\carbon\alien\larva\life.dm"
-#include "code\modules\mob\living\carbon\alien\larva\login.dm"
-#include "code\modules\mob\living\carbon\alien\larva\powers.dm"
-#include "code\modules\mob\living\carbon\alien\special\_main.dm"
-#include "code\modules\mob\living\carbon\alien\special\chryssalid.dm"
-#include "code\modules\mob\living\carbon\alien\special\ethereal.dm"
-#include "code\modules\mob\living\carbon\alien\special\floater.dm"
-#include "code\modules\mob\living\carbon\alien\special\muton.dm"
-#include "code\modules\mob\living\carbon\alien\special\sectoid.dm"
-#include "code\modules\mob\living\carbon\alien\special\snakeman.dm"
-#include "code\modules\mob\living\carbon\brain\brain.dm"
-#include "code\modules\mob\living\carbon\brain\death.dm"
-#include "code\modules\mob\living\carbon\brain\hud.dm"
-#include "code\modules\mob\living\carbon\brain\life.dm"
-#include "code\modules\mob\living\carbon\brain\MMI.dm"
-#include "code\modules\mob\living\carbon\brain\say.dm"
 #include "code\modules\mob\living\carbon\human\death.dm"
 #include "code\modules\mob\living\carbon\human\emote.dm"
-#include "code\modules\mob\living\carbon\human\examine.dm"
-#include "code\modules\mob\living\carbon\human\hud.dm"
 #include "code\modules\mob\living\carbon\human\human.dm"
-#include "code\modules\mob\living\carbon\human\human_attackalien.dm"
-#include "code\modules\mob\living\carbon\human\human_attackhand.dm"
-#include "code\modules\mob\living\carbon\human\human_attackpaw.dm"
-#include "code\modules\mob\living\carbon\human\human_damage.dm"
-#include "code\modules\mob\living\carbon\human\human_defense.dm"
-#include "code\modules\mob\living\carbon\human\human_movement.dm"
 #include "code\modules\mob\living\carbon\human\life.dm"
-#include "code\modules\mob\living\carbon\human\login.dm"
-#include "code\modules\mob\living\carbon\human\say.dm"
-#include "code\modules\mob\living\carbon\human\whisper.dm"
-#include "code\modules\mob\living\carbon\metroid\death.dm"
-#include "code\modules\mob\living\carbon\metroid\emote.dm"
-#include "code\modules\mob\living\carbon\metroid\examine.dm"
-#include "code\modules\mob\living\carbon\metroid\hud.dm"
-#include "code\modules\mob\living\carbon\metroid\life.dm"
-#include "code\modules\mob\living\carbon\metroid\login.dm"
-#include "code\modules\mob\living\carbon\metroid\metroid.dm"
-#include "code\modules\mob\living\carbon\metroid\powers.dm"
-#include "code\modules\mob\living\carbon\metroid\say.dm"
-#include "code\modules\mob\living\carbon\monkey\death.dm"
-#include "code\modules\mob\living\carbon\monkey\emote.dm"
-#include "code\modules\mob\living\carbon\monkey\examine.dm"
-#include "code\modules\mob\living\carbon\monkey\hud.dm"
-#include "code\modules\mob\living\carbon\monkey\life.dm"
-#include "code\modules\mob\living\carbon\monkey\login.dm"
 #include "code\modules\mob\living\carbon\monkey\monkey.dm"
-#include "code\modules\mob\living\carbon\monkey\powers.dm"
-#include "code\modules\mob\living\carbon\monkey\say.dm"
 #include "code\modules\mob\living\silicon\say.dm"
 #include "code\modules\mob\living\silicon\silicon.dm"
 #include "code\modules\mob\living\silicon\ai\ai.dm"
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index b8aacbd87e8..c314daf72e2 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -166,7 +166,7 @@
 	if(!ismob(M))
 		return
 	user << "\red You stab [M] with the pen."
-	M << "\red You feel a tiny prick!"
+//	M << "\red You feel a tiny prick!" //Removed to make tritor pens stealthier
 	M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been stabbed with [src.name]  by [user.name] ([user.ckey])</font>")
 	user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to stab [M.name] ([M.ckey])</font>")
 	return
@@ -179,12 +179,10 @@
 	return
 
 /obj/item/weapon/pen/sleepypen/New()
-	var/datum/reagents/R = new/datum/reagents(30) //Used to be 300
+	var/datum/reagents/R = new/datum/reagents(150) //Used to be 300
 	reagents = R
 	R.my_atom = src
-	R.add_reagent("chloralhydrate", 22)	//Used to be 100 sleep toxin//30 Chloral seems to be fatal, reducing it to 22./N
-//	R.add_reagent("impedrezene", 100)
-//	R.add_reagent("cryptobiolin", 100)
+	R.add_reagent("stoxin", 150)	//Used to be 100 sleep toxin//30 Chloral seems to be fatal, reducing it to 22./N
 	..()
 	return
 
diff --git a/code/game/objects/items/weapons/uplinks.dm b/code/game/objects/items/weapons/uplinks.dm
index 5c934f2066c..39d0d1a9fe6 100644
--- a/code/game/objects/items/weapons/uplinks.dm
+++ b/code/game/objects/items/weapons/uplinks.dm
@@ -43,10 +43,11 @@ SYNDICATE UPLINK
 			dat += "<A href='byond://?src=\ref[src];buy_item=shoes'>Syndicate Shoes</A> (2)<BR>"
 			dat += "<A href='byond://?src=\ref[src];buy_item=card'>Syndicate Card</A> (3)<BR>"
 			dat += "<A href='byond://?src=\ref[src];buy_item=voice'>Voice-Changer</A> (4)<BR>"
+			dat += "<A href='byond://?src=\ref[src];buy_item=thermal'>Thermal Glasses</A> (4)<BR>"
 			dat += "<BR>"
 			dat += "<A href='byond://?src=\ref[src];buy_item=imp_freedom'>Freedom Implant (with injector)</A> (3)<BR>"
 			dat += "<A href='byond://?src=\ref[src];buy_item=paralysispen'>Paralysis Pen</A> (3)<BR>" //Note that this goes to the updated sleepypen now.
-//			dat += "<A href='byond://?src=\ref[src];buy_item=sleepypen'>Sleepy Pen</A> (5)<BR>" //Terrible -Pete.
+			dat += "<A href='byond://?src=\ref[src];buy_item=sleepypen'>Sleepy Pen</A> (4)<BR>" //Terrible -Pete. //Reinstated -Skymarshal
 			dat += "<BR>"
 			dat += "<A href='byond://?src=\ref[src];buy_item=detomatix'>Detomatix Cartridge</A> (3)<BR>"
 			dat += "<A href='byond://?src=\ref[src];buy_item=bomb'>Plastic Explosives</A> (2)<BR>"
@@ -54,7 +55,7 @@ SYNDICATE UPLINK
 			dat += "<A href='byond://?src=\ref[src];buy_item=space'>Syndicate-made Space Suit (inludes a helmet)</A> (3)<BR>"
 			dat += "<BR>"
 			dat += "<A href='byond://?src=\ref[src];buy_item=projector'>Chameleon-projector</A> (4)<BR>"
-			dat += "<A href='byond://?src=\ref[src];buy_item=cloak'>Cloaking Device</A> (4)<BR>"
+//			dat += "<A href='byond://?src=\ref[src];buy_item=cloak'>Cloaking Device</A> (4)<BR>"
 			dat += "<A href='byond://?src=\ref[src];buy_item=emag'>Electromagnet Card</A> (3)<BR>"
 			dat += "<A href='byond://?src=\ref[src];buy_item=empbox'>5 EMP Grenades</A> (4)<BR>"
 			dat += "<BR>"
@@ -131,8 +132,8 @@ SYNDICATE UPLINK
 						var/obj/item/weapon/implanter/O = new /obj/item/weapon/implanter(get_turf(src))
 						O.imp = new /obj/item/weapon/implant/freedom(O)
 				if("sleepypen")
-					if (src.uses >= 5)
-						src.uses -= 5
+					if (src.uses >= 4)
+						src.uses -= 4
 						new /obj/item/weapon/pen/sleepypen(get_turf(src))
 				if("paralysispen")
 					if (src.uses >= 3)
@@ -146,18 +147,22 @@ SYNDICATE UPLINK
 					if (src.uses >= 7)
 						src.uses -= 7
 						new /obj/item/weapon/aiModule/syndicate(get_turf(src))
-				if("cloak")
+/*				if("cloak")
 					if (src.uses >= 4)
 						if (ticker.mode.config_tag!="nuclear" || \
 							(input(currentUser,"Spawning a cloak in nuke is generally regarded as entirely dumb, are you sure?") in list("Confirm", "Abort")) == "Confirm" \
 						)
 							if (src.uses >= 4)
 								src.uses -= 4
-								new /obj/item/weapon/cloaking_device(get_turf(src))
+								new /obj/item/weapon/cloaking_device(get_turf(src))	*/
 				if("sword")
 					if (src.uses >= 4)
 						src.uses -= 4
 						new /obj/item/weapon/melee/energy/sword(get_turf(src))
+				if("thermal")
+					if (src.uses >= 4)
+						src.uses -= 4
+						new /obj/item/clothing/glasses/thermal(get_turf(src))
 				if("bomb")
 					if (src.uses >= 2)
 						src.uses -= 2
diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm
index 49b3873af62..bb1facaaee5 100644
--- a/code/modules/chemical/Chemistry-Reagents.dm
+++ b/code/modules/chemical/Chemistry-Reagents.dm
@@ -341,7 +341,7 @@ datum
 				..()
 				return
 
-		cyanide
+/*		cyanide
 			name = "Cyanide"
 			id = "cyanide"
 			description = "A highly toxic chemical."
@@ -354,7 +354,7 @@ datum
 				M:adjustOxyLoss(3)
 				M:sleeping += 1
 				..()
-				return
+				return	*/
 
 		stoxin
 			name = "Sleep Toxin"