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

code/modules/cargo/bounties/assistant.dm

@@ -236,3 +236,10 @@
 	reward = 2250
 	required_count = 5
 	wanted_types = list(/obj/structure/chair/plaswood)
+
+/datum/bounty/item/assistant/condom
+	name = "Filled Condom"
+	description = "Something wack is happening at Central Command, and now they requested some filled condoms?"
+	reward = 1150
+	required_count = 5
+	wanted_types = list(/obj/item/condom/filled)

code/modules/cargo/exports/lewd.dm

@@ -0,0 +1,7 @@
+
+//Condom
+/datum/export/gear/condom
+	cost = 150
+	unit_name = "filled condom"
+	export_types = list(/obj/item/condom/filled)
+	include_subtypes = TRUE