diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm
index 97b5986f33a..d7f21403898 100644
--- a/code/game/objects/items/weapons/explosives.dm
+++ b/code/game/objects/items/weapons/explosives.dm
@@ -3,9 +3,13 @@
 	src.timer = newtime
 	user << "Timer set for [src.timer] seconds."
 
-/obj/item/weapon/plastique/afterattack(atom/target as obj|turf, mob/user as mob)
+/obj/item/weapon/plastique/afterattack(atom/target as obj|turf, mob/user as mob, flag)
+	if (!flag)
+		return
+	if (istype(target, /turf/unsimulated) || istype(target, /turf/simulated/shuttle))
+		return
 	user << "Planting explosives..."
-	if(do_after(user, 50))
+	if(do_after(user, 50) && get_dist(user, target) <= 1)
 		user.drop_item()
 		src.target = target
 		src.loc = null
diff --git a/code/game/objects/items/weapons/uplinks.dm b/code/game/objects/items/weapons/uplinks.dm
index 89ddf18bf90..d2c65fdb002 100644
--- a/code/game/objects/items/weapons/uplinks.dm
+++ b/code/game/objects/items/weapons/uplinks.dm
@@ -43,7 +43,8 @@ SYNDICATE UPLINK
 			dat += "<A href='byond://?src=\ref[src];item_sword=1'>Energy Sword</A> (4)<BR>"
 			dat += "<A href='byond://?src=\ref[src];item_bomb=1'>Syndicate Bomb</A> (4)<BR>"
 			dat += "<A href='byond://?src=\ref[src];item_powersink=1'>Power Sink</A> (5)<BR>"
-			dat += "<li><A href='byond://?src=\ref[src];item_cartridge=1'>Detomatix Cartridge</A> (3)</li>"
+			dat += "<A href='byond://?src=\ref[src];item_cartridge=1'>Detomatix Cartridge</A> (3)"
+			dat += "<A href='byond://?src=\ref[src];item_space=1'>Syndicate-made Space Suit (inludes a helmet)</A> (3)<BR>"
 			dat += "<HR>"
 			if (src.origradio)
 				dat += "<A href='byond://?src=\ref[src];lock=1'>Lock</A><BR>"
@@ -108,7 +109,8 @@ SYNDICATE UPLINK
 		else if (href_list["item_bomb"])
 			if (src.uses >= 4)
 				src.uses -= 4
-				new /obj/spawner/newbomb/timer/syndicate(H.loc)
+				new /obj/item/weapon/plastique(H.loc)
+				new /obj/item/weapon/plastique(H.loc)
 		else if (href_list["item_card"])
 			if (src.uses >= 3)
 				src.uses -= 3
@@ -125,6 +127,11 @@ SYNDICATE UPLINK
 			if (src.uses >= 5)
 				src.uses -= 5
 				new /obj/item/device/powersink(H.loc)
+		else if(href_list["item_space"])
+			if (src.uses >= 3)
+				src.uses -= 3
+				new /obj/item/clothing/suit/space/syndicate(H.loc)
+				new /obj/item/clothing/head/helmet/space/syndicate(H.loc)
 		else if (href_list["lock"] && src.origradio)
 			// presto chango, a regular radio again! (reset the freq too...)
 			usr.machine = null
diff --git a/icons/obj/assemblies.dmi b/icons/obj/assemblies.dmi
index 6665dcd69cb..3ecf86bcb89 100644
Binary files a/icons/obj/assemblies.dmi and b/icons/obj/assemblies.dmi differ