Merge remote-tracking branch 'upstream/master' into motivation

code/modules/uplink/uplink_items/uplink_badass.dm

@@ -78,3 +78,16 @@
 	limited_stock = 1
 	cant_discount = TRUE
 	include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/badass/gaming_cardpack
+	name = "TCG Card Operatives Bundle"
+	desc = "A bundle full of goodies required to work as a TCG Card Operative. A warm pajama, a mug of cocoa, a plushie and a two packs full of rare 2560 Core Set cards!"
+	item = /obj/item/storage/box/syndie_kit/sleepytime/cardpack
+	cost = 20
+	include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/badass/cardpack
+	name = "TCG Nuclear Cardpack"
+	desc = "A cardpack filled with top-tier TCG cards."
+	item = /obj/item/cardpack/syndicate
+	cost = 4

code/modules/uplink/uplink_items/uplink_clothing.dm

@@ -98,9 +98,17 @@
 	item = /obj/item/clothing/gloves/tackler/combat/insulated
 	include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
 	cost = 2
+	illegal_tech = FALSE
 
 /datum/uplink_item/device_tools/syndicate_eyepatch
 	name = "Mechanical Eyepatch"
 	desc = "An eyepatch that connects itself to your eye socket, enhancing your shooting to an impossible degree, allowing your bullets to ricochet far more often than usual."
 	item = /obj/item/clothing/glasses/eyepatch/syndicate
 	cost = 8
+
+/datum/uplink_item/device_tools/ablative_armwraps
+	name = "Ablative Armwraps"
+	desc = "A pair of highly reinforced armwraps allowing the user to parry almost anything. Fully reflects projectiles, no downsides to failing, but is very hard to parry melee with."
+	cost = 6
+	item = /obj/item/clothing/gloves/fingerless/ablative
+	exclude_modes = list(/datum/game_mode/nuclear)

code/modules/uplink/uplink_items/uplink_dangerous.dm

@@ -118,6 +118,18 @@
 /datum/uplink_item/dangerous/doublesword/get_discount()
 	return pick(4;0.8,2;0.65,1;0.5)
 
+/datum/uplink_item/dangerous/hyperblade
+	name = "Hypereutactic Blade"
+	desc = "The result of two Dragon Tooth swords combining, you wouldn't want to see this coming at you down the hall! \
+			Requires two hands to wield and it slows you down.  You can also recolor it!"
+	item = /obj/item/dualsaber/hypereutactic
+	player_minimum = 25
+	cost = 16
+	exclude_modes = list(/datum/game_mode/nuclear/clown_ops, /datum/game_mode/traitor/internal_affairs)
+
+/datum/uplink_item/dangerous/hyperblade/get_discount()
+	return pick(4;0.8,2;0.65,1;0.5)
+
 /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_devices.dm

@@ -130,6 +130,7 @@
 			multitool and combat gloves that are resistant to shocks and heat."
 	item = /obj/item/storage/toolbox/syndicate
 	cost = 1
+	illegal_tech = FALSE
 
 /datum/uplink_item/device_tools/syndie_glue
 	name = "Glue"

code/modules/uplink/uplink_items/uplink_stealth.dm

@@ -7,6 +7,12 @@
 	When adding new entries to the file, please keep them sorted by category.
 */
 
+/datum/uplink_item/stealthy_weapons/telescopicbat
+	name = "Telescopic Baseball Bat"
+	desc = "A robust telescopic baseball bat that hits like a truck and can be consealed when collapsed."
+	item = /obj/item/melee/baseball_bat/telescopic
+	cost = 2
+
 /datum/uplink_item/stealthy_weapons/combatglovesplus
 	name = "Combat Gloves Plus"
 	desc = "A pair of gloves that are fireproof and shock resistant, however unlike the regular Combat Gloves this one uses nanotechnology \
@@ -102,6 +108,7 @@
 			along with slurred speech, aggression, and the ability to infect others with this agent."
 	item = /obj/item/storage/box/syndie_kit/romerol
 	cost = 25
+	player_minimum = 25
 	cant_discount = TRUE
 	exclude_modes = list(/datum/game_mode/nuclear)
 

code/modules/uplink/uplink_items/uplink_stealthdevices.dm

@@ -16,6 +16,7 @@
 			with these cards."
 	item = /obj/item/card/id/syndicate
 	cost = 2
+	illegal_tech = FALSE
 
 /datum/uplink_item/stealthy_tools/ai_detector
 	name = "Artificial Intelligence Detector"