cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-21 03:59:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Arconomy: The bigger balance PR (REVISED EDITION) [MDB IGNORE] (#13164)

Browse Source 
* Arconomy: The bigger balance PR (REVISED EDITION)

* yes

* wew

* Update multitool.dm

* yers

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
This commit is contained in:
SkyratBot
2022-04-27 21:29:22 +01:00
committed by GitHub
co-authored by ArcaneMusic Gandalf
parent f7f3b2a7c0
commit 044d75253c
162 changed files with 530 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vending/_vending.dm
+4 -4
View File
@@ -774,7 +774,7 @@ GLOBAL_LIST_EMPTY(vending_products)
. = list()
.["onstation"] = onstation
.["department"] = payment_department
.["jobDiscount"] = VENDING_DISCOUNT
.["jobDiscount"] = DEPARTMENT_DISCOUNT
.["product_records"] = list()
for (var/datum/data/vending_product/R in product_records)
var/list/data = list(
@@ -948,7 +948,7 @@ GLOBAL_LIST_EMPTY(vending_products)
return
var/datum/bank_account/account = C.registered_account
if(account.account_job && account.account_job.paycheck_department == payment_department)
price_to_use = max(round(price_to_use * VENDING_DISCOUNT), 1) //No longer free, but signifigantly cheaper.
price_to_use = max(round(price_to_use * DEPARTMENT_DISCOUNT), 1) //No longer free, but signifigantly cheaper.
if(coin_records.Find(R) || hidden_records.Find(R))
price_to_use = R.custom_premium_price ? R.custom_premium_price : extra_price
if(LAZYLEN(R.returned_products))
@@ -1295,14 +1295,14 @@ GLOBAL_LIST_EMPTY(vending_products)
/obj/item/vending_refill/custom
machine_name = "Custom Vendor"
icon_state = "refill_custom"
custom_premium_price = PAYCHECK_ASSISTANT
custom_premium_price = PAYCHECK_CREW
/obj/item/price_tagger
name = "price tagger"
desc = "This tool is used to set a price for items used in custom vendors."
icon = 'icons/obj/device.dmi'
icon_state = "pricetagger"
custom_premium_price = PAYCHECK_ASSISTANT * 0.5
custom_premium_price = PAYCHECK_CREW * 0.5
///the price of the item
var/price = 1
code/modules/vending/assist.dm
+2 -2
View File
@@ -31,8 +31,8 @@
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 = PAYCHECK_ASSISTANT * 0.7 //Default of 35.
extra_price = PAYCHECK_EASY
default_price = PAYCHECK_CREW * 0.7 //Default of 35.
extra_price = PAYCHECK_CREW
payment_department = NO_FREEBIES
light_mask = "parts-light-mask"
code/modules/vending/autodrobe.dm
+2 -2
View File
@@ -166,8 +166,8 @@
/obj/item/storage/belt/cummerbund = 1
)
refill_canister = /obj/item/vending_refill/autodrobe
default_price = PAYCHECK_ASSISTANT * 0.8 //Default of 40.
extra_price = PAYCHECK_HARD
default_price = PAYCHECK_CREW * 0.8 //Default of 40.
extra_price = PAYCHECK_COMMAND
payment_department = ACCOUNT_SRV
light_mask="theater-light-mask"
code/modules/vending/boozeomat.dm
+1 -1
View File
@@ -57,7 +57,7 @@
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 = PAYCHECK_ASSISTANT * 0.9
default_price = PAYCHECK_CREW * 0.9
extra_price = PAYCHECK_COMMAND
payment_department = ACCOUNT_SRV
light_mask = "boozeomat-light-mask"
code/modules/vending/cigarette.dm
+2 -2
View File
@@ -29,8 +29,8 @@
)
refill_canister = /obj/item/vending_refill/cigarette
default_price = PAYCHECK_ASSISTANT
extra_price = PAYCHECK_HARD
default_price = PAYCHECK_CREW
extra_price = PAYCHECK_COMMAND
payment_department = ACCOUNT_SRV
light_mask = "cigs-light-mask"
code/modules/vending/clothesmate.dm
+2 -2
View File
@@ -205,8 +205,8 @@
/obj/item/instrument/piano_synth/headphones/spacepods = 1
)
refill_canister = /obj/item/vending_refill/clothing
default_price = PAYCHECK_ASSISTANT * 0.7 //Default of
extra_price = PAYCHECK_HARD
default_price = PAYCHECK_CREW * 0.7 //Default of
extra_price = PAYCHECK_COMMAND
payment_department = NO_FREEBIES
light_mask = "wardrobe-light-mask"
light_color = LIGHT_COLOR_ELECTRIC_GREEN
code/modules/vending/coffee.dm
+2 -2
View File
@@ -14,8 +14,8 @@
/obj/item/reagent_containers/food/drinks/ice = 12
)
refill_canister = /obj/item/vending_refill/coffee
default_price = PAYCHECK_PRISONER
extra_price = PAYCHECK_ASSISTANT
default_price = PAYCHECK_LOWER
extra_price = PAYCHECK_CREW
payment_department = ACCOUNT_SRV
light_mask = "coffee-light-mask"
light_color = COLOR_DARK_MODERATE_ORANGE
code/modules/vending/cola.dm
+2 -2
View File
@@ -30,8 +30,8 @@
/obj/item/reagent_containers/food/drinks/bottle/rootbeer = 1
)
refill_canister = /obj/item/vending_refill/cola
default_price = PAYCHECK_ASSISTANT * 0.7
extra_price = PAYCHECK_MEDIUM
default_price = PAYCHECK_CREW * 0.7
extra_price = PAYCHECK_CREW
payment_department = ACCOUNT_SRV
code/modules/vending/drinnerware.dm
+2 -2
View File
@@ -28,8 +28,8 @@
/obj/item/knife/butcher = 2,
)
refill_canister = /obj/item/vending_refill/dinnerware
default_price = PAYCHECK_ASSISTANT * 0.8
extra_price = PAYCHECK_HARD
default_price = PAYCHECK_CREW * 0.8
extra_price = PAYCHECK_COMMAND
payment_department = ACCOUNT_SRV
light_mask = "dinnerware-light-mask"
code/modules/vending/engineering.dm
+1 -1
View File
@@ -31,7 +31,7 @@
/obj/item/stock_parts/manipulator = 5
)
refill_canister = /obj/item/vending_refill/engineering
default_price = PAYCHECK_EASY
default_price = PAYCHECK_CREW
extra_price = PAYCHECK_COMMAND * 1.5
payment_department = ACCOUNT_ENG
light_mask = "engi-light-mask"
code/modules/vending/engivend.dm
+1 -1
View File
@@ -27,7 +27,7 @@
/obj/item/storage/box/smart_metal_foam = 1
)
refill_canister = /obj/item/vending_refill/engivend
default_price = PAYCHECK_EASY
default_price = PAYCHECK_CREW
extra_price = PAYCHECK_COMMAND * 1.5
payment_department = ACCOUNT_ENG
light_mask = "engivend-light-mask"
code/modules/vending/games.dm
+2 -2
View File
@@ -57,8 +57,8 @@
/obj/item/toy/captainsaid = 1,
)
refill_canister = /obj/item/vending_refill/games
default_price = PAYCHECK_ASSISTANT
extra_price = PAYCHECK_HARD * 1.25
default_price = PAYCHECK_CREW
extra_price = PAYCHECK_COMMAND * 1.25
payment_department = ACCOUNT_SRV
light_mask = "games-light-mask"
code/modules/vending/liberation.dm
+1 -1
View File
@@ -35,7 +35,7 @@
) //U S A
armor = list(MELEE = 100, BULLET = 100, LASER = 100, ENERGY = 100, BOMB = 0, BIO = 0, FIRE = 100, ACID = 50)
resistance_flags = FIRE_PROOF
default_price = PAYCHECK_HARD * 2.5
default_price = PAYCHECK_COMMAND * 2.5
extra_price = PAYCHECK_COMMAND * 2.5
payment_department = ACCOUNT_SEC
light_mask = "liberation-light-mask"
code/modules/vending/liberation_toy.dm
+1 -1
View File
@@ -30,7 +30,7 @@
armor = list(MELEE = 100, BULLET = 100, LASER = 100, ENERGY = 100, BOMB = 0, BIO = 0, FIRE = 100, ACID = 50)
resistance_flags = FIRE_PROOF
refill_canister = /obj/item/vending_refill/donksoft
default_price = PAYCHECK_HARD
default_price = PAYCHECK_COMMAND
extra_price = PAYCHECK_COMMAND
payment_department = ACCOUNT_SRV
light_mask = "donksoft-light-mask"
code/modules/vending/medical.dm
+1 -1
View File
@@ -32,7 +32,7 @@
/obj/item/storage/organbox = 1
)
refill_canister = /obj/item/vending_refill/medical
default_price = PAYCHECK_EASY
default_price = PAYCHECK_CREW
extra_price = PAYCHECK_COMMAND
payment_department = ACCOUNT_MED
light_mask = "med-light-mask"
code/modules/vending/medical_wall.dm
+2 -2
View File
@@ -22,8 +22,8 @@
/obj/item/storage/box/gum/happiness = 1
)
refill_canister = /obj/item/vending_refill/wallmed
default_price = PAYCHECK_HARD //Double the medical price due to being meant for public consumption, not player specfic
extra_price = PAYCHECK_HARD * 1.5
default_price = PAYCHECK_COMMAND //Double the medical price due to being meant for public consumption, not player specfic
extra_price = PAYCHECK_COMMAND * 1.5
payment_department = ACCOUNT_MED
tiltable = FALSE
light_mask = "wallmed-light-mask"
code/modules/vending/megaseed.dm
+2 -2
View File
@@ -66,8 +66,8 @@
/obj/item/reagent_containers/spray/waterflower = 1
)
refill_canister = /obj/item/vending_refill/hydroseeds
default_price = PAYCHECK_PRISONER
extra_price = PAYCHECK_ASSISTANT
default_price = PAYCHECK_LOWER
extra_price = PAYCHECK_CREW
payment_department = ACCOUNT_SRV
/obj/item/vending_refill/hydroseeds
code/modules/vending/modularpc.dm
+2 -2
View File
@@ -29,8 +29,8 @@
/obj/item/computer_hardware/radio_card = 1
)
refill_canister = /obj/item/vending_refill/modularpc
default_price = PAYCHECK_MEDIUM
extra_price = PAYCHECK_HARD
default_price = PAYCHECK_CREW
extra_price = PAYCHECK_COMMAND
payment_department = ACCOUNT_SCI
/obj/item/vending_refill/modularpc
code/modules/vending/nutrimax.dm
+2 -2
View File
@@ -24,8 +24,8 @@
/obj/item/reagent_containers/glass/bottle/diethylamine = 5
)
refill_canister = /obj/item/vending_refill/hydronutrients
default_price = PAYCHECK_ASSISTANT * 0.8
extra_price = PAYCHECK_HARD * 0.8
default_price = PAYCHECK_CREW * 0.8
extra_price = PAYCHECK_COMMAND * 0.8
payment_department = ACCOUNT_SRV
/obj/item/vending_refill/hydronutrients
code/modules/vending/plasmaresearch.dm
+2 -2
View File
@@ -13,6 +13,6 @@
/obj/item/assembly/igniter = 6
)
contraband = list(/obj/item/assembly/health = 3)
default_price = PAYCHECK_ASSISTANT
extra_price = PAYCHECK_ASSISTANT
default_price = PAYCHECK_CREW
extra_price = PAYCHECK_CREW
payment_department = ACCOUNT_SCI
code/modules/vending/robotics.dm
+1 -1
View File
@@ -25,7 +25,7 @@
/obj/item/crowbar = 5
)
refill_canister = /obj/item/vending_refill/robotics
default_price = PAYCHECK_HARD
default_price = PAYCHECK_COMMAND
payment_department = ACCOUNT_SCI
/obj/item/vending_refill/robotics
code/modules/vending/security.dm
+2 -2
View File
@@ -31,8 +31,8 @@
/obj/item/watertank/pepperspray = 2
)
refill_canister = /obj/item/vending_refill/security
default_price = PAYCHECK_MEDIUM
extra_price = PAYCHECK_HARD * 1.5
default_price = PAYCHECK_CREW
extra_price = PAYCHECK_COMMAND * 1.5
payment_department = ACCOUNT_SEC
/obj/machinery/vending/security/pre_throw(obj/item/I)
code/modules/vending/snack.dm
+2 -2
View File
@@ -36,8 +36,8 @@
)
refill_canister = /obj/item/vending_refill/snack
canload_access_list = list(ACCESS_KITCHEN)
default_price = PAYCHECK_ASSISTANT * 0.6
extra_price = PAYCHECK_EASY
default_price = PAYCHECK_CREW * 0.6
extra_price = PAYCHECK_CREW
payment_department = ACCOUNT_SRV
input_display_header = "Chef's Food Selection"
code/modules/vending/sovietsoda.dm
+1 -1
View File
@@ -14,7 +14,7 @@
resistance_flags = FIRE_PROOF
refill_canister = /obj/item/vending_refill/sovietsoda
default_price = 1
extra_price = PAYCHECK_ASSISTANT //One credit for every state of FREEDOM
extra_price = PAYCHECK_CREW //One credit for every state of FREEDOM
payment_department = NO_FREEBIES
light_color = COLOR_PALE_ORANGE
code/modules/vending/sustenance.dm
+2 -2
View File
@@ -22,8 +22,8 @@
)
refill_canister = /obj/item/vending_refill/sustenance
default_price = PAYCHECK_PRISONER
extra_price = PAYCHECK_PRISONER * 0.6
default_price = PAYCHECK_LOWER
extra_price = PAYCHECK_LOWER * 0.6
payment_department = NO_FREEBIES
/obj/item/vending_refill/sustenance
code/modules/vending/toys.dm
+2 -2
View File
@@ -27,8 +27,8 @@
/obj/item/dualsaber/toy = 5
)
refill_canister = /obj/item/vending_refill/donksoft
default_price = PAYCHECK_ASSISTANT
extra_price = PAYCHECK_HARD
default_price = PAYCHECK_CREW
extra_price = PAYCHECK_COMMAND
payment_department = ACCOUNT_SRV
/obj/item/vending_refill/donksoft
code/modules/vending/wardrobes.dm
+6 -6
View File
@@ -2,8 +2,8 @@
icon_state = "refill_clothes"
/obj/machinery/vending/wardrobe
default_price = PAYCHECK_ASSISTANT
extra_price = PAYCHECK_HARD
default_price = PAYCHECK_CREW
extra_price = PAYCHECK_COMMAND
payment_department = NO_FREEBIES
input_display_header = "Returned Clothing"
panel_type = "panel19"
@@ -172,7 +172,7 @@
/obj/item/clothing/under/costume/mech_suit = 2,
/obj/item/organ/tongue/robot = 2)
refill_canister = /obj/item/vending_refill/wardrobe/robo_wardrobe
extra_price = PAYCHECK_HARD * 1.2
extra_price = PAYCHECK_COMMAND * 1.2
payment_department = ACCOUNT_SCI
/obj/item/vending_refill/wardrobe/robo_wardrobe
machine_name = "RoboDrobe"
@@ -280,7 +280,7 @@
premium = list(/obj/item/storage/box/dishdrive = 1)
refill_canister = /obj/item/vending_refill/wardrobe/bar_wardrobe
payment_department = ACCOUNT_SRV
extra_price = PAYCHECK_HARD
extra_price = PAYCHECK_COMMAND
/obj/item/vending_refill/wardrobe/bar_wardrobe
machine_name = "BarDrobe"
@@ -334,8 +334,8 @@
/obj/item/watertank/janitor = 1,
/obj/item/storage/belt/janitor = 2)
refill_canister = /obj/item/vending_refill/wardrobe/jani_wardrobe
default_price = PAYCHECK_EASY
extra_price = PAYCHECK_HARD * 0.8
default_price = PAYCHECK_CREW
extra_price = PAYCHECK_COMMAND * 0.8
payment_department = ACCOUNT_SRV
light_color = COLOR_STRONG_MAGENTA
code/modules/vending/youtool.dm
+1 -1
View File
@@ -30,7 +30,7 @@
/obj/item/clothing/gloves/color/yellow = 1
)
refill_canister = /obj/item/vending_refill/youtool
default_price = PAYCHECK_ASSISTANT
default_price = PAYCHECK_CREW
extra_price = PAYCHECK_COMMAND * 1.5
payment_department = ACCOUNT_ENG