Merge remote-tracking branch 'origin/master' into perlin-genny

code/modules/cargo/blackmarket/blackmarket_item.dm

@@ -17,7 +17,7 @@
 
 /datum/blackmarket_item/New()
 	if(isnull(price))
-		price = rand(price_min, price_max)
+		price = round(rand(price_min, price_max), 5)
 	if(isnull(stock))
 		stock = rand(stock_min, stock_max)
 

code/modules/cargo/blackmarket/blackmarket_items/clothing.dm

@@ -51,5 +51,30 @@
 	item = /obj/item/clothing/head/chameleon/broken
 	price_min = 100
 	price_max = 200
-	stock_max = 2
-	availability_prob = 70
+	stock_min = 3
+	stock_max = 7
+	availability_prob = 100
+
+/datum/blackmarket_item/clothing/earmuffs
+	name = "Earmuffs"
+	desc = "Protect your precious ears from security's flashbangs with this handy device."
+	item = /obj/item/clothing/ears/earmuffs
+	price_min = 100
+	price_max = 200
+	stock_min = 3
+	stock_max = 7
+	availability_prob = 100
+
+/* commented out until someone wants to port the actual boots
+ * i am unsure they are in accordance with server design ideals
+
+/datum/blackmarket_item/clothing/rocket_boots
+	name = "Rocket Boots"
+	desc = "We found a pair of jump boots and overclocked the hell out of them. No liability for grevious harm to or with a body."
+	item = /obj/item/clothing/shoes/bhop/rocket
+	price_min = 1500
+	price_max = 3000
+	stock_max = 1
+	availability_prob = 30
+
+*/

code/modules/cargo/blackmarket/blackmarket_items/consumables.dm

@@ -14,11 +14,11 @@
 	name = "Box of Donk Pockets"
 	desc = "A well packaged box containing the favourite snack of every spacefarer."
 	item = /obj/item/storage/box/donkpockets
-	stock_min = 2
-	stock_max = 5
-	price_min = 325
-	price_max = 400
-	availability_prob = 80
+	stock_min = 5
+	stock_max = 10
+	price_min = 250
+	price_max = 350
+	availability_prob = 100
 
 /datum/blackmarket_item/consumable/suspicious_pills
 	name = "Bottle of Suspicious Pills"
@@ -46,13 +46,43 @@
 	stock_max = 35
 	price_min = 10
 	price_max = 60
-	availability_prob = 50
+	availability_prob = 70
 
 /datum/blackmarket_item/consumable/pumpup
 	name = "Shoddy Stimulants"
 	desc = "Feel the energy inside each needle!"
 	item = /obj/item/reagent_containers/hypospray/medipen/stimpack
 	stock_max = 5
-	price_min = 50
-	price_max = 150
-	availability_prob = 90
+	price_min = 80
+	price_max = 170
+	availability_prob = 70
+
+/datum/blackmarket_item/consumable/stray_drink
+	name = "A random drink"
+	desc = "A surprise drink direcly from the counter. No refunds if the glass breaks."	// it will always break if it's launched at the station
+	item = /obj/item/reagent_containers/food/drinks/drinkingglass
+	stock_min = 10
+	stock_max = 15
+	price_min = 100
+	price_max = 200
+	availability_prob = 100
+	// add new drinks here
+	var/list/counter = list(
+		/datum/reagent/consumable/ethanol/gintonic,
+        /datum/reagent/consumable/ethanol/cuba_libre,
+        /datum/reagent/consumable/ethanol/martini,
+        /datum/reagent/consumable/ethanol/b52,
+        /datum/reagent/consumable/ethanol/manhattan,
+        /datum/reagent/consumable/ethanol/bahama_mama,
+        /datum/reagent/consumable/ethanol/syndicatebomb,
+        /datum/reagent/consumable/ethanol/quadruple_sec
+	)
+
+// i found no other way to fill a glass with a random reagent at runtime. and i definitely was not going to do the same done in bottle.dm
+/datum/blackmarket_item/consumable/stray_drink/spawn_item(loc)
+	var/obj/item/reagent_containers/food/drinks/drinkingglass/drink = new item(loc)
+	var/picked = pick(counter)
+	drink.list_reagents = list()
+	drink.list_reagents[picked] = 50
+	drink.add_initial_reagents()
+	return drink

code/modules/cargo/blackmarket/blackmarket_items/misc.dm

@@ -10,6 +10,15 @@
 	stock_max = 6
 	availability_prob = 80
 
+/datum/blackmarket_item/misc/clear_pda
+	name = "Clear PDA"
+	desc = "Show off your style with this limited edition clear PDA!."
+	item = /obj/item/pda/clear
+	price_min = 250
+	price_max = 600
+	stock_max = 4
+	availability_prob = 50
+
 /datum/blackmarket_item/misc/shoulder_holster
 	name = "Shoulder holster"
 	desc = "Yeehaw, hardboiled friends! This holster is the first step in your dream of becoming a detective and being allowed to shoot real guns!"
@@ -37,11 +46,11 @@
 	name = "Strange Seeds"
 	desc = "An Exotic Variety of seed that can contain anything from glow to acid."
 	item = /obj/item/seeds/random
-	price_min = 320
-	price_max = 360
+	price_min = 450
+	price_max = 650
 	stock_min = 2
 	stock_max = 5
-	availability_prob = 50
+	availability_prob = 100
 
 /datum/blackmarket_item/misc/smugglers_satchel
 	name = "Smuggler's Satchel"
@@ -51,3 +60,14 @@
 	price_max = 1000
 	stock_max = 2
 	availability_prob = 30
+
+/datum/blackmarket_item/misc/internals_box
+	name = "Internals Box"
+	desc = "The same one Nanotrasen gives you before starting the shift. Totally not stolen from a dead space-man floating in space."
+	item = /obj/item/storage/box/survival
+	price_min = 250
+	price_max = 350
+	stock_min = 3
+	stock_max = 6
+	availability_prob = 100
+

code/modules/cargo/blackmarket/blackmarket_items/tools.dm

@@ -59,7 +59,7 @@
 	name = "Thermite Bottle"
 	desc = "30 units of Thermite to assist in creating a quick access point or get away!"
 	item = /obj/item/reagent_containers/glass/bottle/thermite
-	price_min = 500
+	price_min = 750
 	price_max = 1500
 	stock_max = 3
 	availability_prob = 30
@@ -68,7 +68,18 @@
 	name = "Science Goggles"
 	desc = "These glasses scan the contents of containers and projects their contents to the user in an easy-to-read format."
 	item = /obj/item/clothing/glasses/science
-	price_min = 150
-	price_max = 200
-	stock_max = 3
-	availability_prob = 50
+	price_min = 200
+	price_max = 300
+	stock_min = 3
+	stock_max = 7
+	availability_prob = 100
+
+/datum/blackmarket_item/tool/meson_goggles
+	name = "Meson Goggles"
+	desc = "These let you see through walls and inspect other structures."
+	item = /obj/item/clothing/glasses/meson
+	price_min = 200
+	price_max = 300
+	stock_min = 3
+	stock_max = 7
+	availability_prob = 100

code/modules/cargo/blackmarket/blackmarket_items/weapons.dm

@@ -28,14 +28,23 @@
 	item = /obj/item/spear/bonespear
 	price_min = 200
 	price_max = 300
-	stock_max = 3
-	availability_prob = 60
+	stock_max = 0
+	availability_prob = 0
 
 /datum/blackmarket_item/weapon/emp_grenade
 	name = "EMP Grenade"
 	desc = "Use this grenade for SHOCKING results!"
 	item = /obj/item/grenade/empgrenade
-	price_min = 100
-	price_max = 400
+	price_min = 300
+	price_max = 600
 	stock_max = 2
-	availability_prob = 50
+	availability_prob = 20
+
+/datum/blackmarket_item/weapon/smoke_grenade
+	name = "Smoke Grenade"
+	desc = "Used for obcuring a large area with thick smoke."
+	item = /obj/item/grenade/smokebomb
+	price_min = 100
+	price_max = 300
+	stock_max = 3
+	availability_prob = 40

code/modules/cargo/blackmarket/blackmarket_uplink.dm

@@ -1,5 +1,6 @@
 /obj/item/blackmarket_uplink
 	name = "Black Market Uplink"
+	desc = "A mishmash of a subspace amplifier, a radio, and an analyzer.  Somehow able to access the black market, with a variable inventory in limited stock at inflated prices. No refunds, customer responsible for pick-ups." 
 	icon = 'icons/obj/blackmarket.dmi'
 	icon_state = "uplink"
 	// UI variables.

code/modules/cargo/bounties/security.dm

@@ -23,7 +23,7 @@
 	name = "Strobe Shield"
 	description = "One of our Emergency Response Agents thinks there's vampires in a local station. Send him something to help with his fear of the dark and protect him, too."
 	reward = 3000
-	wanted_types = list(/obj/item/assembly/flash/shield)
+	wanted_types = list(/obj/item/shield/riot/flash)
 
 /datum/bounty/item/security/sechuds
 	name = "Sec HUDs"

code/modules/cargo/exports/weapons.dm

@@ -16,7 +16,7 @@
 /datum/export/weapon/riot_shield
 	cost = 70
 	unit_name = "flash shield"
-	export_types = list(/obj/item/assembly/flash/shield)
+	export_types = list(/obj/item/shield/riot/flash)
 
 /datum/export/weapon/tele_shield
 	cost = 100
@@ -138,7 +138,7 @@
 	export_types = list(/obj/item/gun/energy/xray)
 
 /datum/export/weapon/ioncarbine
-	cost = 200 
+	cost = 200
 	unit_name = "ion carbine"
 	export_types = list(/obj/item/gun/energy/ionrifle/carbine)
 

code/modules/cargo/packs/service.dm

@@ -171,7 +171,7 @@
 
 /datum/supply_pack/service/replacementdb
 	name = "Replacement Defensive Bar Shotgun"
-	desc = "Someone stole the Bartender's twin-barreled possession? Give them another one at a significant markup. Comes with one unused double-barrel shotgun, shells not included. Requires bartender access to open."
+	desc = "Someone stole the Bartender's twin-barreled possession? Give them another one at a significant markup. Comes with one unused double-barrel shotgun, additional shells not included. Requires bartender access to open."
 	cost = 2200
 	access = ACCESS_BAR
 	contraband = TRUE