Merge pull request #946 from quotefox/ecom-2

Hyper Economy part 2 - Civ Vendors

modular_citadel/code/game/machinery/vending.dm

@@ -83,6 +83,8 @@
 				/obj/item/clothing/mask/muzzle/ballgag = 3
 				)
 	refill_canister = /obj/item/vending_refill/kink
+	baseprice = 2
+
 /*
 /obj/machinery/vending/nazivend
 	name = "Nazivend"

modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm

@@ -11,7 +11,7 @@
 	strip_delay = 60
 	equip_delay_other = 60
 	materials = list(MAT_METAL=5000, MAT_GLASS=2000)
-
+	price = 5
 	var/tagname = null
 
 /datum/design/electropack/shockcollar
@@ -60,7 +60,7 @@
 	else
 		return ..()
 
-/obj/item/electropack/shockcollar/ui_interact(mob/user) //on_click calls this 
+/obj/item/electropack/shockcollar/ui_interact(mob/user) //on_click calls this
 	var/dat = {"
 <TT>
 <B>Frequency/Code</B> for shock collar:<BR>