From 7fbb123a4d0fcdc4e39a8fb644a7dd8a85a76edf Mon Sep 17 00:00:00 2001
From: Yoshax <yoshax23@gmail.com>
Date: Mon, 25 Jul 2016 23:13:12 +0100
Subject: [PATCH] Improves/fixes surplus crate item selection

---
 code/datums/uplink/ammunition.dm                       | 1 +
 code/datums/uplink/announcements.dm                    | 1 +
 code/datums/uplink/badassery.dm                        | 1 +
 code/game/objects/items/devices/uplink_random_lists.dm | 4 +---
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/code/datums/uplink/ammunition.dm b/code/datums/uplink/ammunition.dm
index 3dee3326fb..8569308543 100644
--- a/code/datums/uplink/ammunition.dm
+++ b/code/datums/uplink/ammunition.dm
@@ -4,6 +4,7 @@
 /datum/uplink_item/item/ammo
 	item_cost = 20
 	category = /datum/uplink_category/ammunition
+	blacklisted = 1
 
 /datum/uplink_item/item/ammo/a357
 	name = ".357 Speedloader"
diff --git a/code/datums/uplink/announcements.dm b/code/datums/uplink/announcements.dm
index 21ef121e32..58baa14e8e 100644
--- a/code/datums/uplink/announcements.dm
+++ b/code/datums/uplink/announcements.dm
@@ -3,6 +3,7 @@
 *****************/
 /datum/uplink_item/abstract/announcements
 	category = /datum/uplink_category/services
+	blacklisted = 1
 
 /datum/uplink_item/abstract/announcements/buy(var/obj/item/device/uplink/U, var/mob/user)
 	. = ..()
diff --git a/code/datums/uplink/badassery.dm b/code/datums/uplink/badassery.dm
index 4e81ca14cf..2cfd2f7203 100644
--- a/code/datums/uplink/badassery.dm
+++ b/code/datums/uplink/badassery.dm
@@ -19,6 +19,7 @@
 /datum/uplink_item/item/badassery/random_one
 	name = "Random Item"
 	desc = "Buys you one random item."
+	blacklisted = 1
 
 /datum/uplink_item/item/badassery/random_one/buy(var/obj/item/device/uplink/U, var/mob/user)
 	var/datum/uplink_item/item = default_uplink_selection.get_random_item(U.uses)
diff --git a/code/game/objects/items/devices/uplink_random_lists.dm b/code/game/objects/items/devices/uplink_random_lists.dm
index f8d73d76b2..f3533c5a01 100644
--- a/code/game/objects/items/devices/uplink_random_lists.dm
+++ b/code/game/objects/items/devices/uplink_random_lists.dm
@@ -28,13 +28,10 @@ var/datum/uplink_random_selection/all_uplink_selection = new/datum/uplink_random
 	for(var/i = 0; i < attempts; i++)
 		var/datum/uplink_random_item/RI
 		if(items_override)
-			world << 1
 			RI = pick(all_items)
 		else
-			world << 2
 			RI = pick(items)
 		if(!prob(RI.keep_probability))
-			world << 3
 			continue
 		var/datum/uplink_item/I = uplink.items_assoc[RI.uplink_item]
 		if(I.cost(telecrystals, U) > telecrystals)
@@ -46,6 +43,7 @@ var/datum/uplink_random_selection/all_uplink_selection = new/datum/uplink_random
 		return I
 
 /datum/uplink_random_selection/all/New()
+	..()
 	for(var/datum/uplink_item/item in uplink.items)
 		if(item.blacklisted)
 			continue