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

# Conflicts:
#	code/modules/uplink/uplink_items/uplink_badass.dm

code/modules/uplink/uplink_items/uplink_badass.dm

@@ -76,6 +76,7 @@
 	cost = 2
 	illegal_tech = FALSE
 
+<<<<<<< HEAD
 /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."
@@ -83,4 +84,13 @@
 	cost = 4
 	limited_stock = 1
 	cant_discount = TRUE
-	include_modes = list(/datum/game_mode/nuclear)
+	include_modes = list(/datum/game_mode/nuclear)
+=======
+/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
+>>>>>>> 9c40389e4f970e47f7fdcf5962be0a661b7932f0

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)