diff --git a/code/defines/obj.dm b/code/defines/obj.dm
index 5ef738e2f79..4a8c78c619c 100644
--- a/code/defines/obj.dm
+++ b/code/defines/obj.dm
@@ -130,23 +130,6 @@
 
 /obj/item/mouse_drag_pointer = MOUSE_ACTIVE_POINTER
 
-// TODO: robust mixology system! (and merge with beakers, maybe)
-/obj/item/weapon/glass
-	name = "empty glass"
-	desc = "Emptysville."
-	icon = 'icons/obj/kitchen.dmi'
-	icon_state = "glass_empty"
-	item_state = "beaker"
-	flags = FPRINT | TABLEPASS | OPENCONTAINER
-	var/datum/substance/inside = null
-	throwforce = 5
-	g_amt = 100
-	New()
-		..()
-		src.pixel_x = rand(-5, 5)
-		src.pixel_y = rand(-5, 5)
-
-
 /obj/item/weapon/beach_ball
 	icon = 'icons/misc/beach.dmi'
 	icon_state = "ball"
diff --git a/code/game/objects/effects/aliens.dm b/code/game/objects/effects/aliens.dm
index b86bf3404dd..43cd47c348c 100644
--- a/code/game/objects/effects/aliens.dm
+++ b/code/game/objects/effects/aliens.dm
@@ -414,23 +414,21 @@ Alien plants should do something if theres a lot of poison
 		return
 
 	proc/Burst(var/kill = 1) //drops and kills the hugger if any is remaining
-		var/obj/item/clothing/mask/facehugger/child = GetFacehugger()
-
-		icon_state = "egg_hatched"
-		flick("egg_opening", src)
-		status = BURSTING
-		spawn(15)
-			status = BURST
-			loc.contents += child//need to write the code for giving it to the alien later
-			if(kill && istype(child))
-				child.Die()
-			else
-				for(var/mob/M in range(1,src))
-					if(CanHug(M))
-						child.Attach(M)
-						break
-
-		return
+		if(status == GROWN || status == GROWING)
+			var/obj/item/clothing/mask/facehugger/child = GetFacehugger()
+			icon_state = "egg_hatched"
+			flick("egg_opening", src)
+			status = BURSTING
+			spawn(15)
+				status = BURST
+				loc.contents += child//need to write the code for giving it to the alien later
+				if(kill && istype(child))
+					child.Die()
+				else
+					for(var/mob/M in range(1,src))
+						if(CanHug(M))
+							child.Attach(M)
+							break
 
 
 /obj/effect/alien/egg/bullet_act(var/obj/item/projectile/Proj)
diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm
index d8c52b956ff..371abdd0092 100644
--- a/code/game/objects/items/weapons/storage/uplink_kits.dm
+++ b/code/game/objects/items/weapons/storage/uplink_kits.dm
@@ -1,21 +1,21 @@
 /obj/item/weapon/storage/box/syndicate/
 	New()
 		..()
-		switch (pickweight(list("bloodyspai" = 1, "stealth" = 1, "screwed" = 1, "guns" = 1, "murder" = 1, "freedom" = 1, "hacker" = 1, "lordsingulo" = 1)))
-			if ("bloodyspai")
+		switch (pickweight(list("bloodyspai" = 1, "stealth" = 1, "screwed" = 1, "guns" = 1, "murder" = 1, "freedom" = 1, "hacker" = 1, "lordsingulo" = 1, "smoothoperator" = 1)))
+			if("bloodyspai")
 				new /obj/item/clothing/under/chameleon(src)
 				new /obj/item/clothing/mask/gas/voice(src)
 				new /obj/item/weapon/card/id/syndicate(src)
 				new /obj/item/clothing/shoes/syndigaloshes(src)
 				return
 
-			if ("stealth")
+			if("stealth")
 				new /obj/item/weapon/gun/energy/crossbow(src)
 				new /obj/item/weapon/pen/paralysis(src)
 				new /obj/item/device/chameleon(src)
 				return
 
-			if ("screwed")
+			if("screwed")
 				new /obj/effect/spawner/newbomb/timer/syndicate(src)
 				new /obj/effect/spawner/newbomb/timer/syndicate(src)
 				new /obj/item/device/powersink(src)
@@ -23,14 +23,14 @@
 				new /obj/item/clothing/head/helmet/space/syndicate(src)
 				return
 
-			if ("guns")
+			if("guns")
 				new /obj/item/weapon/gun/projectile(src)
 				new /obj/item/ammo_magazine/a357(src)
 				new /obj/item/weapon/card/emag(src)
 				new /obj/item/weapon/plastique(src)
 				return
 
-			if ("murder")
+			if("murder")
 				new /obj/item/weapon/melee/energy/sword(src)
 				new /obj/item/clothing/glasses/thermal/syndi(src)
 				new /obj/item/weapon/card/emag(src)
@@ -44,19 +44,29 @@
 				U.imp = new /obj/item/weapon/implant/uplink(U)
 				return
 
-			if ("hacker")
+			if("hacker")
 				new /obj/item/weapon/aiModule/syndicate(src)
 				new /obj/item/weapon/card/emag(src)
 				new /obj/item/device/encryptionkey/binary(src)
 				return
 
-			if ("lordsingulo")
+			if("lordsingulo")
 				new /obj/item/device/radio/beacon/syndicate(src)
 				new /obj/item/clothing/suit/space/syndicate(src)
 				new /obj/item/clothing/head/helmet/space/syndicate(src)
 				new /obj/item/weapon/card/emag(src)
 				return
 
+			if("smoothoperator")
+				new /obj/item/weapon/gun/projectile/pistol(src)
+				new /obj/item/weapon/silencer(src)
+				new /obj/item/weapon/soap/syndie(src)
+				new /obj/item/weapon/storage/bag/trash(src)
+				new /obj/item/bodybag(src)
+				new /obj/item/clothing/under/suit_jacket(src)
+				new /obj/item/clothing/shoes/laceup(src)
+				return
+
 /obj/item/weapon/storage/box/syndie_kit
 	name = "Box"
 	desc = "A sleek, sturdy box"
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index 8ae2cfeacb1..0525b67c211 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -94,4 +94,9 @@
 /obj/item/clothing/shoes/cyborg
 	name = "cyborg boots"
 	desc = "Shoes for a cyborg costume"
-	icon_state = "boots"
\ No newline at end of file
+	icon_state = "boots"
+
+/obj/item/clothing/shoes/laceup
+	name = "laceup shoes"
+	desc = "The height of fashion, and they're pre-polished!"
+	icon_state = "laceups"
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
index f9f4eb04208..35b9e9fbfd0 100644
--- a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
+++ b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
@@ -26,12 +26,13 @@
 	..()
 
 /obj/item/alien_embryo/process()
+	if(!affected_mob)	return
 	if(loc != affected_mob)
 		affected_mob.status_flags &= ~(XENO_HOST)
 		processing_objects.Remove(src)
-		affected_mob = null
 		spawn(0)
 			RemoveInfectionImages(affected_mob)
+			affected_mob = null
 		return
 
 	if(stage < 5 && prob(3))
diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm
index e9a5a09a419..cdfc77fa27e 100644
--- a/code/modules/projectiles/ammunition/bullets.dm
+++ b/code/modules/projectiles/ammunition/bullets.dm
@@ -35,7 +35,7 @@
 /obj/item/ammo_casing/c9mm
 	desc = "A 9mm bullet casing."
 	caliber = "9mm"
-	projectile_type = "/obj/item/projectile/bullet/weakbullet"
+	projectile_type = "/obj/item/projectile/bullet/midbullet2"
 
 
 /obj/item/ammo_casing/c45
diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi
index 452f0fc5153..b20b815a48e 100644
Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ
diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi
index 11b751cdd70..1ec2dc1c426 100644
Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ