Merge pull request #947 from quotefox/ecom-2

loose ends.

code/game/objects/items/storage/boxes.dm

@@ -415,6 +415,7 @@
 	desc = "<B>Instructions:</B> <I>Heat in microwave. Product will cool if not eaten within seven minutes.</I>"
 	icon_state = "donkpocketbox"
 	illustration=null
+	price = 10
 
 /obj/item/storage/box/donkpockets/ComponentInitialize()
 	. = ..()

code/modules/clothing/gloves/color.dm

@@ -8,6 +8,7 @@
 	item_color="yellow"
 	resistance_flags = NONE
 	var/can_be_cut = 1
+	price = 10
 
 /obj/item/clothing/gloves/color/fyellow                             //Cheap Chinese Crap
 	desc = "These gloves are cheap knockoffs of the coveted ones - no way this can end badly."
@@ -19,6 +20,7 @@
 	item_color="yellow"
 	resistance_flags = NONE
 	var/can_be_cut = 1
+	price = 5
 
 /obj/item/clothing/gloves/color/fyellow/New()
 	..()
@@ -113,6 +115,7 @@
 	siemens_coefficient = 0
 	permeability_coefficient = 0.05
 	resistance_flags = NONE
+	price = 12
 
 /obj/item/clothing/gloves/color/rainbow
 	name = "rainbow gloves"

code/modules/clothing/head/jobs.dm

@@ -260,6 +260,7 @@
 	name = "security's bitch beret"
 	desc = "A softer beret with the word 'BITCH' embroidered on it in pink thread."
 	icon_state = "bitchberet"
+	price = 5
 
 //Curator
 /obj/item/clothing/head/fedora/curator

code/modules/clothing/neck/_neck.dm

@@ -65,7 +65,7 @@
 
 			var/obj/item/organ/heart/heart = M.getorganslot(ORGAN_SLOT_HEART)
 			var/obj/item/organ/lungs/lungs = M.getorganslot(ORGAN_SLOT_LUNGS)
-		
+
 
 			if (!do_mob(user,M,60))	// Stethoscope should take a moment to listen
 				return // FAIL
@@ -302,3 +302,4 @@
 	icon = 'icons/obj/clothing/neck.dmi'
 	icon_state = "bling"
 	item_color = "bling"
+	price = 30

code/modules/clothing/shoes/miscellaneous.dm

@@ -137,6 +137,7 @@
 	desc = "A pair of knee-high jackboots, complete with heels. All style, all the time."
 	icon_state = "jackboots-tall"
 	item_state = "jackboots-tall"
+	price = 5
 
 /obj/item/clothing/shoes/jackboots/fast
 	slowdown = -1

code/modules/clothing/suits/jobs.dm

@@ -169,6 +169,7 @@
 	cold_protection = CHEST|LEGS|ARMS
 	heat_protection = CHEST|LEGS|ARMS
 	mutantrace_variation = NO_MUTANTRACE_VARIATION //you don't need it
+	price = 5
 
 //Surgeon
 /obj/item/clothing/suit/apron/surgical

code/modules/clothing/under/jobs/civilian.dm

@@ -381,6 +381,7 @@
 	item_state = "b_suit"
 	item_color = "galaxy_blue"
 	can_adjust = FALSE
+	price = 10
 
 /obj/item/clothing/under/lawyer/galaxy_red
 	name = "\improper Pulsar Gonne"

code/modules/food_and_drinks/drinks/drinks/bottle.dm

@@ -406,6 +406,7 @@
 	isGlass = FALSE
 	list_reagents = list(/datum/reagent/consumable/cream = 100)
 	foodtype = DAIRY
+	price = 3
 
 /obj/item/reagent_containers/food/drinks/bottle/tomatojuice
 	name = "tomato juice"

code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm

@@ -90,6 +90,7 @@
 /obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola
 	name = "Nuka Cola"
 	list_reagents = list(/datum/reagent/consumable/nuka_cola = 50)
+	price = 7
 
 /obj/item/reagent_containers/food/drinks/drinkingglass/filled/syndicatebomb
 	name = "Syndicat Bomb"

code/modules/food_and_drinks/food/condiment.dm

@@ -186,6 +186,7 @@
 	righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
 	list_reagents = list(/datum/reagent/consumable/milk = 50)
 	possible_states = list()
+	price = 5
 
 /obj/item/reagent_containers/food/condiment/flour
 	name = "flour sack"

code/modules/vending/_vending.dm

@@ -366,7 +366,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 				if(extended_inventory) //hacking shows all inventory now since coins arent worth anything.
 					display_records = product_records + hidden_records + coin_records
 				else
-					display_records = product_records
+					display_records = product_records + coin_records
 				dat += "<table>"
 				for (var/datum/data/vending_product/R in display_records)
 					dat += "<tr><td><img src='data:image/jpeg;base64,[GetIconForProduct(R)]'/></td>"

hyperstation/code/obj/kinkyclothes.dm

@@ -6,14 +6,14 @@
 	icon = 'hyperstation/icons/obj/clothing/gloves.dmi'
 	alternate_worn_icon = 'hyperstation/icons/mobs/gloves.dmi'
 	mutantrace_variation = NO_MUTANTRACE_VARIATION
-	price = 2
+	price = 5
 
 /obj/item/clothing/gloves/latexsleeves/security
 	name = "security sleeves"
 	desc = "A pair of latex sleeves, with a band of red above the elbows denoting that the wearer is part of the security team."
 	icon_state = "latexsec"
 	item_state = "latexsec"
-	price = 0
+	price = 5
 
 /obj/item/clothing/head/dominatrixcap
 	name = "dominatrix cap"

modular_citadel/code/game/gamemodes/gangs/gang_items.dm

@@ -121,6 +121,7 @@
 	cost = 9
 	item_path = /obj/item/clothing/neck/necklace/dope
 
+
 /datum/gang_item/clothing/hands
 	name = "Decorative Brass Knuckles"
 	id = "hand"

modular_citadel/code/modules/client/loadout/uniform.dm

@@ -49,6 +49,7 @@
 	path = /obj/item/clothing/under/lawyer/galaxy_blue
 	cost = 3
 
+
 /datum/gear/galaxy_r
 	name = "Pulsar Gonne"
 	category = SLOT_W_UNIFORM