Merge remote-tracking branch 'citadel/master' into eldritch_affairs

code/modules/uplink/uplink_items.dm

@@ -1,4 +1,4 @@
-/proc/get_uplink_items(datum/game_mode/gamemode, allow_sales = TRUE, allow_restricted = TRUE)
+/proc/get_uplink_items(datum/game_mode/gamemode, allow_sales = TRUE, allow_restricted = TRUE, other_filter = list())
 	var/list/filtered_uplink_items = GLOB.uplink_categories.Copy() // list of uplink categories without associated values.
 	var/list/sale_items = list()
 
@@ -18,7 +18,8 @@
 			continue
 		if (I.restricted && !allow_restricted)
 			continue
-
+		if (I.type in other_filter)
+			continue
 		LAZYSET(filtered_uplink_items[I.category], I.name, I)
 
 		if(I.limited_stock < 0 && !I.cant_discount && I.item && I.cost > 1)

code/modules/uplink/uplink_items/uplink_badass.dm

@@ -75,3 +75,20 @@
 	item = /obj/item/storage/fancy/cigarettes/cigpack_syndicate
 	cost = 2
 	illegal_tech = FALSE
+
+/datum/uplink_item/badass/tactical_naptime
+	name = "Sleepy Time Pajama Bundle"
+	desc = "Even soldiers need to get a good nights rest. Comes with some cozy as heck sleeping wear, a blankie to keep yourself warm in deep space, a hot mug of cocoa for you and your fuzzy friend."
+	item = /obj/item/storage/box/syndie_kit/sleepytime
+	cost = 4
+	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

@@ -41,6 +41,16 @@
 	player_minimum = 15
 	exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
 
+/datum/uplink_item/suits/infiltrator_bundle
+	name = "Insidious Infiltration Gear Case"
+	desc = "Developed by Roseus Galactic in conjunction with the Gorlex Marauders to produce a functional suit for urban operations, \
+			this suit proves to be cheaper than your standard issue hardsuit, with none of the movement restrictions (or the space proofing) of the outdated spacesuits employed by the company. \
+			Comes with an armored vest, helmet, blood-red sneaksuit, sneakboots, specialized combat gloves and a high-tech balaclava which obfuscates both your voice and your face. The case is also rather useful as a storage container and bludgeoning implement."
+	item = /obj/item/storage/toolbox/infiltrator
+	cost = 5
+	limited_stock = 1 //you only get one so you don't end up with too many gun cases
+	exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+
 /datum/uplink_item/bundles_TC/cybernetics_bundle
 	name = "Cybernetic Implants Bundle"
 	desc = "A random selection of cybernetic implants. Guaranteed 5 high quality implants. Comes with an autosurgeon."

code/modules/uplink/uplink_items/uplink_clothing.dm

@@ -9,14 +9,14 @@
 
 /datum/uplink_item/suits/turtlenck
 	name = "Tactical Turtleneck"
-	desc = "A slightly armored suit that has no sensor on them, if someone sees you in this hope they think its a fake."
+	desc = "A slightly armored conspicious jumpsuit that has no suit sensors attached to them, if someone sees you in this hope they think its a fake."
 	item = /obj/item/clothing/under/syndicate
 	cost = 1
 	exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops) //They already get these
 
 /datum/uplink_item/suits/turtlenck_skirt
 	name = "Tactical Skirtleneck"
-	desc = "A slightly armored suit that has no sensor on them, if someone sees you in this hope they think its a fake."
+	desc = "A slightly armored conspicious jumpsuit that has no suit sensors attached to them, if someone sees you in this hope they think its a fake."
 	item = /obj/item/clothing/under/syndicate/skirt
 	cost = 1
 	exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops) //They already get these

code/modules/uplink/uplink_items/uplink_dangerous.dm

@@ -147,9 +147,9 @@
 
 /datum/uplink_item/dangerous/rapier
 	name = "Rapier"
-	desc = "A fancy rapier with a diamond tip piercing anything that it comes into contack with. \
-			The rapier comes with its own sheath, this is rather noticeable as only the captain is known to carry a sheath. \
-			The sheath itself can be used to block melee attacks only. Its also jet black colours."
+	desc = "An elegant plastitanium rapier with a diamond tip and coated in a specialized knockout poison. \
+			The rapier comes with its own sheath, and is capable of puncturing through almost any defense. \
+			However, due to the size of the blade and obvious nature of the sheath, the weapon stands out as being obviously nefarious."
 	item = /obj/item/storage/belt/sabre/rapier
 	cost = 8
 	exclude_modes = list(/datum/game_mode/nuclear/clown_ops)

code/modules/uplink/uplink_items/uplink_devices.dm

@@ -139,7 +139,7 @@
 	name = "Headset Upgrader"
 	desc = "A device that can be used to make one headset immune to flashbangs."
 	item = /obj/item/headsetupgrader
-	cost = 3
+	cost = 1
 
 /datum/uplink_item/device_tools/medgun
 	name = "Medbeam Gun"

code/modules/uplink/uplink_items/uplink_roles.dm

@@ -175,7 +175,7 @@
 /datum/uplink_item/role_restricted/kitchen_gun
 	name = "Kitchen Gun (TM)"
 	desc = "A revolutionary .45 caliber cleaning solution! Say goodbye to daily stains and dirty surfaces with Kitchen Gun (TM)! \
-	Just five shots from Kitchen Gun (TM), and it'll sparkle like new! Includes two extra ammunition clips!"
+	Just three shots from Kitchen Gun (TM), and it'll sparkle like new! Includes two extra ammunition clips!"
 	cost = 10
 	surplus = 40
 	restricted_roles = list("Cook", "Janitor")

code/modules/uplink/uplink_items/uplink_stealth.dm

@@ -48,7 +48,7 @@
 /datum/uplink_item/stealthy_weapons/martialarts
 	name = "Sleeping Carp Scroll"
 	desc = "This scroll contains the secrets of an ancient martial arts technique. You will master unarmed combat, \
-			deflecting all ranged weapon fire, but you also refuse to use dishonorable ranged weaponry."
+			gain skin as hard as steel and swat bullets from the air, but you also refuse to use dishonorable ranged weaponry."
 	item = /obj/item/book/granter/martial/carp
 	cost = 17
 	surplus = 0