Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685

code/modules/uplink/uplink_items/uplink_badass.dm

@@ -24,13 +24,6 @@
 			Radio headset does not include encryption key. No gun included."
 	item = /obj/item/storage/box/syndie_kit/centcom_costume
 
-/datum/uplink_item/badass/claymore
-	name = "Claymore"
-	cost = 8
-	player_minimum = 25
-	desc = "A claymore. We don't know why you'd do this."
-	item = /obj/item/claymore
-
 /datum/uplink_item/badass/costumes/clown
 	name = "Clown Costume"
 	desc = "Nothing is more terrifying than clowns with fully automatic weaponry."
@@ -85,11 +78,3 @@
 	limited_stock = 1
 	cant_discount = TRUE
 	include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/badass/shades
-	name = "Big Sunglasses"
-	desc = "Prevents flashes and looks badbass with some Smokes."
-	item = /obj/item/clothing/glasses/sunglasses/big
-	cost = 1
-	surplus = 5
-	illegal_tech = FALSE

code/modules/uplink/uplink_items/uplink_bundles.dm

@@ -151,6 +151,23 @@
 			U.purchase_log.LogPurchase(goods, I, 0)
 	return C
 
+/datum/uplink_item/bundles_TC/reroll
+	name = "Renegotiate Contract"
+	desc = "Selecting this will inform the syndicate that you wish to change employers. Can only be done once; no take-backs."
+	item = /obj/effect/gibspawner/generic
+	cost = 0
+	cant_discount = TRUE
+	restricted = TRUE
+	limited_stock = 1
+
+/datum/uplink_item/bundles_TC/reroll/purchase(mob/user, datum/component/uplink/U)
+	var/datum/antagonist/traitor/T = user?.mind?.has_antag_datum(/datum/antagonist/traitor)
+	if(istype(T))
+		var/new_traitor_kind = get_random_traitor_kind(list(T.traitor_kind.type))
+		T.set_traitor_kind(new_traitor_kind)
+	else
+		to_chat(user,"Invalid user for contract renegotiation.")
+
 /datum/uplink_item/bundles_TC/random
 	name = "Random Item"
 	desc = "Picking this will purchase a random item. Useful if you have some TC to spare or if you haven't decided on a strategy yet."

code/modules/uplink/uplink_items/uplink_dangerous.dm

@@ -117,17 +117,6 @@
 /datum/uplink_item/dangerous/doublesword/get_discount()
 	return pick(4;0.8,2;0.65,1;0.5)
 
-/datum/uplink_item/dangerous/cxneb
-	name = "Dragon's Tooth Non-Eutactic Blade"
-	desc = "An illegal modification of a weapon that is functionally identical to the energy sword, \
-			the Non-Eutactic Blade (NEB) forges a hardlight blade on-demand, \
-	 		generating an extremely sharp, unbreakable edge that is guaranteed to satisfy your every need. \
-	 		This particular model has a polychromic hardlight generator, allowing you to murder in style! \
-	 		The illegal modifications bring this weapon up to par with the classic energy sword, and also gives it the energy sword's distinctive sounds."
-	item = /obj/item/melee/transforming/energy/sword/cx/traitor
-	cost = 8
-	exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
-
 /datum/uplink_item/dangerous/sword
 	name = "Energy Sword"
 	desc = "The energy sword is an edged weapon with a blade of pure energy. The sword is small enough to be \

code/modules/uplink/uplink_items/uplink_roles.dm

@@ -64,14 +64,6 @@
 	restricted_roles = list("Clown")
 */
 
-/datum/uplink_item/role_restricted/clumsyDNA
-	name = "Clumsy Clown DNA"
-	desc = "A DNA injector that has been loaded with the clown gene that makes people clumsy.. \
-	Making someone clumsy will allow them to use clown firing pins as well as Reverse Revolvers. For a laugh try using this on the HOS to see how many times they shoot themselves in the foot!"
-	cost = 1
-	item = /obj/item/dnainjector/clumsymut
-	restricted_roles = list("Clown")
-
 /datum/uplink_item/role_restricted/haunted_magic_eightball
 	name = "Haunted Magic Eightball"
 	desc = "Most magic eightballs are toys with dice inside. Although identical in appearance to the harmless toys, this occult device reaches into the spirit world to find its answers. \
@@ -116,19 +108,11 @@
 	cost = 4
 	restricted_roles = list("Cook", "Botanist", "Clown", "Mime")
 
-/datum/uplink_item/role_restricted/strange_seeds
-	name = "Pack of strange seeds"
-	desc = "Mysterious seeds as strange as their name implies. Spooky."
-	item = /obj/item/seeds/random
-	cost = 2
-	restricted_roles = list("Botanist")
-	illegal_tech = FALSE
-
 /datum/uplink_item/role_restricted/strange_seeds_10pack
-	name = "Pack of strange seeds x10"
+	name = "Pack of strange seeds"
 	desc = "Mysterious seeds as strange as their name implies. Spooky. These come in bulk"
 	item = /obj/item/storage/box/strange_seeds_10pack
-	cost = 20
+	cost = 10
 	restricted_roles = list("Botanist")
 
 /datum/uplink_item/role_restricted/ez_clean_bundle