Bug fixes

code/modules/clothing/clothing.dm

@@ -181,6 +181,49 @@ BLIND     // can't see anything
 	set src in usr
 	..()
 	return
+	
+/obj/item/clothing/under/proc/set_sensors(mob/usr as mob)
+	var/mob/M = usr
+	if (istype(M, /mob/dead/)) return
+	if (usr.stat || usr.restrained()) return
+	if(has_sensor >= 2)
+		usr << "The controls are locked."
+		return 0
+	if(has_sensor <= 0)
+		usr << "This suit does not have any sensors."
+		return 0
+
+	var/list/modes = list("Off", "Binary sensors", "Vitals tracker", "Tracking beacon")
+	var/switchMode = input("Select a sensor mode:", "Suit Sensor Mode", modes[sensor_mode + 1]) in modes
+	if(get_dist(usr, src) > 1)
+		usr << "You have moved too far away."
+		return
+	sensor_mode = modes.Find(switchMode) - 1
+
+	if (src.loc == usr)
+		switch(sensor_mode)
+			if(0)
+				usr << "You disable your suit's remote sensing equipment."
+			if(1)
+				usr << "Your suit will now report whether you are live or dead."
+			if(2)
+				usr << "Your suit will now report your vital lifesigns."
+			if(3)
+				usr << "Your suit will now report your vital lifesigns as well as your coordinate position."
+	else if (istype(src.loc, /mob))
+		switch(sensor_mode)
+			if(0)
+				for(var/mob/V in viewers(usr, 1))
+					V.show_message("\red [usr] disables [src.loc]'s remote sensing equipment.", 1)
+			if(1)
+				for(var/mob/V in viewers(usr, 1))
+					V.show_message("[usr] turns [src.loc]'s remote sensors to binary.", 1)
+			if(2)
+				for(var/mob/V in viewers(usr, 1))
+					V.show_message("[usr] sets [src.loc]'s sensors to track vitals.", 1)
+			if(3)
+				for(var/mob/V in viewers(usr, 1))
+					V.show_message("[usr] sets [src.loc]'s sensors to maximum.", 1)
 
 //Head
 /obj/item/clothing/head

code/modules/events/tgevents/vent_clog.dm

@@ -24,7 +24,7 @@
 		var/list/gunk = list("water","carbon","flour","radium","toxin","cleaner","nutriment","condensedcapsaicin","psilocybin","lube",
 							"plantbgone","banana","anti_toxin","space_drugs","hyperzine","holywater","ethanol","hot_coco","pacid",
 							"blood","stoxin","fluorine","ryetalyn","mutagen","oxycodone","fuel","cryptobiolin",
-							"impedrezene","mindbreaker","nanites","xenomicrobes","lipozine","frostoil","doctorsdelight","beepskysmash",
+							"impedrezene","mindbreaker","nanites","lipozine","frostoil","doctorsdelight","beepskysmash",
 							"tricordrazine", "amatoxin", "adminordrazine", "neurotoxin", "zombiepowder", "synaptizine")
 		var/datum/reagents/R = new/datum/reagents(50)
 		R.my_atom = vent

code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm

@@ -24,14 +24,24 @@ Doesn't work on other aliens/AI.*/
 	set category = "Alien"
 
 	if(locate(/obj/effect/alien/weeds/node) in get_turf(src))
-		src << "There's already a weed node here."
+		src << "<span class='noticealien'>There's already a weed node here.</span>"
 		return	
+		
+	if(constructing)
+		src << "<span class='noticealien'>You are already constructing something.</span>"
+		return
 	
 	if(powerc(50,1))
-		adjustToxLoss(-50)
-		for(var/mob/O in viewers(src, null))
-			O.show_message(text("<span class='alertalien'>[src] has planted some alien weeds!</span>"), 1)
-		new /obj/effect/alien/weeds/node(loc)
+		constructing = 1
+		stunned = 5
+		src << "<span class='noticealien'>You start planting a weed node.</span>"			
+		spawn(30)
+			adjustToxLoss(-50)
+			for(var/mob/O in viewers(src, null))
+				O.show_message(text("<span class='alertalien'>[src] has planted some alien weeds!</span>"), 1)
+			new /obj/effect/alien/weeds/node(loc)
+			constructing = 0
+			stunned = 0
 	return
 
 /mob/living/carbon/alien/humanoid/verb/whisp(mob/M as mob in oview())

code/modules/mob/living/carbon/alien/humanoid/empress.dm

@@ -80,7 +80,7 @@
 	set category = "Alien"	
 	
 	if(locate(/obj/effect/alien/egg) in get_turf(src))
-		src << "There's already an egg here."
+		src << "<span class='noticealien'>There's already an egg here.</span>"
 		return
 		
 	if(constructing)

code/modules/mob/living/carbon/alien/humanoid/queen.dm

@@ -62,7 +62,7 @@
 	set desc = "Lay an egg to produce huggers to impregnate prey with."
 	set category = "Alien"
 	if(locate(/obj/effect/alien/egg) in get_turf(src))
-		src << "There's already an egg here."
+		src << "<span class='noticealien'>There's already an egg here.</span>"
 		return
 		
 	if(constructing)
@@ -120,7 +120,7 @@
 
 		if(no_queen)
 			adjustToxLoss(-1000)
-			src << "\green You begin to evolve!"
+			src << "<span class='noticealien'>You begin to evolve!</span>"
 			for(var/mob/O in viewers(src, null))
 				O.show_message(text("\green <B>[src] begins to twist and contort!</B>"), 1)
 			var/mob/living/carbon/alien/humanoid/empress/new_xeno = new (loc)

code/modules/mob/living/carbon/human/human.dm

@@ -487,11 +487,11 @@
 		suit = w_uniform
 
 	var/obj/item/clothing/gloves/G
-	//var/pickpocket = 0
+	var/pickpocket = 0
 	if(ishuman(user))
 		if(user:gloves)
 			G = user:gloves
-			//pickpocket = G.pickpocket
+			pickpocket = G.pickpocket
 	user.set_machine(src)
 	var/dat = {"
 	<B><HR><FONT size=3>[name]</FONT></B>
@@ -512,12 +512,14 @@
 	<BR><B>ID:</B> <A href='?src=\ref[src];item=id'>[(wear_id ? wear_id : "Nothing")]</A>
 	<BR><B>PDA:</B> <A href='?src=\ref[src];item=pda'>[(wear_pda ? wear_pda : "Nothing")]</A>
 	<BR><B>Suit Storage:</B> <A href='?src=\ref[src];item=s_store'>[(s_store ? s_store : "Nothing")]</A>
-	<BR>[(handcuffed ? text("<A href='?src=\ref[src];item=handcuff'>Handcuffed</A>") : text("<A href='?src=\ref[src];item=handcuff'>Not Handcuffed</A>"))]
+	<BR><BR><A href='?src=\ref[src];pockets=left'>Left Pocket ([l_store ? (pickpocket ? l_store.name : "Full") : "Empty"])</A>
+	<BR><A href='?src=\ref[src];pockets=right'>Right Pocket ([r_store ? (pickpocket ? r_store.name : "Full") : "Empty"])</A>
+	<BR><A href='?src=\ref[src];item=pockets'>Empty Both Pockets</A>		
+	<BR><BR>[(handcuffed ? text("<A href='?src=\ref[src];item=handcuff'>Handcuffed</A>") : text("<A href='?src=\ref[src];item=handcuff'>Not Handcuffed</A>"))]
 	<BR>[(legcuffed ? text("<A href='?src=\ref[src];item=legcuff'>Legcuffed</A>") : text(""))]
-	<BR>[(suit) ? ((suit.hastie) ? text(" <A href='?src=\ref[];item=tie'>Remove Accessory</A>", src) : "") :]
-	<BR>[(internal ? text("<A href='?src=\ref[src];item=internal'>Remove Internal</A>") : "")]
+	[(suit) ? ((suit.hastie) ? text("<BR><A href='?src=\ref[];item=tie'>Remove Accessory</A>", src) : "") :]
+	[(internal ? text("<BR><A href='?src=\ref[src];item=internal'>Remove Internal</A>") : "")]	
 	<BR><A href='?src=\ref[src];item=splints'>Remove Splints</A>
-	<BR><A href='?src=\ref[src];item=pockets'>Empty Pockets</A>
 	<BR><A href='?src=\ref[user];refresh=1'>Refresh</A>
 	<BR><A href='?src=\ref[user];mach_close=mob\ref[src]'>Close</A>
 	<BR>"}

code/modules/mob/living/carbon/human/inventory.dm

@@ -695,6 +695,17 @@ It can still be worn/put on as normal.
 			slot_to_process = slot_wear_suit
 			if (target.wear_suit && target.wear_suit.canremove)
 				strip_item = target.wear_suit
+		if("tie")
+			var/obj/item/clothing/under/suit = target.w_uniform
+			var/obj/item/clothing/tie/tie = suit.hastie
+			if(tie)
+				if (istype(tie,/obj/item/clothing/tie/storage))
+					var/obj/item/clothing/tie/storage/W = tie
+					if (W.hold)
+						W.hold.close(usr)
+				usr.put_in_hands(tie)
+				suit.hastie = null
+			target.update_inv_w_uniform()
 		if("id")
 			slot_to_process = slot_wear_id
 			if (target.wear_id)
@@ -752,6 +763,13 @@ It can still be worn/put on as normal.
 		if("pockets")
 			slot_to_process = slot_l_store
 			strip_item = target.l_store		//We'll do both
+		if("sensor")
+			var/obj/item/clothing/under/suit = target.w_uniform
+			if (suit)
+				if(suit.has_sensor >= 2)
+					source << "The controls are locked."
+				else
+					suit.set_sensors(source)
 		if("internal")
 			if (target.internal)
 				target.internal.add_fingerprint(source)

code/modules/projectiles/projectile.dm

@@ -166,11 +166,11 @@
 
 
 	process()
-		if(kill_count < 1)
-			del(src)
-			return
-		kill_count--
 		spawn while(src)
+			if(kill_count < 1)
+				del(src)
+				return
+			kill_count--		
 			if((!( current ) || loc == current))
 				current = locate(min(max(x + xo, 1), world.maxx), min(max(y + yo, 1), world.maxy), z)
 			if((x == 1 || x == world.maxx || y == 1 || y == world.maxy))

code/modules/reagents/Chemistry-Reagents.dm

@@ -2634,12 +2634,12 @@ datum
 				if (istype(holder.my_atom,/mob/living))
 					var/mob/living/M as mob
 					var/to_remove = 0
-					if(!M) M = holder.my_atom
 					if (holder.has_reagent("anti_toxin"))
 						to_remove = min(holder.get_reagent_amount("anti_toxin"),data)
 						holder.remove_reagent("anti_toxin", to_remove, 0)
 						data -= to_remove
-					M.adjustToxLoss((data-1)*rand(2,4))
+					if(M)
+						M.adjustToxLoss((data-1)*rand(2,4))
 				..()
 
 		psilocybin

code/modules/shuttles/antagonist.dm

@@ -2,8 +2,16 @@
 	name = "skipjack control console"
 	req_access = list(access_syndicate)
 	shuttle_tag = "Vox Skipjack"
+	
+/obj/machinery/computer/shuttle_control/multi/vox/attack_ai(user as mob)
+	user << "\red Access Denied."
+	return 1	
 
 /obj/machinery/computer/shuttle_control/multi/syndicate
 	name = "Syndicate control console"
 	req_access = list(access_syndicate)
-	shuttle_tag = "Syndicate"
+	shuttle_tag = "Syndicate"
+	
+/obj/machinery/computer/shuttle_control/multi/syndicate/attack_ai(user as mob)
+	user << "\red Access Denied."
+	return 1	

code/modules/telesci/telesci_computer.dm

@@ -25,7 +25,7 @@
 	var/list/power_options = list(5, 10, 20, 25, 30, 40, 50, 80, 100)
 	var/teleporting = 0
 	var/starting_crystals = 0
-	var/max_crystals = 4
+	var/max_crystals = 7
 	var/list/crystals = list()
 	var/obj/item/device/gps/inserted_gps