Cargo random stock and some fixes (#3609)

-tweaks cargo random stock a bit, and removes the borg chassis that caused a lot of bugs
-fixed a wrong name in some food trash type
-fixed the slime stunbaton having no in hand sprite

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

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))
 		..()