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

Chekov's Canister! Adds missing resupply canisters, makes them constructable & spawn in maint,. (#93028)

Browse Source 
## About The Pull Request

This is was created because I found several rare and exciting canisters
in game and then finding out there is no way to actually construct the
vendor they belong to!...

<img width="768" height="385" alt="image"
src="https://github.com/user-attachments/assets/70261cea-daaf-41df-a212-21cef6d6bd0c"
/>

### This PR:

* Makes all noteable vendors constructable, if you have the canister. 
* Adds canisters to syndismokes, syndiechem, liberation station,
magivend, shambler's juice and bombuddy
* Replaces the old tptally random canisters spawner, with a variety of
spawners weighted for power and split according to different themes.
* Adds the new main canister spawner to maint. 

### Spawner weights

The random canister spawner from maintenance has a:

* **93,5%** chance to spawn a common station vendor refill(with weights
for wardrobes being somewhat reduced.)
* **6%** chance to spawn a rare and special vendor refill.
* **0.5%** chance to spawn a oddity level., super powerful vendor
refill.

## Why It's Good For The Game

One must never place a filled canister in maint if it isn't going to be
constructed It's wrong to make promises you don't mean to keep.

## Changelog

🆑
add: Nearly all notable vendors are now constructable if you have the
canister.
add Added refill canisters for syndiesmokes, liberation station,
magivend, bombuddy 3000, shambler's juice and syndichem.
add: Random vending refill canisters now have a chance to spawn in
maint.
image: Robco Toolmaker and Centdrobe canisters have new sprites.
/🆑
This commit is contained in:
Krysonism
2025-10-02 20:12:46 +02:00
committed by GitHub
parent 28250734e7
commit 075de00420
43 changed files with 157 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/SpaceRuins/hauntedtradingpost.dmm
-5
View File
@@ -879,7 +879,6 @@
},
/obj/item/coin/gold,
/obj/item/vending_refill/donksnackvendor,
/obj/item/circuitboard/machine/vending/donksnackvendor,
/turf/open/floor/catwalk_floor/iron_dark,
/area/ruin/space/has_grav/hauntedtradingpost/public)
"hL" = (
@@ -4345,10 +4344,6 @@
/turf/open/floor/wood,
/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
"LI" = (
/obj/item/circuitboard/machine/vending/donksofttoyvendor{
pixel_y = -2;
pixel_x = -6
},
/obj/effect/decal/cleanable/glass,
/turf/open/floor/carpet/donk,
/area/ruin/space/has_grav/hauntedtradingpost/employees)
code/_globalvars/lists/maintenance_loot.dm
+1 -1
View File
@@ -111,7 +111,7 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items
/obj/item/stack/sheet/iron/twenty = 1,
/obj/item/stack/sheet/mineral/plasma = 1,
/obj/item/stock_parts/power_store/cell = 1,
/obj/effect/spawner/random/engineering/vending_restock = 1,
//assemblies
/obj/item/assembly/health = 1,
/obj/item/assembly/igniter = 1,
code/game/objects/effects/spawners/random/engineering.dm
+112 -2
View File
@@ -118,8 +118,118 @@
/obj/effect/spawner/random/engineering/vending_restock
name = "vending restock spawner"
icon_state = "vending_restock"
loot_subtype_path = /obj/item/vending_refill
loot = list()
loot = list(
/obj/effect/spawner/random/engineering/vending_restock/common = 935,
/obj/effect/spawner/random/engineering/vending_restock/rare = 60,
/obj/effect/spawner/random/engineering/vending_restock/oddity = 5,
)
/obj/effect/spawner/random/engineering/vending_restock/wardrobe
name = "wardrobe vending restock spawner"
icon_state = "vending_restock"
loot = list(
/obj/item/vending_refill/wardrobe/det_wardrobe = 1,
/obj/item/vending_refill/wardrobe/medi_wardrobe = 1,
/obj/item/vending_refill/wardrobe/chem_wardrobe = 1,
/obj/item/vending_refill/wardrobe/viro_wardrobe = 1,
/obj/item/vending_refill/wardrobe/sec_wardrobe = 1,
/obj/item/vending_refill/wardrobe/science_wardrobe = 1,
/obj/item/vending_refill/wardrobe/robo_wardrobe = 1,
/obj/item/vending_refill/wardrobe/gene_wardrobe = 1,
/obj/item/vending_refill/wardrobe/engi_wardrobe = 1,
/obj/item/vending_refill/wardrobe/atmos_wardrobe = 1,
/obj/item/vending_refill/wardrobe/cargo_wardrobe = 1,
/obj/item/vending_refill/wardrobe/hydro_wardrobe = 1,
/obj/item/vending_refill/wardrobe/chap_wardrobe = 1,
/obj/item/vending_refill/wardrobe/chef_wardrobe = 1,
/obj/item/vending_refill/wardrobe/chap_wardrobe = 1,
/obj/item/vending_refill/wardrobe/curator_wardrobe= 1,
/obj/item/vending_refill/wardrobe/jani_wardrobe = 1,
/obj/item/vending_refill/wardrobe/law_wardrobe = 1,
)
/obj/effect/spawner/random/engineering/vending_restock/food_and_drink
name = "food & drink vending restock spawner"
icon_state = "vending_restock"
loot = list(
/obj/item/vending_refill/cigarette = 1,
/obj/item/vending_refill/cola = 1,
/obj/item/vending_refill/coffee = 1,
/obj/item/vending_refill/snack = 1,
/obj/item/vending_refill/boozeomat = 1,
/obj/item/vending_refill/sustenance = 1,
/obj/item/vending_refill/sovietsoda = 1,
/obj/item/vending_refill/cola/shamblers = 1,
)
/obj/effect/spawner/random/engineering/vending_restock/medical
name = "medical vending restock spawner"
icon_state = "vending_restock"
loot = list(
/obj/item/vending_refill/wallmed = 1,
/obj/item/vending_refill/medical = 1,
/obj/item/vending_refill/drugs = 1,
)
/obj/effect/spawner/random/engineering/vending_restock/engineering
name = "engineering vending restock spawner"
icon_state = "vending_restock"
loot = list(
/obj/item/vending_refill/engivend = 1,
/obj/item/vending_refill/engineering = 1,
/obj/item/vending_refill/youtool = 1,
/obj/item/vending_refill/modularpc = 1,
/obj/item/vending_refill/robotics = 1,
/obj/item/vending_refill/assist = 1,
)
//common everyday vendors
/obj/effect/spawner/random/engineering/vending_restock/common
name = "common vending restock spawner"
icon_state = "vending_restock"
loot = list(
/obj/effect/spawner/random/engineering/vending_restock/wardrobe = 8, //roughtly reduced to half weight due to lameness of drobe contents
/obj/effect/spawner/random/engineering/vending_restock/food_and_drink = 8,
/obj/effect/spawner/random/engineering/vending_restock/engineering = 6,
/obj/effect/spawner/random/engineering/vending_restock/medical = 3,
/obj/item/vending_refill/cart = 1,
/obj/item/vending_refill/clothing = 1,
/obj/item/vending_refill/autodrobe = 1,
/obj/item/vending_refill/security = 1,
/obj/item/vending_refill/custom = 1,
/obj/item/vending_refill/dinnerware = 1,
/obj/item/vending_refill/cytopro = 1,
/obj/item/vending_refill/hydronutrients = 1,
/obj/item/vending_refill/hydroseeds = 1,
/obj/item/vending_refill/games = 1,
)
//vendors that should feel rare and special but are unlikely to warp the shift too much
/obj/effect/spawner/random/engineering/vending_restock/rare
name = "rare vending restock spawner"
icon_state = "vending_restock"
loot = list(
/obj/item/vending_refill/syndichem = 1,
/obj/item/vending_refill/cigarette/syndicate = 1,
/obj/item/vending_refill/plasmaresearch = 1,
/obj/item/vending_refill/donksnackvendor = 1,
/obj/item/vending_refill/donksoft = 1,
/obj/item/vending_refill/hotdog = 1,
)
//high chance to derail the shift, use cautiously
/obj/effect/spawner/random/engineering/vending_restock/oddity
name = "oddity vending restock spawner"
icon_state = "vending_restock"
loot = list(
/obj/item/vending_refill/magivend = 1,
/obj/item/vending_refill/liberation = 1,
/obj/item/vending_refill/wardrobe/cent_wardrobe = 1,
)
/obj/effect/spawner/random/engineering/atmospherics_portable
name = "portable atmospherics machine spawner"
code/game/objects/items/circuitboards/machines/machine_circuitboards.dm
+1 -22
View File
@@ -659,7 +659,7 @@
if(!valid_vendor_names_paths)
valid_vendor_names_paths = list()
for(var/obj/machinery/vending/vendor_type as anything in subtypesof(/obj/machinery/vending))
if(vendor_type::allow_custom)
if(vendor_type::allow_custom && vendor_type::refill_canister)
valid_vendor_names_paths[vendor_type::name] = vendor_type
/obj/item/circuitboard/machine/vendor/screwdriver_act(mob/living/user, obj/item/tool)
@@ -688,27 +688,6 @@
set_type(machine.type)
return ..()
/obj/item/circuitboard/machine/vending/donksofttoyvendor
name = "Donksoft Toy Vendor"
build_path = /obj/machinery/vending/donksofttoyvendor
req_components = list(
/obj/item/stack/sheet/glass = 1,
/obj/item/vending_refill/donksoft = 1)
/obj/item/circuitboard/machine/vending/syndicatedonksofttoyvendor
name = "Syndicate Donksoft Toy Vendor"
build_path = /obj/machinery/vending/toyliberationstation
req_components = list(
/obj/item/stack/sheet/glass = 1,
/obj/item/vending_refill/donksoft = 1)
/obj/item/circuitboard/machine/vending/donksnackvendor
name = "Donk Co Snack Vendor"
build_path = /obj/machinery/vending/donksnack
req_components = list(
/obj/item/stack/sheet/glass = 1,
/obj/item/vending_refill/donksnackvendor = 1)
/obj/item/circuitboard/machine/bountypad
name = "Civilian Bounty Pad"
greyscale_colors = CIRCUIT_COLOR_GENERIC
code/modules/research/designs/machine_designs.dm
-10
View File
@@ -891,16 +891,6 @@
)
departmental_flags = DEPARTMENT_BITFLAG_SERVICE
/datum/design/board/donksofttoyvendor
name = "Donksoft Toy Vendor Board"
desc = "The circuit board for a Donksoft Toy Vendor."
id = "donksofttoyvendor"
build_path = /obj/item/circuitboard/machine/vending/donksofttoyvendor
category = list(
RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_SERVICE
)
departmental_flags = DEPARTMENT_BITFLAG_SERVICE
/datum/design/board/cell_charger
name = "Cell Charger Board"
desc = "The circuit board for a cell charger."
code/modules/research/techweb/nodes/syndicate_nodes.dm
-1
View File
@@ -8,7 +8,6 @@
"ai_cam_upgrade",
"borg_syndicate_module",
"donksoft_refill",
"donksofttoyvendor",
"largecrossbow",
"mag_autorifle",
"mag_autorifle_ap",
code/modules/vending/assist.dm
-1
View File
@@ -34,7 +34,6 @@
/obj/item/universal_scanner = 3,
/obj/item/vending_refill/custom = 3,
)
allow_custom = TRUE
refill_canister = /obj/item/vending_refill/assist
product_ads = "Only the finest!;Have some tools.;The most robust equipment.;The finest gear in space!"
code/modules/vending/autodrobe.dm
-1
View File
@@ -234,7 +234,6 @@ GLOBAL_VAR_INIT(all_autodrobe_items, (autodrobe_costumes_items +\
extra_price = PAYCHECK_COMMAND
payment_department = ACCOUNT_SRV
light_mask = "theater-light-mask"
allow_custom = TRUE
/obj/machinery/vending/autodrobe/Initialize(mapload)
product_categories = list(
code/modules/vending/boozeomat.dm
-1
View File
@@ -90,7 +90,6 @@
extra_price = PAYCHECK_COMMAND
payment_department = ACCOUNT_SRV
light_mask = "boozeomat-light-mask"
allow_custom = TRUE
/obj/machinery/vending/boozeomat/syndicate
age_restrictions = FALSE
code/modules/vending/cartridge.dm
-1
View File
@@ -20,7 +20,6 @@
extra_price = PAYCHECK_COMMAND * 2.5
payment_department = ACCOUNT_SRV
light_mask = "cart-light-mask"
allow_custom = TRUE
/obj/item/vending_refill/cart
machine_name = "PTech"
code/modules/vending/cigarette.dm
+9 -2
View File
@@ -35,9 +35,11 @@
extra_price = PAYCHECK_COMMAND
payment_department = ACCOUNT_SRV
light_mask = "cigs-light-mask"
allow_custom = TRUE
/obj/machinery/vending/cigarette/syndicate
name = "\improper Waffle Co Breakfast Cigarettes"
product_slogans = "Start your day the right way!;Breakfast of champions!;Smokes that mean business!;Omnizine, your uplink to smooth taste!"
product_ads = "Waffle Co's science advisory: omnizine may prevent most forms of smoking-related illness!*;New study: Rival corporations more trusting of men who smoke!;A Waffle Co cigarette makes yellow star feel like black orbit!"
products = list(
/obj/item/storage/fancy/cigarettes/cigpack_syndicate = 7,
/obj/item/storage/fancy/cigarettes/cigpack_uplift = 3,
@@ -51,7 +53,12 @@
/obj/item/storage/fancy/rollingpapers = 5,
)
initial_language_holder = /datum/language_holder/syndicate
allow_custom = FALSE
refill_canister = /obj/item/vending_refill/cigarette/syndicate
/obj/item/vending_refill/cigarette/syndicate
machine_name = "Waffle Co Breakfast Cigarettes"
icon_state = "refill_syndismoke"
/obj/machinery/vending/cigarette/beach //Used in the lavaland_biodome_beach.dmm ruin
name = "\improper ShadyCigs Ultra"
code/modules/vending/clothesmate.dm
-1
View File
@@ -232,7 +232,6 @@
payment_department = NO_FREEBIES
light_mask = "wardrobe-light-mask"
light_color = LIGHT_COLOR_ELECTRIC_GREEN
allow_custom = TRUE
/obj/item/vending_refill/clothing
machine_name = "ClothesMate"
code/modules/vending/coffee.dm
-1
View File
@@ -19,7 +19,6 @@
payment_department = ACCOUNT_SRV
light_mask = "coffee-light-mask"
light_color = COLOR_DARK_MODERATE_ORANGE
allow_custom = TRUE
/obj/item/vending_refill/coffee
machine_name = "Solar's Best Hot Drinks"
code/modules/vending/cola.dm
+6 -2
View File
@@ -35,7 +35,6 @@
default_price = PAYCHECK_CREW * 0.7
extra_price = PAYCHECK_CREW
payment_department = ACCOUNT_SRV
allow_custom = TRUE
var/static/list/spiking_booze = list(
// Your "common" spiking booze
@@ -152,8 +151,13 @@
product_slogans = "~Shake me up some of that Shambler's Juice!~"
product_ads = "Refreshing!;Thirsty for DNA? Satiate your craving!;Over 1 trillion souls drank!;Made with real DNA!;The hivemind demands your thirst!;Drink up!;Absorb your thirst."
light_mask = "shamblers-light-mask"
refill_canister = /obj/item/vending_refill/cola/shamblers
light_color = COLOR_MOSTLY_PURE_PINK
allow_custom = FALSE
/obj/item/vending_refill/cola/shamblers
machine_name = "Shambler's Vendor"
icon_state = "refill_shamblers"
/obj/machinery/vending/cola/shamblers/Initialize(mapload)
. = ..()
code/modules/vending/custom.dm
-1
View File
@@ -9,7 +9,6 @@
payment_department = NO_FREEBIES
light_mask = "custom-light-mask"
panel_type = "panel20"
allow_custom = TRUE
refill_canister = /obj/item/vending_refill/custom
fish_source_path = /datum/fish_source/vending/custom
code/modules/vending/cytopro.dm
-1
View File
@@ -29,7 +29,6 @@
default_price = PAYCHECK_CREW * 1
extra_price = PAYCHECK_COMMAND * 0.5
payment_department = ACCOUNT_SCI
allow_custom = TRUE
/obj/item/vending_refill/cytopro
machine_name = "CytoPro"
code/modules/vending/donk.dm
-1
View File
@@ -6,7 +6,6 @@
icon_state = "snackdonk"
panel_type = "panel18"
light_mask = "donksoft-light-mask"
circuit = /obj/item/circuitboard/machine/vending/donksnackvendor
products = list(
/obj/item/food/donkpocket = 6,
/obj/item/food/donkpocket/berry = 6,
code/modules/vending/drinnerware.dm
-1
View File
@@ -69,7 +69,6 @@
extra_price = PAYCHECK_CREW * 2.4
payment_department = ACCOUNT_SRV
light_mask = "dinnerware-light-mask"
allow_custom = TRUE
/obj/item/vending_refill/dinnerware
machine_name = "Plasteel Chef's Dinnerware Vendor"
code/modules/vending/engineering.dm
+1 -2
View File
@@ -35,8 +35,7 @@
extra_price = PAYCHECK_COMMAND * 1.5
payment_department = ACCOUNT_ENG
light_mask = "engi-light-mask"
allow_custom = TRUE
/obj/item/vending_refill/engineering
machine_name = "Robco Tool Maker"
icon_state = "refill_engi"
icon_state = "refill_roroco"
code/modules/vending/engivend.dm
-1
View File
@@ -32,7 +32,6 @@
extra_price = PAYCHECK_COMMAND * 1.5
payment_department = ACCOUNT_ENG
light_mask = "engivend-light-mask"
allow_custom = TRUE
/obj/item/vending_refill/engivend
machine_name = "Engi-Vend"
code/modules/vending/games.dm
-1
View File
@@ -115,7 +115,6 @@
extra_price = PAYCHECK_COMMAND * 1.25
payment_department = ACCOUNT_SRV
light_mask = "games-light-mask"
allow_custom = TRUE
/obj/item/vending_refill/games
machine_name = "\improper Good Clean Fun"
code/modules/vending/liberation.dm
+5
View File
@@ -35,6 +35,7 @@
) //U S A
armor_type = /datum/armor/vending_liberationstation
resistance_flags = FIRE_PROOF
refill_canister = /obj/item/vending_refill/liberation
default_price = PAYCHECK_COMMAND * 2.5
extra_price = PAYCHECK_COMMAND * 2.5
payment_department = ACCOUNT_SEC
@@ -47,3 +48,7 @@
energy = 100
fire = 100
acid = 50
/obj/item/vending_refill/liberation
machine_name = "Liberation Station"
icon_state = "refill_patriot"
code/modules/vending/liberation_toy.dm
+1 -1
View File
@@ -6,7 +6,6 @@
product_slogans = "Get your cool toys today!;Trigger a valid hunter today!;Quality toy weapons for cheap prices!;Give them to HoPs for all access!;Give them to HoS to get permabrigged!"
product_ads = "Feel robust with your toys!;Express your inner child today!;Toy weapons don't kill people, but valid hunters do!;Who needs responsibilities when you have toy weapons?;Make your next murder FUN!"
vend_reply = "Come back for more!"
circuit = /obj/item/circuitboard/machine/vending/syndicatedonksofttoyvendor
products = list(
/obj/item/card/emagfake = 4,
/obj/item/hot_potato/harmless/toy = 4,
@@ -37,6 +36,7 @@
extra_price = PAYCHECK_COMMAND
payment_department = NO_FREEBIES
light_mask = "donksoft-light-mask"
allow_custom = FALSE
/datum/armor/vending_toyliberationstation
melee = 100
code/modules/vending/magivend.dm
+5
View File
@@ -21,6 +21,7 @@
contraband = list(/obj/item/reagent_containers/cup/bottle/wizarditis = 1) //No one can get to the machine to hack it anyways; for the lulz - Microwave
armor_type = /datum/armor/vending_magivend
resistance_flags = FIRE_PROOF
refill_canister = /obj/item/vending_refill/magivend
default_price = 0 //Just in case, since its primary use is storage.
extra_price = PAYCHECK_COMMAND
payment_department = ACCOUNT_SRV
@@ -33,3 +34,7 @@
energy = 100
fire = 100
acid = 50
/obj/item/vending_refill/magivend
machine_name = "MagiVend"
icon_state = "refill_magivend"
code/modules/vending/medical.dm
-1
View File
@@ -39,7 +39,6 @@
extra_price = PAYCHECK_COMMAND
payment_department = ACCOUNT_MED
light_mask = "med-light-mask"
allow_custom = TRUE
/obj/item/vending_refill/medical
machine_name = "NanoMed Plus"
code/modules/vending/medical_wall.dm
-1
View File
@@ -27,7 +27,6 @@
payment_department = ACCOUNT_MED
tiltable = FALSE
light_mask = "wallmed-light-mask"
allow_custom = TRUE
/obj/machinery/vending/wallmed/directional
allow_custom = FALSE
code/modules/vending/modularpc.dm
-1
View File
@@ -19,7 +19,6 @@
default_price = PAYCHECK_CREW
extra_price = PAYCHECK_COMMAND
payment_department = ACCOUNT_SCI
allow_custom = TRUE
/obj/item/vending_refill/modularpc
machine_name = "Deluxe Silicate Selections"
code/modules/vending/nutrimax.dm
-1
View File
@@ -28,7 +28,6 @@
default_price = PAYCHECK_CREW * 0.8
extra_price = PAYCHECK_COMMAND * 0.8
payment_department = ACCOUNT_SRV
allow_custom = TRUE
/obj/item/vending_refill/hydronutrients
machine_name = "NutriMax"
code/modules/vending/plasmaresearch.dm
+5
View File
@@ -13,6 +13,11 @@
/obj/item/transfer_valve = 6,
)
contraband = list(/obj/item/assembly/health = 3)
refill_canister = /obj/item/vending_refill/plasmaresearch
default_price = PAYCHECK_CREW
extra_price = PAYCHECK_CREW
payment_department = ACCOUNT_SCI
/obj/item/vending_refill/plasmaresearch
machine_name = "Bombuddy 3000"
icon_state = "refill_bombuddy"
code/modules/vending/robotics.dm
-1
View File
@@ -26,7 +26,6 @@
refill_canister = /obj/item/vending_refill/robotics
default_price = PAYCHECK_COMMAND
payment_department = ACCOUNT_SCI
allow_custom = TRUE
/obj/item/vending_refill/robotics
machine_name = "Robotech Deluxe"
code/modules/vending/runic_vendor.dm
+1 -1
View File
@@ -14,7 +14,7 @@
var/time_to_decay = 30 SECONDS
/// Area around the vendor that will pushback nearby mobs.
var/pulse_distance = PULSE_DISTANCE_RANGE
allow_custom = FALSE
/obj/machinery/vending/runic_vendor/Initialize(mapload)
if(mapload)
code/modules/vending/security.dm
-1
View File
@@ -37,7 +37,6 @@
default_price = PAYCHECK_CREW
extra_price = PAYCHECK_COMMAND * 1.5
payment_department = ACCOUNT_SEC
allow_custom = TRUE
/obj/machinery/vending/security/pre_throw(obj/item/thrown_item)
if(isgrenade(thrown_item))
code/modules/vending/snack.dm
-1
View File
@@ -45,7 +45,6 @@
default_price = PAYCHECK_CREW * 0.6
extra_price = PAYCHECK_CREW
payment_department = ACCOUNT_SRV
allow_custom = TRUE
/obj/item/vending_refill/snack
machine_name = "Getmore Chocolate Corp"
code/modules/vending/sovietsoda.dm
-1
View File
@@ -18,7 +18,6 @@
payment_department = NO_FREEBIES
light_color = COLOR_PALE_ORANGE
initial_language_holder = /datum/language_holder/spinwarder
allow_custom = TRUE
/obj/item/vending_refill/sovietsoda
machine_name = "BODA"
code/modules/vending/subtype.dm
+1
View File
@@ -13,6 +13,7 @@
all_products_free = TRUE
/// Spawns coders by default
var/type_to_vend = /obj/item/food/grown/citrus
allow_custom = FALSE
/obj/machinery/vending/subtype_vendor/Initialize(mapload, type_to_vend)
if(type_to_vend)
code/modules/vending/sustenance.dm
-1
View File
@@ -25,7 +25,6 @@
default_price = PAYCHECK_LOWER
extra_price = PAYCHECK_LOWER * 0.6
payment_department = NO_FREEBIES
allow_custom = TRUE
/obj/machinery/vending/sustenance/interact(mob/living/living_user)
if(!isliving(living_user))
code/modules/vending/syndichem.dm
+5
View File
@@ -19,3 +19,8 @@
)
product_slogans = "It's not pyromania if you're getting paid!;You smell that? Plasma, son. Nothing else in the world smells like that.;I love the smell of Plasma in the morning."
resistance_flags = FIRE_PROOF
refill_canister = /obj/item/vending_refill/syndichem
/obj/item/vending_refill/syndichem
machine_name = "SyndiChem"
icon_state = "refill_syndichem"
code/modules/vending/toys.dm
-1
View File
@@ -7,7 +7,6 @@
product_ads = "Feel robust with your toys!;Express your inner child today!;Toy weapons don't kill people, but valid hunters do!;Who needs responsibilities when you have toy weapons?;Make your next murder FUN!"
vend_reply = "Come back for more!"
light_mask = "donksoft-light-mask"
circuit = /obj/item/circuitboard/machine/vending/donksofttoyvendor
products = list(
/obj/item/card/emagfake = 4,
/obj/item/hot_potato/harmless/toy = 4,
code/modules/vending/vendor/_vending.dm
Vendored
+1 -1
View File
@@ -72,7 +72,7 @@
///Icon for the maintenance panel overlay
var/panel_type = "panel1"
///Whether this vendor can be selected when building a custom vending machine
var/allow_custom = FALSE
var/allow_custom = TRUE
/**
* List of products this machine sells
code/modules/vending/wardrobes.dm
+1 -19
View File
@@ -72,7 +72,6 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE)
refill_canister = /obj/item/vending_refill/wardrobe/sec_wardrobe
payment_department = ACCOUNT_SEC
light_color = COLOR_MOSTLY_PURE_RED
allow_custom = TRUE
/obj/item/vending_refill/wardrobe/sec_wardrobe
machine_name = "SecDrobe"
@@ -119,7 +118,6 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE)
)
refill_canister = /obj/item/vending_refill/wardrobe/medi_wardrobe
payment_department = ACCOUNT_MED
allow_custom = TRUE
/obj/item/vending_refill/wardrobe/medi_wardrobe
machine_name = "MediDrobe"
@@ -150,7 +148,6 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE)
refill_canister = /obj/item/vending_refill/wardrobe/engi_wardrobe
payment_department = ACCOUNT_ENG
light_color = COLOR_VIVID_YELLOW
allow_custom = TRUE
/obj/item/vending_refill/wardrobe/engi_wardrobe
machine_name = "EngiDrobe"
@@ -176,7 +173,6 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE)
refill_canister = /obj/item/vending_refill/wardrobe/atmos_wardrobe
payment_department = ACCOUNT_ENG
light_color = COLOR_VIVID_YELLOW
allow_custom = TRUE
/obj/item/vending_refill/wardrobe/atmos_wardrobe
machine_name = "AtmosDrobe"
@@ -220,7 +216,6 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE)
)
refill_canister = /obj/item/vending_refill/wardrobe/cargo_wardrobe
payment_department = ACCOUNT_CAR
allow_custom = TRUE
/obj/item/vending_refill/wardrobe/cargo_wardrobe
machine_name = "CargoDrobe"
@@ -255,7 +250,6 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE)
refill_canister = /obj/item/vending_refill/wardrobe/robo_wardrobe
extra_price = PAYCHECK_COMMAND * 1.2
payment_department = ACCOUNT_SCI
allow_custom = TRUE
/obj/item/vending_refill/wardrobe/robo_wardrobe
machine_name = "RoboDrobe"
@@ -285,7 +279,6 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE)
)
refill_canister = /obj/item/vending_refill/wardrobe/science_wardrobe
payment_department = ACCOUNT_SCI
allow_custom = TRUE
/obj/item/vending_refill/wardrobe/science_wardrobe
machine_name = "SciDrobe"
@@ -314,7 +307,6 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE)
refill_canister = /obj/item/vending_refill/wardrobe/hydro_wardrobe
payment_department = ACCOUNT_SRV
light_color = LIGHT_COLOR_ELECTRIC_GREEN
allow_custom = TRUE
/obj/item/vending_refill/wardrobe/hydro_wardrobe
machine_name = "HyDrobe"
@@ -348,7 +340,6 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE)
)
refill_canister = /obj/item/vending_refill/wardrobe/curator_wardrobe
payment_department = ACCOUNT_SRV
allow_custom = TRUE
/obj/item/vending_refill/wardrobe/curator_wardrobe
machine_name = "CuraDrobe"
@@ -398,7 +389,6 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE)
)
refill_canister = /obj/item/vending_refill/wardrobe/coroner_wardrobe
payment_department = ACCOUNT_MED
allow_custom = TRUE
/obj/item/vending_refill/wardrobe/coroner_wardrobe
machine_name = "MortiDrobe"
@@ -436,7 +426,6 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE)
refill_canister = /obj/item/vending_refill/wardrobe/bar_wardrobe
payment_department = ACCOUNT_MED
extra_price = PAYCHECK_COMMAND
allow_custom = TRUE
/obj/item/vending_refill/wardrobe/bar_wardrobe
machine_name = "BarDrobe"
@@ -467,7 +456,6 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE)
)
refill_canister = /obj/item/vending_refill/wardrobe/chef_wardrobe
payment_department = ACCOUNT_SRV
allow_custom = TRUE
/obj/item/vending_refill/wardrobe/chef_wardrobe
machine_name = "ChefDrobe"
@@ -507,7 +495,6 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE)
extra_price = PAYCHECK_COMMAND * 0.8
payment_department = ACCOUNT_SRV
light_color = COLOR_STRONG_MAGENTA
allow_custom = TRUE
/obj/item/vending_refill/wardrobe/jani_wardrobe
machine_name = "JaniDrobe"
@@ -550,7 +537,6 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE)
)
refill_canister = /obj/item/vending_refill/wardrobe/law_wardrobe
payment_department = ACCOUNT_SRV
allow_custom = TRUE
/obj/item/vending_refill/wardrobe/law_wardrobe
machine_name = "LawDrobe"
@@ -597,7 +583,6 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE)
)
refill_canister = /obj/item/vending_refill/wardrobe/chap_wardrobe
payment_department = ACCOUNT_SRV
allow_custom = TRUE
/obj/item/vending_refill/wardrobe/chap_wardrobe
machine_name = "DeusVend"
@@ -629,7 +614,6 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE)
)
refill_canister = /obj/item/vending_refill/wardrobe/chem_wardrobe
payment_department = ACCOUNT_MED
allow_custom = TRUE
/obj/item/vending_refill/wardrobe/chem_wardrobe
machine_name = "ChemDrobe"
@@ -655,7 +639,6 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE)
)
refill_canister = /obj/item/vending_refill/wardrobe/gene_wardrobe
payment_department = ACCOUNT_SCI
allow_custom = TRUE
/obj/item/vending_refill/wardrobe/gene_wardrobe
machine_name = "GeneDrobe"
@@ -683,7 +666,6 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE)
)
refill_canister = /obj/item/vending_refill/wardrobe/viro_wardrobe
payment_department = ACCOUNT_MED
allow_custom = TRUE
/obj/item/vending_refill/wardrobe/viro_wardrobe
machine_name = "ViroDrobe"
@@ -730,7 +712,6 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE)
refill_canister = /obj/item/vending_refill/wardrobe/det_wardrobe
extra_price = PAYCHECK_COMMAND * 1.75
payment_department = ACCOUNT_SEC
allow_custom = TRUE
/obj/item/vending_refill/wardrobe/det_wardrobe
machine_name = "DetDrobe"
@@ -763,6 +744,7 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE)
/obj/item/vending_refill/wardrobe/cent_wardrobe
machine_name = "CentDrobe"
icon_state = "refill_centdrobe"
light_color = LIGHT_COLOR_ELECTRIC_GREEN
#undef MOTHROACH_START_CHANCE
code/modules/vending/youtool.dm
-1
View File
@@ -33,7 +33,6 @@
default_price = PAYCHECK_CREW
extra_price = PAYCHECK_COMMAND * 1.5
payment_department = ACCOUNT_ENG
allow_custom = TRUE
/obj/item/vending_refill/youtool
machine_name = "YouTool"
icons/obj/vending_restock.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

tools/UpdatePaths/Scripts/93028_circuitboard_vending_donk.txt
+2
View File
@@ -0,0 +1,2 @@
/obj/item/circuitboard/machine/vending/donksnackvendor : @DELETE
/obj/item/circuitboard/machine/vending/donksofttoyvendor : @DELETE