diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm
index fc8168ba83e..55bb4d44844 100644
--- a/code/game/objects/items/trash.dm
+++ b/code/game/objects/items/trash.dm
@@ -8,7 +8,7 @@
 	desc = "This is rubbish."
 
 /obj/item/trash/koisbar
-	name = "K'ois Bar Wrapper"
+	name = "\improper K'ois Bar Wrapper"
 	icon_state = "koisbar"
 
 /obj/item/trash/raisins
@@ -32,7 +32,7 @@
 	icon_state = "popcorn"
 
 /obj/item/trash/sosjerky
-	name = "Scaredy's Private Reserve Beef Jerky"
+	name = "\improper Scaredy's Private Reserve Beef Jerky"
 	icon_state = "sosjerky"
 
 /obj/item/trash/syndi_cakes
@@ -75,7 +75,7 @@
 /obj/item/trash/tastybread
 	name = "bread tube"
 	icon_state = "tastybread"
-	
+
 /obj/item/trash/meatsnack
 	name = "mo'gunz meat pie"
 	icon_state = "meatsnack-used"
@@ -83,9 +83,9 @@
 /obj/item/trash/maps
 	name = "map salty ham"
 	icon_state = "maps-used"
-	
+
 /obj/item/trash/nathisnack
-	name = "nathi-snack corned beef"
+	name = "razi-snack corned beef"
 	icon_state = "cbeef-used"
 
 /obj/item/trash/brownies
diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
index 818f3116e7c..2851d905070 100644
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -255,14 +255,13 @@
 	agonyforce = 1
 	stunforce = 1
 	origin_tech = list(TECH_COMBAT = 1)
+	contained_sprite = 1
 
 /obj/item/weapon/melee/baton/slime/Initialize()
 	. = ..()
 	bcell = new/obj/item/weapon/cell/high(src)
 	return
 
-/obj/item/weapon/melee/baton/slime/update_icon() // sprite
-
 /obj/item/weapon/melee/baton/slime/attack(mob/M, mob/user, var/hit_zone)
 	if(isrobot(M) || ishuman(M))
 		..()
diff --git a/code/modules/cargo/randomstock.dm b/code/modules/cargo/randomstock.dm
index 221d52fcd38..e685e032300 100644
--- a/code/modules/cargo/randomstock.dm
+++ b/code/modules/cargo/randomstock.dm
@@ -227,6 +227,7 @@ var/list/global/random_stock_rare = list(
 	"xenohide" = 0.5,
 	"humanhide" = 0.5,
 	"modkit" = 1,
+	"contraband" = 0.8,
 	"nothing" = 0)
 
 var/list/global/random_stock_large = list(
@@ -242,7 +243,6 @@ var/list/global/random_stock_large = list(
 	"oxycanister" = 6,//Cargo should almost always have an oxycanister
 	"oxydispenser" = 5,
 	"bubbleshield" = 2,
-	"chassis" = 2,
 	"watertank" = 2,
 	"fueltank" = 2,
 	"airpump" = 1,
@@ -1450,7 +1450,8 @@ var/list/global/random_stock_large = list(
 			/obj/item/weapon/rig/ce = 2,
 			/obj/item/weapon/rig/hazmat = 4,
 			/obj/item/weapon/rig/medical = 4,
-			/obj/item/weapon/rig/hazard = 3
+			/obj/item/weapon/rig/hazard = 3,
+			/obj/item/weapon/rig/diving = 1
 			)
 
 			var/type = pickweight(rigs)
@@ -1526,6 +1527,8 @@ var/list/global/random_stock_large = list(
 			var/type = pick(modkits)
 			new type(L)
 
+		if ("contraband")
+			new /obj/random/contraband(L)
 
 //Large items go below here
 //=============================================================
@@ -1577,21 +1580,6 @@ var/list/global/random_stock_large = list(
 			var/obj/machinery/portable_atmospherics/powered/M = new /obj/machinery/portable_atmospherics/powered/scrubber(L)
 			if (prob(60))
 				M.cell = null
-		//Spawns a complete, but brainless robot chassis. Ready for MMI insertion
-		//It may be missing limbs, and if so cargo can probably scrounge some up in the warehouse.
-		if ("chassis")
-			var/obj/item/robot_parts/robot_suit/RS = new /obj/item/robot_parts/robot_suit(L)
-			if (prob(90))
-				RS.r_arm = new
-			if (prob(90))
-				RS.r_leg = new
-			if (prob(90))
-				RS.l_arm = new
-			if (prob(90))
-				RS.l_leg = new
-			RS.chest = new
-			RS.head = new
-			RS.updateicon()
 
 		if ("suspension")//Xenoarch suspension field generator, they need a spare
 			new /obj/machinery/suspension_gen(L)
@@ -1700,7 +1688,8 @@ var/list/global/random_stock_large = list(
 			/obj/mecha/combat/marauder = 0.6,
 			/obj/mecha/combat/marauder/seraph = 0.3,
 			/obj/mecha/combat/marauder/mauler = 0.4,
-			/obj/mecha/combat/phazon = 0.1
+			/obj/mecha/combat/phazon = 0.1,
+			/obj/mecha/combat/honker = 0.01
 			)
 			var/type = pickweight(randsuits)
 			var/obj/mecha/exosuit = new type(get_turf(L))