From 55f19df748b2311a96b79c071501561b6923c389 Mon Sep 17 00:00:00 2001
From: Mickyan <38563876+Mickyan@users.noreply.github.com>
Date: Mon, 16 Dec 2019 17:43:27 +0100
Subject: [PATCH] Normalizes payouts and vendor prices to an approximate of
cargo's credit value (#48174)
* prices & income
* more prices
* lower megaseed premium prices
* custom prices for premium tools
* slightly lowers prices for some snacks/drinks/cigs
* hey get back here
---
code/__DEFINES/economy.dm | 12 +++++------
.../machinery/doors/airlock_electronics.dm | 2 +-
code/game/machinery/doors/firedoor.dm | 2 +-
code/game/machinery/firealarm.dm | 2 +-
code/game/objects/items/RCD.dm | 2 +-
code/game/objects/items/cigs_lighters.dm | 1 +
.../circuitboards/machine_circuitboards.dm | 2 +-
code/game/objects/items/devices/flashlight.dm | 4 ++--
code/game/objects/items/devices/scanners.dm | 5 +++--
.../objects/items/devices/sensor_device.dm | 2 +-
code/game/objects/items/kitchen.dm | 12 +++++------
code/game/objects/items/pinpointer.dm | 2 +-
code/game/objects/items/stacks/medical.dm | 1 +
code/game/objects/items/storage/belt.dm | 6 +++---
code/game/objects/items/storage/boxes.dm | 3 ++-
code/game/objects/items/storage/fancy.dm | 2 ++
code/game/objects/items/storage/firstaid.dm | 2 +-
code/game/objects/items/tanks/watertank.dm | 2 +-
code/game/objects/items/weaponry.dm | 2 +-
.../atmospherics/machinery/airalarm.dm | 2 +-
code/modules/clothing/ears/_ears.dm | 4 ++--
code/modules/clothing/gloves/color.dm | 2 ++
code/modules/clothing/gloves/miscellaneous.dm | 2 +-
code/modules/clothing/head/beanie.dm | 2 +-
code/modules/clothing/head/helmet.dm | 2 +-
code/modules/clothing/head/misc_special.dm | 2 +-
code/modules/clothing/neck/_neck.dm | 4 ++--
code/modules/clothing/shoes/colour.dm | 2 +-
code/modules/clothing/shoes/miscellaneous.dm | 4 ++--
code/modules/clothing/suits/armor.dm | 2 +-
code/modules/clothing/under/miscellaneous.dm | 2 +-
code/modules/clothing/under/pants.dm | 4 ++--
code/modules/clothing/under/skirt_dress.dm | 8 ++++----
code/modules/food_and_drinks/drinks/drinks.dm | 13 +++++++-----
.../food_and_drinks/drinks/drinks/bottle.dm | 20 ++++++++++---------
.../drinks/drinks/drinkingglass.dm | 6 ++++--
.../food_and_drinks/food/snacks_vend.dm | 6 +++---
.../modular_computers/hardware/hard_drive.dm | 2 +-
code/modules/photography/camera/camera.dm | 2 +-
code/modules/power/apc.dm | 2 +-
code/modules/power/cable.dm | 2 +-
code/modules/power/pipecleaners.dm | 2 +-
.../reagents/reagent_containers/dropper.dm | 1 +
.../reagents/reagent_containers/hypospray.dm | 3 ++-
.../reagents/reagent_containers/medigel.dm | 5 +++--
.../reagents/reagent_containers/spray.dm | 2 +-
.../reagents/reagent_containers/syringes.dm | 1 +
code/modules/vending/_vending.dm | 2 +-
code/modules/vending/assist.dm | 4 ++--
code/modules/vending/autodrobe.dm | 4 ++--
code/modules/vending/boozeomat.dm | 4 ++--
code/modules/vending/cartridge.dm | 4 ++--
code/modules/vending/cigarette.dm | 4 ++--
code/modules/vending/clothesmate.dm | 4 ++--
code/modules/vending/coffee.dm | 4 ++--
code/modules/vending/cola.dm | 4 ++--
code/modules/vending/drinnerware.dm | 4 ++--
code/modules/vending/engineering.dm | 4 ++--
code/modules/vending/engivend.dm | 4 ++--
code/modules/vending/games.dm | 4 ++--
code/modules/vending/liberation.dm | 4 ++--
code/modules/vending/liberation_toy.dm | 4 ++--
code/modules/vending/magivend.dm | 4 ++--
code/modules/vending/medical.dm | 4 ++--
code/modules/vending/medical_wall.dm | 4 ++--
code/modules/vending/megaseed.dm | 4 ++--
code/modules/vending/modularpc.dm | 4 ++--
code/modules/vending/nutrimax.dm | 4 ++--
code/modules/vending/plasmaresearch.dm | 4 ++--
code/modules/vending/robotics.dm | 2 +-
code/modules/vending/security.dm | 4 ++--
code/modules/vending/snack.dm | 4 ++--
code/modules/vending/toys.dm | 4 ++--
code/modules/vending/wardrobes.dm | 4 ++--
code/modules/vending/youtool.dm | 4 ++--
75 files changed, 151 insertions(+), 132 deletions(-)
diff --git a/code/__DEFINES/economy.dm b/code/__DEFINES/economy.dm
index 78fa3cbf6fa..d11ff8a22ed 100644
--- a/code/__DEFINES/economy.dm
+++ b/code/__DEFINES/economy.dm
@@ -1,11 +1,11 @@
#define STARTING_PAYCHECKS 5
-#define PAYCHECK_ASSISTANT 5
-#define PAYCHECK_MINIMAL 5
-#define PAYCHECK_EASY 20
-#define PAYCHECK_MEDIUM 30
-#define PAYCHECK_HARD 40
-#define PAYCHECK_COMMAND 100
+#define PAYCHECK_ASSISTANT 25
+#define PAYCHECK_MINIMAL 75
+#define PAYCHECK_EASY 125
+#define PAYCHECK_MEDIUM 175
+#define PAYCHECK_HARD 200
+#define PAYCHECK_COMMAND 250
#define MAX_GRANT_CIV 2500
#define MAX_GRANT_ENG 3000
diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm
index 395d581527a..927801294ec 100644
--- a/code/game/machinery/doors/airlock_electronics.dm
+++ b/code/game/machinery/doors/airlock_electronics.dm
@@ -1,7 +1,7 @@
/obj/item/electronics/airlock
name = "airlock electronics"
req_access = list(ACCESS_MAINT_TUNNELS)
- custom_price = 5
+ custom_price = 50
var/list/accesses = list()
var/one_access = 0
diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index cb185a7e29c..71d282237a2 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -257,7 +257,7 @@
/obj/item/electronics/firelock
name = "firelock circuitry"
- custom_price = 5
+ custom_price = 50
desc = "A circuit board used in construction of firelocks."
icon_state = "mainboard"
diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm
index 390d03a5a29..d3e91a9055d 100644
--- a/code/game/machinery/firealarm.dm
+++ b/code/game/machinery/firealarm.dm
@@ -2,7 +2,7 @@
/obj/item/electronics/firealarm
name = "fire alarm electronics"
- custom_price = 5
+ custom_price = 50
desc = "A fire alarm circuit. Can handle heat levels up to 40 degrees celsius."
/obj/item/wallframe/firealarm
diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm
index a0c8a687ebc..a4ee3fd5535 100644
--- a/code/game/objects/items/RCD.dm
+++ b/code/game/objects/items/RCD.dm
@@ -187,7 +187,7 @@ RLD
icon_state = "rcd"
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
- custom_price = 150
+ custom_price = 1700
max_matter = 160
slot_flags = ITEM_SLOT_BELT
item_flags = NO_MAT_REDEMPTION | NOBLUDGEON
diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm
index 35db809ebca..1ca16a4f3fd 100644
--- a/code/game/objects/items/cigs_lighters.dm
+++ b/code/game/objects/items/cigs_lighters.dm
@@ -578,6 +578,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
resistance_flags = FIRE_PROOF
light_color = LIGHT_COLOR_FIRE
grind_results = list(/datum/reagent/iron = 1, /datum/reagent/fuel = 5, /datum/reagent/fuel/oil = 5)
+ custom_price = 55
/obj/item/lighter/Initialize()
. = ..()
diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm
index 77cd7018b6e..49d19f11855 100644
--- a/code/game/objects/items/circuitboards/machine_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm
@@ -503,7 +503,7 @@
/obj/item/circuitboard/machine/vendor
name = "Custom Vendor (Machine Board)"
desc = "You can turn the \"brand selection\" dial using a screwdriver."
- custom_premium_price = 30
+ custom_premium_price = 100
build_path = /obj/machinery/vending/custom
req_components = list(/obj/item/vending_refill/custom = 1)
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index a95e88a100e..3c893760a9a 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -1,7 +1,7 @@
/obj/item/flashlight
name = "flashlight"
desc = "A hand-held emergency light."
- custom_price = 10
+ custom_price = 100
icon = 'icons/obj/lighting.dmi'
icon_state = "flashlight"
item_state = "flashlight"
@@ -423,7 +423,7 @@
/obj/item/flashlight/glowstick
name = "glowstick"
desc = "A military-grade glowstick."
- custom_price = 10
+ custom_price = 50
w_class = WEIGHT_CLASS_SMALL
brightness_on = 4
color = LIGHT_COLOR_GREEN
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index 9ffb758774a..f496d5cd57d 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -13,7 +13,7 @@ GENE SCANNER
/obj/item/t_scanner
name = "\improper T-ray scanner"
desc = "A terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes."
- custom_price = 10
+ custom_price = 150
icon = 'icons/obj/device.dmi'
icon_state = "t-ray0"
var/on = FALSE
@@ -90,6 +90,7 @@ GENE SCANNER
var/mode = 1
var/scanmode = 0
var/advanced = FALSE
+ custom_price = 300
/obj/item/healthanalyzer/suicide_act(mob/living/carbon/user)
user.visible_message("[user] begins to analyze [user.p_them()]self with [src]! The display shows that [user.p_theyre()] dead!")
@@ -449,7 +450,7 @@ GENE SCANNER
/obj/item/analyzer
desc = "A hand-held environmental scanner which reports current gas levels. Alt-Click to use the built in barometer function."
name = "analyzer"
- custom_price = 10
+ custom_price = 100
icon = 'icons/obj/device.dmi'
icon_state = "analyzer"
item_state = "analyzer"
diff --git a/code/game/objects/items/devices/sensor_device.dm b/code/game/objects/items/devices/sensor_device.dm
index 6f78fe01b65..07b975f1338 100644
--- a/code/game/objects/items/devices/sensor_device.dm
+++ b/code/game/objects/items/devices/sensor_device.dm
@@ -5,7 +5,7 @@
icon_state = "scanner"
w_class = WEIGHT_CLASS_SMALL
slot_flags = ITEM_SLOT_BELT
- custom_price = 100
+ custom_price = 1750
/obj/item/sensor_device/attack_self(mob/user)
GLOB.crewmonitor.show(user,src) //Proc already exists, just had to call it
diff --git a/code/game/objects/items/kitchen.dm b/code/game/objects/items/kitchen.dm
index b3f17a24690..8f884acd403 100644
--- a/code/game/objects/items/kitchen.dm
+++ b/code/game/objects/items/kitchen.dm
@@ -64,7 +64,7 @@
w_class = WEIGHT_CLASS_TINY
throwforce = 0
custom_materials = list(/datum/material/plastic=80)
- custom_price = 5
+ custom_price = 50
var/break_chance = 25
/obj/item/kitchen/fork/plastic/afterattack(mob/living/carbon/user)
@@ -90,7 +90,7 @@
sharpness = IS_SHARP_ACCURATE
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
var/bayonet = FALSE //Can this be attached to a gun?
- custom_price = 30
+ custom_price = 250
/obj/item/kitchen/knife/Initialize()
. = ..()
@@ -122,7 +122,7 @@
custom_materials = list(/datum/material/plastic = 100)
attack_verb = list("prodded", "whiffed","scratched", "poked")
sharpness = IS_SHARP
- custom_price = 5
+ custom_price = 50
var/break_chance = 25
/obj/item/kitchen/knife/plastic/afterattack(mob/living/carbon/user)
@@ -151,7 +151,7 @@
custom_materials = list(/datum/material/iron=18000)
attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
w_class = WEIGHT_CLASS_NORMAL
- custom_price = 60
+ custom_price = 600
/obj/item/kitchen/knife/combat
name = "combat knife"
@@ -217,7 +217,7 @@
throw_range = 7
w_class = WEIGHT_CLASS_NORMAL
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
- custom_price = 20
+ custom_price = 200
/obj/item/kitchen/rollingpin/suicide_act(mob/living/carbon/user)
user.visible_message("[user] begins flattening [user.p_their()] head with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")
@@ -232,7 +232,7 @@
w_class = WEIGHT_CLASS_TINY
throwforce = 0
custom_materials = list(/datum/material/plastic=120)
- custom_price = 5
+ custom_price = 50
var/break_chance = 25
/obj/item/kitchen/knife/plastic/afterattack(mob/living/carbon/user)
diff --git a/code/game/objects/items/pinpointer.dm b/code/game/objects/items/pinpointer.dm
index 4c1b01d4366..8a60df20960 100644
--- a/code/game/objects/items/pinpointer.dm
+++ b/code/game/objects/items/pinpointer.dm
@@ -86,7 +86,7 @@
name = "crew pinpointer"
desc = "A handheld tracking device that points to crew suit sensors."
icon_state = "pinpointer_crew"
- custom_price = 150
+ custom_price = 1000
var/has_owner = FALSE
var/pinpointer_owner = null
diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm
index b3ad5c2f253..67f0da17ae3 100644
--- a/code/game/objects/items/stacks/medical.dm
+++ b/code/game/objects/items/stacks/medical.dm
@@ -112,6 +112,7 @@
self_delay = 20
max_amount = 12
grind_results = list(/datum/reagent/cellulose = 2)
+ custom_price = 100
/obj/item/stack/medical/gauze/heal(mob/living/M, mob/user)
if(ishuman(M))
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index 1bcee95cca8..43d2b10ac69 100644
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -34,7 +34,7 @@
icon_state = "utilitybelt"
item_state = "utility"
content_overlays = TRUE
- custom_price = 50
+ custom_premium_price = 300
drop_sound = 'sound/items/handling/toolbelt_drop.ogg'
pickup_sound = 'sound/items/handling/toolbelt_pickup.ogg'
@@ -221,7 +221,7 @@
icon_state = "securitywebbing"
item_state = "securitywebbing"
content_overlays = FALSE
- custom_premium_price = 800
+ custom_premium_price = 900
/obj/item/storage/belt/security/webbing/ComponentInitialize()
. = ..()
@@ -574,7 +574,7 @@
icon_state = "fannypack_leather"
item_state = "fannypack_leather"
dying_key = DYE_REGISTRY_FANNYPACK
- custom_price = 15
+ custom_price = 100
/obj/item/storage/belt/fannypack/ComponentInitialize()
. = ..()
diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm
index 05d565b270d..bd7268e956f 100644
--- a/code/game/objects/items/storage/boxes.dm
+++ b/code/game/objects/items/storage/boxes.dm
@@ -646,6 +646,7 @@
slot_flags = ITEM_SLOT_BELT
drop_sound = 'sound/items/handling/matchbox_drop.ogg'
pickup_sound = 'sound/items/handling/matchbox_pickup.ogg'
+ custom_price = 20
/obj/item/storage/box/matches/ComponentInitialize()
. = ..()
@@ -1102,7 +1103,7 @@
/obj/item/storage/box/dishdrive
name = "DIY Dish Drive Kit"
desc = "Contains everything you need to build your own Dish Drive!"
- custom_premium_price = 200
+ custom_premium_price = 1000
/obj/item/storage/box/dishdrive/PopulateContents()
var/static/items_inside = list(
diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm
index 36568f5d002..aedec748065 100644
--- a/code/game/objects/items/storage/fancy.dm
+++ b/code/game/objects/items/storage/fancy.dm
@@ -136,6 +136,7 @@
icon_type = "cigarette"
spawn_type = /obj/item/clothing/mask/cigarette/space_cigarette
var/candy = FALSE //for cigarette overlay
+ custom_price = 75
/obj/item/storage/fancy/cigarettes/ComponentInitialize()
. = ..()
@@ -289,6 +290,7 @@
icon_state = "cig_paper_pack"
icon_type = "rolling paper"
spawn_type = /obj/item/rollingpaper
+ custom_price = 25
/obj/item/storage/fancy/rollingpapers/ComponentInitialize()
. = ..()
diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm
index 16d9a29c0d0..88968a6f78a 100644
--- a/code/game/objects/items/storage/firstaid.dm
+++ b/code/game/objects/items/storage/firstaid.dm
@@ -231,7 +231,7 @@
desc = "An advanced kit to help deal with advanced wounds."
icon_state = "radfirstaid"
item_state = "firstaid-rad"
- custom_premium_price = 600
+ custom_premium_price = 1100
/obj/item/storage/firstaid/advanced/PopulateContents()
if(empty)
diff --git a/code/game/objects/items/tanks/watertank.dm b/code/game/objects/items/tanks/watertank.dm
index 08918f8f2bc..184a117460f 100644
--- a/code/game/objects/items/tanks/watertank.dm
+++ b/code/game/objects/items/tanks/watertank.dm
@@ -147,7 +147,7 @@
desc = "A janitorial cleaner backpack with nozzle to clean blood and graffiti."
icon_state = "waterbackpackjani"
item_state = "waterbackpackjani"
- custom_price = 100
+ custom_price = 1200
/obj/item/watertank/janitor/Initialize()
. = ..()
diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm
index 9b1e07ac2c2..3ae77c594e9 100644
--- a/code/game/objects/items/weaponry.dm
+++ b/code/game/objects/items/weaponry.dm
@@ -526,7 +526,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
icon_state = "skateboard2"
item_state = "skateboard2"
board_item_type = /obj/vehicle/ridden/scooter/skateboard/pro
- custom_premium_price = 300
+ custom_premium_price = 500
/obj/item/melee/skateboard/hoverboard
name = "hoverboard"
diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm
index fbd9b23c081..8e2f5d5fedb 100644
--- a/code/modules/atmospherics/machinery/airalarm.dm
+++ b/code/modules/atmospherics/machinery/airalarm.dm
@@ -35,7 +35,7 @@
/obj/item/electronics/airalarm
name = "air alarm electronics"
- custom_price = 5
+ custom_price = 50
icon_state = "airalarm_electronics"
/obj/item/wallframe/airalarm
diff --git a/code/modules/clothing/ears/_ears.dm b/code/modules/clothing/ears/_ears.dm
index c9d1d1d6150..531e0e84754 100644
--- a/code/modules/clothing/ears/_ears.dm
+++ b/code/modules/clothing/ears/_ears.dm
@@ -15,7 +15,7 @@
strip_delay = 15
equip_delay_other = 25
resistance_flags = FLAMMABLE
- custom_price = 40
+ custom_price = 250
/obj/item/clothing/ears/earmuffs/ComponentInitialize()
. = ..()
@@ -31,7 +31,7 @@
slot_flags = ITEM_SLOT_EARS | ITEM_SLOT_HEAD | ITEM_SLOT_NECK //Fluff item, put it whereever you want!
actions_types = list(/datum/action/item_action/toggle_headphones)
var/headphones_on = FALSE
- custom_price = 20
+ custom_price = 125
/obj/item/clothing/ears/headphones/Initialize()
. = ..()
diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm
index 3639082a8dc..8b2d63af046 100644
--- a/code/modules/clothing/gloves/color.dm
+++ b/code/modules/clothing/gloves/color.dm
@@ -9,6 +9,8 @@
siemens_coefficient = 0
permeability_coefficient = 0.05
resistance_flags = NONE
+ custom_price = 1200
+ custom_premium_price = 1200
/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."
diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm
index 3d62896cfe9..b7dd648f58c 100644
--- a/code/modules/clothing/gloves/miscellaneous.dm
+++ b/code/modules/clothing/gloves/miscellaneous.dm
@@ -9,7 +9,7 @@
equip_delay_other = 20
cold_protection = HANDS
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
- custom_price = 10
+ custom_price = 75
undyeable = TRUE
/obj/item/clothing/gloves/botanic_leather
diff --git a/code/modules/clothing/head/beanie.dm b/code/modules/clothing/head/beanie.dm
index 76ee72bc58a..ddea5ae71fb 100644
--- a/code/modules/clothing/head/beanie.dm
+++ b/code/modules/clothing/head/beanie.dm
@@ -7,7 +7,7 @@
name = "white beanie"
desc = "A stylish beanie. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their heads."
icon_state = "beanie" //Default white
- custom_price = 10
+ custom_price = 60
/obj/item/clothing/head/beanie/black
name = "black beanie"
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index cb1f16cae80..cc9c882b211 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -83,7 +83,7 @@
desc = "A reliable, blue tinted helmet reminding you that you still owe that engineer a beer."
icon_state = "blueshift"
item_state = "blueshift"
- custom_premium_price = 450
+ custom_premium_price = 750
/obj/item/clothing/head/helmet/riot
name = "riot helmet"
diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm
index d1e72ce4242..34a99af3e13 100644
--- a/code/modules/clothing/head/misc_special.dm
+++ b/code/modules/clothing/head/misc_special.dm
@@ -274,7 +274,7 @@
desc = "A bunch of hair without a head attached. This one changes color to match the hair of the wearer. Nothing natural about that."
color = "#FFF"
adjustablecolor = FALSE
- custom_price = 25
+ custom_price = 100
/obj/item/clothing/head/wig/natural/Initialize(mapload)
hairstyle = pick(GLOB.hairstyles_list - "Bald")
diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm
index 67f79844c3f..021cda5e9a5 100644
--- a/code/modules/clothing/neck/_neck.dm
+++ b/code/modules/clothing/neck/_neck.dm
@@ -22,7 +22,7 @@
icon_state = "bluetie"
item_state = "" //no inhands
w_class = WEIGHT_CLASS_SMALL
- custom_price = 15
+ custom_price = 60
/obj/item/clothing/neck/tie/blue
name = "blue tie"
@@ -93,7 +93,7 @@
icon_state = "scarf"
desc = "A stylish scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks."
dog_fashion = /datum/dog_fashion/head
- custom_price = 10
+ custom_price = 60
/obj/item/clothing/neck/scarf/black
name = "black scarf"
diff --git a/code/modules/clothing/shoes/colour.dm b/code/modules/clothing/shoes/colour.dm
index f6a6c14ce1a..3a610bc68f3 100644
--- a/code/modules/clothing/shoes/colour.dm
+++ b/code/modules/clothing/shoes/colour.dm
@@ -5,7 +5,7 @@
name = "black shoes"
icon_state = "black"
desc = "A pair of black shoes."
- custom_price = 20
+ custom_price = 50
cold_protection = FEET
min_cold_protection_temperature = SHOES_MIN_TEMP_PROTECT
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index 59c30a4cd6f..5e98c877ab6 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -56,7 +56,7 @@
resistance_flags = NONE
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 40, "acid" = 75)
can_be_bloody = FALSE
- custom_price = 100
+ custom_price = 600
/obj/item/clothing/shoes/galoshes/dry
name = "absorbent galoshes"
@@ -339,7 +339,7 @@
icon_state = "cowboy_brown"
permeability_coefficient = 0.05 //these are quite tall
pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes
- custom_price = 35 //poor assistants cant afford 50 credits
+ custom_price = 60
var/list/occupants = list()
var/max_occupants = 4
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 816279b0d2f..cfa8dca5238 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -41,7 +41,7 @@
desc = "A large, yet comfortable piece of armor, protecting you from some threats."
icon_state = "blueshift"
item_state = "blueshift"
- custom_premium_price = 600
+ custom_premium_price = 750
/obj/item/clothing/suit/armor/hos
name = "armored greatcoat"
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index 08f0baaee42..33ed895c8ca 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -72,7 +72,7 @@
icon_state = "overalls"
item_state = "lb_suit"
can_adjust = FALSE
- custom_price = 20
+ custom_price = 60
/obj/item/clothing/under/misc/assistantformal
name = "assistant's formal uniform"
diff --git a/code/modules/clothing/under/pants.dm b/code/modules/clothing/under/pants.dm
index 21b66429f06..a05d96f998c 100644
--- a/code/modules/clothing/under/pants.dm
+++ b/code/modules/clothing/under/pants.dm
@@ -3,7 +3,7 @@
body_parts_covered = GROIN|LEGS
fitted = NO_FEMALE_UNIFORM
can_adjust = FALSE
- custom_price = 20
+ custom_price = 60
icon = 'icons/obj/clothing/under/shorts_pants.dmi'
mob_overlay_icon = 'icons/mob/clothing/under/shorts_pants.dmi'
@@ -16,7 +16,7 @@
name = "Must Hang jeans"
desc = "Made in the finest space jeans factory this side of Alpha Centauri."
icon_state = "jeansmustang"
- custom_price = 75
+ custom_price = 180
/obj/item/clothing/under/pants/blackjeans
name = "black jeans"
diff --git a/code/modules/clothing/under/skirt_dress.dm b/code/modules/clothing/under/skirt_dress.dm
index 1710bac4934..0968ea5cc2f 100644
--- a/code/modules/clothing/under/skirt_dress.dm
+++ b/code/modules/clothing/under/skirt_dress.dm
@@ -46,21 +46,21 @@
desc = "A blue, casual skirt."
icon_state = "blueskirt"
item_state = "b_suit"
- custom_price = 25
+ custom_price = 60
/obj/item/clothing/under/dress/skirt/red
name = "red skirt"
desc = "A red, casual skirt."
icon_state = "redskirt"
item_state = "r_suit"
- custom_price = 25
+ custom_price = 60
/obj/item/clothing/under/dress/skirt/purple
name = "purple skirt"
desc = "A purple, casual skirt."
icon_state = "purpleskirt"
item_state = "p_suit"
- custom_price = 25
+ custom_price = 60
/obj/item/clothing/under/dress/skirt/plaid
name = "red plaid skirt"
@@ -69,7 +69,7 @@
item_state = "plaid_red"
can_adjust = TRUE
alt_covers_chest = TRUE
- custom_price = 25
+ custom_price = 60
/obj/item/clothing/under/dress/skirt/plaid/blue
name = "blue plaid skirt"
diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
index bd3b48de4e1..604ffcafe8a 100644
--- a/code/modules/food_and_drinks/drinks/drinks.dm
+++ b/code/modules/food_and_drinks/drinks/drinks.dm
@@ -211,7 +211,7 @@
/obj/item/reagent_containers/food/drinks/ice
name = "ice cup"
desc = "Careful, cold ice, do not chew."
- custom_price = 5
+ custom_price = 15
icon_state = "coffee"
list_reagents = list(/datum/reagent/consumable/ice = 30)
spillable = TRUE
@@ -246,7 +246,7 @@
list_reagents = list(/datum/reagent/consumable/hot_coco = 15, /datum/reagent/consumable/sugar = 5)
foodtype = SUGAR
resistance_flags = FREEZE_PROOF
- custom_price = 42
+ custom_price = 120
/obj/item/reagent_containers/food/drinks/dry_ramen
@@ -256,7 +256,7 @@
list_reagents = list(/datum/reagent/consumable/dry_ramen = 15, /datum/reagent/consumable/sodiumchloride = 3)
foodtype = GRAIN
isGlass = FALSE
- custom_price = 38
+ custom_price = 95
/obj/item/reagent_containers/food/drinks/waterbottle
name = "bottle of water"
@@ -276,6 +276,7 @@
var/cap_lost = FALSE
var/mutable_appearance/cap_overlay
var/flip_chance = 10
+ custom_price = 30
/obj/item/reagent_containers/food/drinks/waterbottle/Initialize()
. = ..()
@@ -395,6 +396,7 @@
icon_state = "beer"
list_reagents = list(/datum/reagent/consumable/ethanol/beer = 30)
foodtype = GRAIN | ALCOHOL
+ custom_price = 60
/obj/item/reagent_containers/food/drinks/beer/light
name = "Carp Lite"
@@ -408,6 +410,7 @@
item_state = "beer"
list_reagents = list(/datum/reagent/consumable/ethanol/ale = 30)
foodtype = GRAIN | ALCOHOL
+ custom_price = 60
/obj/item/reagent_containers/food/drinks/sillycup
name = "paper cup"
@@ -523,7 +526,7 @@
/obj/item/reagent_containers/food/drinks/flask
name = "flask"
desc = "Every good spaceman knows it's a good idea to bring along a couple of pints of whiskey wherever they go."
- custom_price = 30
+ custom_price = 200
icon_state = "flask"
custom_materials = list(/datum/material/iron=250)
volume = 60
@@ -558,7 +561,7 @@
reagent_flags = NONE
spillable = FALSE
isGlass = FALSE
- custom_price = 10
+ custom_price = 45
/obj/item/reagent_containers/food/drinks/soda_cans/suicide_act(mob/living/carbon/human/H)
if(!reagents.total_volume)
diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
index 9d91515f92e..76e5b97150d 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -329,7 +329,7 @@
/obj/item/reagent_containers/food/drinks/bottle/orangejuice
name = "orange juice"
desc = "Full of vitamins and deliciousness!"
- custom_price = 10
+ custom_price = 100
icon_state = "orangejuice"
item_state = "carton"
lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
@@ -341,7 +341,7 @@
/obj/item/reagent_containers/food/drinks/bottle/cream
name = "milk cream"
desc = "It's cream. Made from milk. What else did you think you'd find in there?"
- custom_price = 10
+ custom_price = 100
icon_state = "cream"
item_state = "carton"
lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
@@ -353,7 +353,7 @@
/obj/item/reagent_containers/food/drinks/bottle/tomatojuice
name = "tomato juice"
desc = "Well, at least it LOOKS like tomato juice. You can't tell with all that redness."
- custom_price = 10
+ custom_price = 100
icon_state = "tomatojuice"
item_state = "carton"
lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
@@ -365,7 +365,7 @@
/obj/item/reagent_containers/food/drinks/bottle/limejuice
name = "lime juice"
desc = "Sweet-sour goodness."
- custom_price = 10
+ custom_price = 100
icon_state = "limejuice"
item_state = "carton"
lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
@@ -377,7 +377,7 @@
/obj/item/reagent_containers/food/drinks/bottle/menthol
name = "menthol"
desc = "Tastes naturally minty, and imparts a very mild numbing sensation."
- custom_price = 10
+ custom_price = 100
icon_state = "mentholbox"
item_state = "carton"
lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
@@ -388,7 +388,7 @@
/obj/item/reagent_containers/food/drinks/bottle/grenadine
name = "Jester Grenadine"
desc = "Contains 0% real cherries!"
- custom_price = 10
+ custom_price = 100
icon_state = "grenadine"
isGlass = TRUE
list_reagents = list(/datum/reagent/consumable/grenadine = 100)
@@ -397,7 +397,7 @@
/obj/item/reagent_containers/food/drinks/bottle/applejack
name = "Buckin' Bronco's Applejack"
desc = "Kicks like a horse, tastes like an apple!"
- custom_price = 10
+ custom_price = 100
icon_state = "applejack_bottle"
isGlass = TRUE
list_reagents = list(/datum/reagent/consumable/ethanol/applejack = 100)
@@ -406,7 +406,7 @@
/obj/item/reagent_containers/food/drinks/bottle/champagne
name = "Eau d' Dandy Brut Champagne"
desc = "Finely sourced from only the most pretentious French vineyards."
- custom_premium_price = 200
+ custom_premium_price = 250
icon_state = "champagne_bottle"
isGlass = TRUE
list_reagents = list(/datum/reagent/consumable/ethanol/champagne = 100)
@@ -420,7 +420,7 @@
/obj/item/reagent_containers/food/drinks/bottle/trappist
name = "Mont de Requin Trappistes Bleu"
desc = "Brewed in space-Belgium. Fancy!"
- custom_premium_price = 50
+ custom_premium_price = 170
icon_state = "trappistbottle"
volume = 50
list_reagents = list(/datum/reagent/consumable/ethanol/trappist = 50)
@@ -442,6 +442,7 @@
desc = "This blank bottle is unyieldingly anonymous, offering no clues to it's contents."
icon_state = "glassbottle"
fill_icon_thresholds = list(0, 10, 20, 30, 40, 50, 60, 70, 80, 90)
+ custom_price = 65
/obj/item/reagent_containers/food/drinks/bottle/blank/update_icon()
..()
@@ -452,6 +453,7 @@
desc = "This small bottle is unyieldingly anonymous, offering no clues to it's contents."
icon_state = "glassbottlesmall"
volume = 50
+ custom_price = 55
////////////////////////// MOLOTOV ///////////////////////
/obj/item/reagent_containers/food/drinks/bottle/molotov
diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
index 6225514527e..0307348d202 100644
--- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
@@ -3,7 +3,7 @@
/obj/item/reagent_containers/food/drinks/drinkingglass
name = "drinking glass"
desc = "Your standard drinking glass."
- custom_price = 5
+ custom_price = 50
icon_state = "glass_empty"
amount_per_transfer_from_this = 10
volume = 50
@@ -14,6 +14,7 @@
obj_flags = UNIQUE_RENAME
drop_sound = 'sound/items/handling/drinkglass_drop.ogg'
pickup_sound = 'sound/items/handling/drinkglass_pickup.ogg'
+ custom_price = 25
/obj/item/reagent_containers/food/drinks/drinkingglass/on_reagent_change(changetype)
cut_overlays()
@@ -43,13 +44,14 @@
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass
name = "shot glass"
desc = "A shot glass - the universal symbol for bad decisions."
- custom_price = 5
+ custom_price = 50
icon_state = "shotglass"
gulp_size = 15
amount_per_transfer_from_this = 15
possible_transfer_amounts = list()
volume = 15
custom_materials = list(/datum/material/glass=100)
+ custom_price = 20
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/on_reagent_change(changetype)
cut_overlays()
diff --git a/code/modules/food_and_drinks/food/snacks_vend.dm b/code/modules/food_and_drinks/food/snacks_vend.dm
index fb3203c6375..4e34de55a92 100644
--- a/code/modules/food_and_drinks/food/snacks_vend.dm
+++ b/code/modules/food_and_drinks/food/snacks_vend.dm
@@ -52,7 +52,7 @@
filling_color = "#8B0000"
tastes = list("dried raisins" = 1)
foodtype = JUNKFOOD | FRUIT | SUGAR
- custom_price = 30
+ custom_price = 90
/obj/item/reagent_containers/food/snacks/no_raisin/healthy
name = "homemade raisins"
@@ -69,7 +69,7 @@
junkiness = 25
filling_color = "#FFD700"
foodtype = JUNKFOOD | GRAIN | SUGAR
- custom_price = 11
+ custom_price = 30
/obj/item/reagent_containers/food/snacks/candy_trash
name = "candy cigarette butt"
@@ -95,7 +95,7 @@
filling_color = "#FFD700"
tastes = list("cheese" = 5, "crisps" = 2)
foodtype = JUNKFOOD | DAIRY | SUGAR
- custom_price = 16
+ custom_price = 45
/obj/item/reagent_containers/food/snacks/syndicake
name = "syndi-cakes"
diff --git a/code/modules/modular_computers/hardware/hard_drive.dm b/code/modules/modular_computers/hardware/hard_drive.dm
index e03ace05a5e..0ad9f464ca0 100644
--- a/code/modules/modular_computers/hardware/hard_drive.dm
+++ b/code/modules/modular_computers/hardware/hard_drive.dm
@@ -157,7 +157,7 @@
max_capacity = 64
icon_state = "ssd_mini"
w_class = WEIGHT_CLASS_TINY
- custom_price = 15
+ custom_price = 150
// Syndicate variant - very slight better
/obj/item/computer_hardware/hard_drive/small/syndicate
diff --git a/code/modules/photography/camera/camera.dm b/code/modules/photography/camera/camera.dm
index 6e99cba2f68..2bcd2ad4f3e 100644
--- a/code/modules/photography/camera/camera.dm
+++ b/code/modules/photography/camera/camera.dm
@@ -15,7 +15,7 @@
flags_1 = CONDUCT_1
slot_flags = ITEM_SLOT_NECK
custom_materials = list(/datum/material/iron = 50, /datum/material/glass = 150)
- custom_price = 80
+ custom_price = 120
var/flash_enabled = TRUE
var/state_on = "camera"
var/state_off = "camera_off"
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index e19faccaa81..9f31743e15c 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -1438,5 +1438,5 @@
/obj/item/electronics/apc
name = "power control module"
icon_state = "power_mod"
- custom_price = 5
+ custom_price = 50
desc = "Heavy-duty switching circuits for power control."
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 427540a47eb..7eb860f23ab 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -381,7 +381,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list(new/datum/stack_recipe("cable restrain
/obj/item/stack/cable_coil
name = "cable coil"
- custom_price = 30
+ custom_price = 75
gender = NEUTER //That's a cable coil sounds better than that's some cable coils
icon = 'icons/obj/power.dmi'
icon_state = "coil"
diff --git a/code/modules/power/pipecleaners.dm b/code/modules/power/pipecleaners.dm
index ab3d2e1a683..4b75fe34784 100644
--- a/code/modules/power/pipecleaners.dm
+++ b/code/modules/power/pipecleaners.dm
@@ -179,7 +179,7 @@ By design, d1 is the smallest direction and d2 is the highest
/obj/item/stack/pipe_cleaner_coil
name = "pipe cleaner coil"
desc = "A coil of pipe cleaners. Good for arts and crafts, not to build with."
- custom_price = 15
+ custom_price = 25
gender = NEUTER //That's a pipe_cleaner coil sounds better than that's some pipe_cleaner coils
icon = 'icons/obj/power.dmi'
icon_state = "pipecleaner"
diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm
index 07f321125e9..4b79b60941a 100644
--- a/code/modules/reagents/reagent_containers/dropper.dm
+++ b/code/modules/reagents/reagent_containers/dropper.dm
@@ -7,6 +7,7 @@
possible_transfer_amounts = list(1, 2, 3, 4, 5)
volume = 5
reagent_flags = TRANSPARENT
+ custom_price = 75
/obj/item/reagent_containers/dropper/afterattack(obj/target, mob/user , proximity)
. = ..()
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index 41bc544e91c..04c6bc3d48f 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -108,7 +108,8 @@
reagent_flags = DRAWABLE
flags_1 = null
list_reagents = list(/datum/reagent/medicine/epinephrine = 10, /datum/reagent/toxin/formaldehyde = 3)
- custom_price = 40
+ custom_price = 150
+ custom_premium_price = 300
/obj/item/reagent_containers/hypospray/medipen/suicide_act(mob/living/carbon/user)
user.visible_message("[user] begins to choke on \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")
diff --git a/code/modules/reagents/reagent_containers/medigel.dm b/code/modules/reagents/reagent_containers/medigel.dm
index 42b012af382..af47d6360a7 100644
--- a/code/modules/reagents/reagent_containers/medigel.dm
+++ b/code/modules/reagents/reagent_containers/medigel.dm
@@ -22,7 +22,7 @@
var/self_delay = 30
var/squirt_mode = 0
var/squirt_amount = 5
- custom_price = 40
+ custom_price = 350
/obj/item/reagent_containers/medigel/attack_self(mob/user)
squirt_mode = !squirt_mode
@@ -83,9 +83,10 @@
desc = "A medical gel applicator bottle, designed for precision application, with an unscrewable cap. This one contains instabitaluri, a brute and burn healing agent."
icon_state = "synthgel"
list_reagents = list(/datum/reagent/medicine/C2/instabitaluri = 60)
- custom_price = 80
+ custom_price = 600
/obj/item/reagent_containers/medigel/sterilizine
name = "sterilizer gel"
desc = "gel bottle loaded with non-toxic sterilizer. Useful in preparation for surgery."
list_reagents = list(/datum/reagent/space_cleaner/sterilizine = 60)
+ custom_price = 175
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index e6c3607dd6c..1883878aac9 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -373,7 +373,7 @@
spray_range = 4
stream_range = 2
volume = 100
- custom_premium_price = 200
+ custom_premium_price = 900
/obj/item/reagent_containers/spray/syndicate/Initialize()
. = ..()
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index 1f19f19750a..2b48b33f947 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -14,6 +14,7 @@
var/proj_piercing = 0 //does it pierce through thick clothes when shot with syringe gun
custom_materials = list(/datum/material/iron=10, /datum/material/glass=20)
reagent_flags = TRANSPARENT
+ custom_price = 150
/obj/item/reagent_containers/syringe/Initialize()
. = ..()
diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm
index e56f571fbee..0c815bf0c4f 100644
--- a/code/modules/vending/_vending.dm
+++ b/code/modules/vending/_vending.dm
@@ -1152,7 +1152,7 @@ GLOBAL_LIST_EMPTY(vending_products)
/obj/item/vending_refill/custom
machine_name = "Custom Vendor"
icon_state = "refill_custom"
- custom_premium_price = 30
+ custom_premium_price = 100
/obj/item/price_tagger
name = "price tagger"
diff --git a/code/modules/vending/assist.dm b/code/modules/vending/assist.dm
index 717a38be47b..40b183160b5 100644
--- a/code/modules/vending/assist.dm
+++ b/code/modules/vending/assist.dm
@@ -18,8 +18,8 @@
/obj/item/circuitboard/machine/vendor = 3)
refill_canister = /obj/item/vending_refill/assist
product_ads = "Only the finest!;Have some tools.;The most robust equipment.;The finest gear in space!"
- default_price = 10
- extra_price = 50
+ default_price = 125
+ extra_price = 100
payment_department = NO_FREEBIES
/obj/item/vending_refill/assist
diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm
index 7224e42fe32..5de273285be 100644
--- a/code/modules/vending/autodrobe.dm
+++ b/code/modules/vending/autodrobe.dm
@@ -139,8 +139,8 @@
/obj/item/skub = 1,
/obj/item/clothing/suit/hooded/mysticrobe = 1)
refill_canister = /obj/item/vending_refill/autodrobe
- default_price = 50
- extra_price = 75
+ default_price = 180
+ extra_price = 360
payment_department = ACCOUNT_SRV
/obj/machinery/vending/autodrobe/canLoadItem(obj/item/I,mob/user)
diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm
index 8dfd75ed130..4bcc558347b 100644
--- a/code/modules/vending/boozeomat.dm
+++ b/code/modules/vending/boozeomat.dm
@@ -45,8 +45,8 @@
product_ads = "Drink up!;Booze is good for you!;Alcohol is humanity's best friend.;Quite delighted to serve you!;Care for a nice, cold beer?;Nothing cures you like booze!;Have a sip!;Have a drink!;Have a beer!;Beer is good for you!;Only the finest alcohol!;Best quality booze since 2053!;Award-winning wine!;Maximum alcohol!;Man loves beer.;A toast for progress!"
req_access = list(ACCESS_BAR)
refill_canister = /obj/item/vending_refill/boozeomat
- default_price = 20
- extra_price = 50
+ default_price = 120
+ extra_price = 200
payment_department = ACCOUNT_SRV
/obj/machinery/vending/boozeomat/all_access
diff --git a/code/modules/vending/cartridge.dm b/code/modules/vending/cartridge.dm
index ec447026085..120cbf08ee2 100644
--- a/code/modules/vending/cartridge.dm
+++ b/code/modules/vending/cartridge.dm
@@ -14,8 +14,8 @@
/obj/item/cartridge/captain = 3,
/obj/item/cartridge/quartermaster = 10)
refill_canister = /obj/item/vending_refill/cart
- default_price = 50
- extra_price = 100
+ default_price = 250
+ extra_price = 500
payment_department = ACCOUNT_SRV
/obj/item/vending_refill/cart
diff --git a/code/modules/vending/cigarette.dm b/code/modules/vending/cigarette.dm
index d71b7f124c9..b30c5b1340a 100644
--- a/code/modules/vending/cigarette.dm
+++ b/code/modules/vending/cigarette.dm
@@ -20,8 +20,8 @@
/obj/item/storage/fancy/cigarettes/cigars/havana = 1,
/obj/item/storage/fancy/cigarettes/cigars/cohiba = 1)
refill_canister = /obj/item/vending_refill/cigarette
- default_price = 10
- extra_price = 50
+ default_price = 75
+ extra_price = 250
payment_department = ACCOUNT_SRV
/obj/machinery/vending/cigarette/syndicate
diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm
index 6db189b1088..294e18d5c6b 100644
--- a/code/modules/vending/clothesmate.dm
+++ b/code/modules/vending/clothesmate.dm
@@ -128,8 +128,8 @@
/obj/item/clothing/neck/necklace/dope = 3,
/obj/item/clothing/suit/jacket/letterman_nanotrasen = 1)
refill_canister = /obj/item/vending_refill/clothing
- default_price = 50
- extra_price = 75
+ default_price = 60
+ extra_price = 120
payment_department = NO_FREEBIES
/obj/machinery/vending/clothing/canLoadItem(obj/item/I,mob/user)
diff --git a/code/modules/vending/coffee.dm b/code/modules/vending/coffee.dm
index 007135a5ef8..c6b47757eb5 100644
--- a/code/modules/vending/coffee.dm
+++ b/code/modules/vending/coffee.dm
@@ -9,8 +9,8 @@
/obj/item/reagent_containers/food/drinks/mug/coco = 3)
contraband = list(/obj/item/reagent_containers/food/drinks/ice = 12)
refill_canister = /obj/item/vending_refill/coffee
- default_price = 10
- extra_price = 25
+ default_price = 45
+ extra_price = 150
payment_department = ACCOUNT_SRV
/obj/item/vending_refill/coffee
machine_name = "Solar's Best Hot Drinks"
diff --git a/code/modules/vending/cola.dm b/code/modules/vending/cola.dm
index 69def37ddf6..f0bc791ffda 100644
--- a/code/modules/vending/cola.dm
+++ b/code/modules/vending/cola.dm
@@ -20,8 +20,8 @@
/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy = 1,
/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull = 1)
refill_canister = /obj/item/vending_refill/cola
- default_price = 10
- extra_price = 30
+ default_price = 45
+ extra_price = 200
payment_department = ACCOUNT_SRV
/obj/item/vending_refill/cola
machine_name = "Robust Softdrinks"
diff --git a/code/modules/vending/drinnerware.dm b/code/modules/vending/drinnerware.dm
index e41a852d9dc..0069c4797f8 100644
--- a/code/modules/vending/drinnerware.dm
+++ b/code/modules/vending/drinnerware.dm
@@ -19,8 +19,8 @@
contraband = list(/obj/item/kitchen/rollingpin = 2,
/obj/item/kitchen/knife/butcher = 2)
refill_canister = /obj/item/vending_refill/dinnerware
- default_price = 5
- extra_price = 50
+ default_price = 50
+ extra_price = 250
payment_department = ACCOUNT_SRV
/obj/item/vending_refill/dinnerware
diff --git a/code/modules/vending/engineering.dm b/code/modules/vending/engineering.dm
index c74d882659a..bd0015d5bf6 100644
--- a/code/modules/vending/engineering.dm
+++ b/code/modules/vending/engineering.dm
@@ -28,8 +28,8 @@
/obj/item/stock_parts/matter_bin = 5,
/obj/item/stock_parts/manipulator = 5)
refill_canister = /obj/item/vending_refill/engineering
- default_price = 50
- extra_price = 60
+ default_price = 450
+ extra_price = 500
payment_department = ACCOUNT_ENG
/obj/item/vending_refill/engineering
diff --git a/code/modules/vending/engivend.dm b/code/modules/vending/engivend.dm
index f081234277a..b283b7329dd 100644
--- a/code/modules/vending/engivend.dm
+++ b/code/modules/vending/engivend.dm
@@ -20,8 +20,8 @@
premium = list(/obj/item/storage/belt/utility = 3,
/obj/item/storage/box/smart_metal_foam = 1)
refill_canister = /obj/item/vending_refill/engivend
- default_price = 20
- extra_price = 50
+ default_price = 450
+ extra_price = 500
payment_department = ACCOUNT_ENG
/obj/item/vending_refill/engivend
diff --git a/code/modules/vending/games.dm b/code/modules/vending/games.dm
index 85a603985de..ebc14a74e46 100644
--- a/code/modules/vending/games.dm
+++ b/code/modules/vending/games.dm
@@ -13,8 +13,8 @@
premium = list(/obj/item/melee/skateboard/pro = 3,
/obj/item/melee/skateboard/hoverboard = 1)
refill_canister = /obj/item/vending_refill/games
- default_price = 10
- extra_price = 25
+ default_price = 50
+ extra_price = 250
payment_department = ACCOUNT_SRV
/obj/item/vending_refill/games
diff --git a/code/modules/vending/liberation.dm b/code/modules/vending/liberation.dm
index 773506de21e..3821f94e7fe 100644
--- a/code/modules/vending/liberation.dm
+++ b/code/modules/vending/liberation.dm
@@ -28,6 +28,6 @@
/obj/item/reagent_containers/food/snacks/burger/superbite = 3) //U S A
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
- default_price = 50
- extra_price = 100
+ default_price = 150
+ extra_price = 500
payment_department = ACCOUNT_SEC
diff --git a/code/modules/vending/liberation_toy.dm b/code/modules/vending/liberation_toy.dm
index 388528e046f..34bc3c41c5e 100644
--- a/code/modules/vending/liberation_toy.dm
+++ b/code/modules/vending/liberation_toy.dm
@@ -25,6 +25,6 @@
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
refill_canister = /obj/item/vending_refill/donksoft
- default_price = 25
- extra_price = 50
+ default_price = 150
+ extra_price = 300
payment_department = ACCOUNT_SRV
diff --git a/code/modules/vending/magivend.dm b/code/modules/vending/magivend.dm
index f1cbbffc98e..b1eb72e179f 100644
--- a/code/modules/vending/magivend.dm
+++ b/code/modules/vending/magivend.dm
@@ -16,6 +16,6 @@
contraband = list(/obj/item/reagent_containers/glass/bottle/wizarditis = 1) //No one can get to the machine to hack it anyways; for the lulz - Microwave
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
- default_price = 25
- extra_price = 50
+ default_price = 250
+ extra_price = 500
payment_department = ACCOUNT_SRV
diff --git a/code/modules/vending/medical.dm b/code/modules/vending/medical.dm
index 5ef571cd283..3742a04ddac 100644
--- a/code/modules/vending/medical.dm
+++ b/code/modules/vending/medical.dm
@@ -39,8 +39,8 @@
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
refill_canister = /obj/item/vending_refill/medical
- default_price = 25
- extra_price = 100
+ default_price = 250
+ extra_price = 500
payment_department = ACCOUNT_MED
/obj/item/vending_refill/medical
diff --git a/code/modules/vending/medical_wall.dm b/code/modules/vending/medical_wall.dm
index d7d3a034856..9de7b20fba6 100644
--- a/code/modules/vending/medical_wall.dm
+++ b/code/modules/vending/medical_wall.dm
@@ -16,8 +16,8 @@
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
refill_canister = /obj/item/vending_refill/wallmed
- default_price = 25
- extra_price = 100
+ default_price = 250
+ extra_price = 500
payment_department = ACCOUNT_MED
tiltable = FALSE
diff --git a/code/modules/vending/megaseed.dm b/code/modules/vending/megaseed.dm
index de022a2d5ec..0d5ac31d8c0 100644
--- a/code/modules/vending/megaseed.dm
+++ b/code/modules/vending/megaseed.dm
@@ -52,8 +52,8 @@
/obj/item/seeds/random = 2)
premium = list(/obj/item/reagent_containers/spray/waterflower = 1)
refill_canister = /obj/item/vending_refill/hydroseeds
- default_price = 10
- extra_price = 50
+ default_price = 100
+ extra_price = 350
payment_department = ACCOUNT_SRV
/obj/item/vending_refill/hydroseeds
diff --git a/code/modules/vending/modularpc.dm b/code/modules/vending/modularpc.dm
index f055d659dc7..c94e0b70569 100644
--- a/code/modules/vending/modularpc.dm
+++ b/code/modules/vending/modularpc.dm
@@ -21,8 +21,8 @@
/obj/item/computer_hardware/recharger/APC = 2,
/obj/item/paicard = 2)
refill_canister = /obj/item/vending_refill/modularpc
- default_price = 30
- extra_price = 250
+ default_price = 150
+ extra_price = 400
payment_department = ACCOUNT_SCI
/obj/item/vending_refill/modularpc
diff --git a/code/modules/vending/nutrimax.dm b/code/modules/vending/nutrimax.dm
index 80ab7244803..3529d115c3a 100644
--- a/code/modules/vending/nutrimax.dm
+++ b/code/modules/vending/nutrimax.dm
@@ -17,8 +17,8 @@
contraband = list(/obj/item/reagent_containers/glass/bottle/ammonia = 10,
/obj/item/reagent_containers/glass/bottle/diethylamine = 5)
refill_canister = /obj/item/vending_refill/hydronutrients
- default_price = 10
- extra_price = 50
+ default_price = 100
+ extra_price = 250
payment_department = ACCOUNT_SRV
/obj/item/vending_refill/hydronutrients
diff --git a/code/modules/vending/plasmaresearch.dm b/code/modules/vending/plasmaresearch.dm
index 9b529676577..9523238b731 100644
--- a/code/modules/vending/plasmaresearch.dm
+++ b/code/modules/vending/plasmaresearch.dm
@@ -11,6 +11,6 @@
/obj/item/assembly/prox_sensor = 6,
/obj/item/assembly/igniter = 6)
contraband = list(/obj/item/assembly/health = 3)
- default_price = 200
- extra_price = 250
+ default_price = 400
+ extra_price = 600
payment_department = ACCOUNT_SCI
diff --git a/code/modules/vending/robotics.dm b/code/modules/vending/robotics.dm
index debb552ddf4..9d0bf7be02b 100644
--- a/code/modules/vending/robotics.dm
+++ b/code/modules/vending/robotics.dm
@@ -20,7 +20,7 @@
/obj/item/screwdriver = 5,
/obj/item/crowbar = 5)
refill_canister = /obj/item/vending_refill/robotics
- default_price = 50
+ default_price = 600
payment_department = ACCOUNT_SCI
/obj/item/vending_refill/robotics
diff --git a/code/modules/vending/security.dm b/code/modules/vending/security.dm
index 3e07ebc4906..b8a21fc5798 100644
--- a/code/modules/vending/security.dm
+++ b/code/modules/vending/security.dm
@@ -20,8 +20,8 @@
/obj/item/clothing/head/helmet/blueshirt = 1,
/obj/item/clothing/suit/armor/vest/blueshirt = 1)
refill_canister = /obj/item/vending_refill/security
- default_price = 100
- extra_price = 150
+ default_price = 650
+ extra_price = 700
payment_department = ACCOUNT_SEC
/obj/machinery/vending/security/pre_throw(obj/item/I)
diff --git a/code/modules/vending/snack.dm b/code/modules/vending/snack.dm
index c228c146786..5288a4307c1 100644
--- a/code/modules/vending/snack.dm
+++ b/code/modules/vending/snack.dm
@@ -15,8 +15,8 @@
contraband = list(/obj/item/reagent_containers/food/snacks/syndicake = 6)
refill_canister = /obj/item/vending_refill/snack
canload_access_list = list(ACCESS_KITCHEN)
- default_price = 20
- extra_price = 30
+ default_price = 60
+ extra_price = 160
payment_department = ACCOUNT_SRV
input_display_header = "Chef's Food Selection"
diff --git a/code/modules/vending/toys.dm b/code/modules/vending/toys.dm
index adf4444963d..3b363200992 100644
--- a/code/modules/vending/toys.dm
+++ b/code/modules/vending/toys.dm
@@ -25,8 +25,8 @@
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
refill_canister = /obj/item/vending_refill/donksoft
- default_price = 25
- extra_price = 50
+ default_price = 150
+ extra_price = 300
payment_department = ACCOUNT_SRV
/obj/item/vending_refill/donksoft
diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm
index 52b7b54d244..90967caf125 100644
--- a/code/modules/vending/wardrobes.dm
+++ b/code/modules/vending/wardrobes.dm
@@ -2,8 +2,8 @@
icon_state = "refill_clothes"
/obj/machinery/vending/wardrobe
- default_price = 50
- extra_price = 75
+ default_price = 350
+ extra_price = 450
payment_department = NO_FREEBIES
input_display_header = "Returned Clothing"
diff --git a/code/modules/vending/youtool.dm b/code/modules/vending/youtool.dm
index 68610f87f09..78427eceff4 100644
--- a/code/modules/vending/youtool.dm
+++ b/code/modules/vending/youtool.dm
@@ -22,6 +22,6 @@
/obj/item/clothing/gloves/color/yellow = 1)
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70)
resistance_flags = FIRE_PROOF
- default_price = 20
- extra_price = 80
+ default_price = 125
+ extra_price = 350
payment_department = ACCOUNT_ENG