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

Categorizes the Good Clean Fun Vendor (#70742)

Browse Source 
About The Pull Request
    Categorizes the Good Clean Fun vendor into a few different categories (art, toys, cards, other)
    In doing this, puts the custom prices on a few items instead of relying on the vendor premium price, to make use of the categories

Why It's Good For The Game
Good Clean Fun Vendor is a long list of random crap, so this helps a bit.

🆑 Melbert
qol: Good Clean Fun Vendor is categorized.
/🆑
This commit is contained in:
MrMelbert
2022-10-30 19:57:12 -07:00
committed by GitHub
parent b4bc34393f
commit d5fe3e44de
5 changed files with 80 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/crayons.dm
+1
View File
@@ -612,6 +612,7 @@
righthand_file = 'icons/mob/inhands/equipment/hydroponics_righthand.dmi'
desc = "A metallic container containing tasty paint."
w_class = WEIGHT_CLASS_SMALL
custom_price = PAYCHECK_CREW * 2.5
instant = TRUE
edible = FALSE
code/game/objects/items/storage/boxes/service_boxes.dm
+1 -1
View File
@@ -190,9 +190,9 @@
/obj/item/storage/box/tail_pin
name = "pin the tail on the corgi supplies"
desc = "For ages 10 and up. ...Why is this even on a space station? Aren't you a little old for babby games?" //Intentional typo.
custom_price = PAYCHECK_COMMAND * 1.25
/obj/item/storage/box/tail_pin/PopulateContents()
for(var/i in 1 to 3)
new /obj/item/poster/tail_board(src)
new /obj/item/tail_pin(src)
code/game/objects/items/toys.dm
+4
View File
@@ -208,6 +208,8 @@
desc = "Every captain's greatest ally when exploring the vast emptiness of space, now with a color display!"
icon = 'icons/obj/toys/toy.dmi'
icon_state = "captainsaid_off"
custom_price = PAYCHECK_COMMAND * 1.25
/// List of modes it can cycle through
var/list/modes = list(
"off",
@@ -1374,6 +1376,8 @@ GLOBAL_LIST_EMPTY(intento_players)
desc = "Fundamentally useless for all intentsive purposes."
icon = 'icons/obj/toys/intents.dmi'
icon_state = "blank"
custom_price = PAYCHECK_COMMAND * 1.25
/// Current sequence of intents
var/list/current_sequence = list()
/// Sequence player inputs
code/modules/art/paintings.dm
+4 -3
View File
@@ -75,7 +75,7 @@
base_pixel_x = 11
base_pixel_y = 10
custom_premium_price = PAYCHECK_CREW
custom_price = PAYCHECK_CREW
/obj/item/canvas/Initialize(mapload)
. = ..()
@@ -399,7 +399,7 @@
pixels_per_unit = 20
w_class = WEIGHT_CLASS_BULKY
custom_premium_price = PAYCHECK_CREW * 1.25
custom_price = PAYCHECK_CREW * 1.25
/obj/item/canvas/thirtysix_twentyfour/Initialize(mapload)
. = ..()
@@ -422,7 +422,7 @@
pixels_per_unit = 18
w_class = WEIGHT_CLASS_BULKY
custom_premium_price = PAYCHECK_CREW * 1.75
custom_price = PAYCHECK_CREW * 1.75
/obj/item/canvas/fortyfive_twentyseven/Initialize(mapload)
. = ..()
@@ -626,6 +626,7 @@
icon_state = "frame-large-empty"
result_path = /obj/structure/sign/painting/large
pixel_shift = 0 //See [/obj/structure/sign/painting/large/proc/finalize_size]
custom_price = PAYCHECK_CREW * 1.25
/obj/item/wallframe/painting/large/try_build(turf/on_wall, mob/user)
. = ..()
code/modules/vending/games.dm
+70 -41
View File
@@ -4,39 +4,75 @@
product_ads = "Escape to a fantasy world!;Fuel your gambling addiction!;Ruin your friendships!;Roll for initiative!;Elves and dwarves!;Paranoid computers!;Totally not satanic!;Fun times forever!"
icon_state = "games"
panel_type = "panel4"
products = list(
/obj/item/storage/crayons = 2,
/obj/item/toy/cards/deck = 5,
/obj/item/storage/dice = 10,
/obj/item/toy/cards/deck/blank = 3,
/obj/item/toy/cards/deck/blank/black = 3,
/obj/item/toy/cards/deck/cas = 3,
/obj/item/toy/cards/deck/cas/black = 3,
/obj/item/toy/cards/deck/kotahi = 3,
/obj/item/toy/cards/deck/tarot = 3,
/obj/item/toy/cards/deck/wizoff = 3,
/obj/item/hourglass = 2,
/obj/item/instrument/piano_synth/headphones = 4,
/obj/item/camera = 3,
/obj/item/camera_film = 5,
/obj/item/chisel = 3,
/obj/item/stack/pipe_cleaner_coil/random = 10,
/obj/item/cardpack/series_one = 10,
/obj/item/cardpack/resin = 10,
/obj/item/storage/card_binder = 10,
/obj/item/skillchip/basketweaving = 2,
/obj/item/skillchip/bonsai = 2,
/obj/item/skillchip/wine_taster = 2,
/obj/item/skillchip/appraiser = 2,
/obj/item/skillchip/light_remover = 2,
/obj/item/skillchip/useless_adapter = 5,
/obj/item/dyespray = 3,
/obj/item/razor = 3,
/obj/item/canvas/nineteen_nineteen = 5,
/obj/item/canvas/twentythree_nineteen = 5,
/obj/item/canvas/twentythree_twentythree = 5,
/obj/item/paint_palette = 3,
/obj/item/wallframe/painting/large = 5,
product_categories = list(
list(
"name" = "Cards",
"icon" = "diamond",
"products" = list(
/obj/item/toy/cards/deck = 5,
/obj/item/toy/cards/deck/blank = 3,
/obj/item/toy/cards/deck/blank/black = 3,
/obj/item/toy/cards/deck/cas = 3,
/obj/item/toy/cards/deck/cas/black = 3,
/obj/item/toy/cards/deck/kotahi = 3,
/obj/item/toy/cards/deck/tarot = 3,
/obj/item/toy/cards/deck/wizoff = 3,
),
),
list(
"name" = "Toys",
"icon" = "hat-wizard",
"products" = list(
/obj/item/toy/captainsaid = 1,
/obj/item/toy/intento = 3,
/obj/item/storage/box/tail_pin = 1,
),
),
list(
"name" = "Art",
"icon" = "palette",
"products" = list(
/obj/item/storage/crayons = 2,
/obj/item/chisel = 3,
/obj/item/paint_palette = 3,
/obj/item/canvas/nineteen_nineteen = 5,
/obj/item/canvas/twentythree_nineteen = 5,
/obj/item/canvas/twentythree_twentythree = 5,
/obj/item/canvas/twentyfour_twentyfour = 5,
/obj/item/canvas/thirtysix_twentyfour = 3,
/obj/item/canvas/fortyfive_twentyseven = 3,
/obj/item/wallframe/painting/large = 5,
/obj/item/stack/pipe_cleaner_coil/random = 10,
),
),
list(
"name" = "Skillchips",
"icon" = "floppy-disk",
"products" = list(
/obj/item/skillchip/appraiser = 2,
/obj/item/skillchip/basketweaving = 2,
/obj/item/skillchip/bonsai = 2,
/obj/item/skillchip/light_remover = 2,
/obj/item/skillchip/useless_adapter = 5,
/obj/item/skillchip/wine_taster = 2,
),
),
list(
"name" = "Other",
"icon" = "star",
"products" = list(
/obj/item/camera = 3,
/obj/item/camera_film = 5,
/obj/item/cardpack/resin = 10,
/obj/item/cardpack/series_one = 10,
/obj/item/dyespray = 3,
/obj/item/hourglass = 2,
/obj/item/instrument/piano_synth/headphones = 4,
/obj/item/razor = 3,
/obj/item/storage/card_binder = 10,
/obj/item/storage/dice = 10,
),
),
)
contraband = list(
/obj/item/dice/fudge = 9,
@@ -45,18 +81,11 @@
)
premium = list(
/obj/item/disk/holodisk = 5,
/obj/item/toy/crayon/spraycan = 3,
/obj/item/canvas/twentyfour_twentyfour = 5,
/obj/item/canvas/thirtysix_twentyfour = 3,
/obj/item/canvas/fortyfive_twentyseven = 3,
/obj/item/rcl = 2,
/obj/item/airlock_painter = 1,
/obj/item/melee/skateboard/pro = 3,
/obj/item/clothing/shoes/wheelys/rollerskates= 3,
/obj/item/melee/skateboard/pro = 3,
/obj/item/melee/skateboard/hoverboard = 1,
/obj/item/storage/box/tail_pin = 1,
/obj/item/toy/intento = 3,
/obj/item/toy/captainsaid = 1,
)
refill_canister = /obj/item/vending_refill/games
default_price = PAYCHECK_CREW