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

Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-sync

Browse Source
This commit is contained in:
xPokee
2025-10-03 07:05:54 -04:00
parent d9c4fe21be 7ee1cd7c06
commit 5e629dff04
517 changed files with 24339 additions and 21253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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
@@ -233,7 +233,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
@@ -40,7 +40,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/panslavic //bubber edit; spinwarder to panslavic
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
@@ -74,7 +74,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"
@@ -121,7 +120,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"
@@ -152,7 +150,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"
@@ -178,7 +175,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"
@@ -222,7 +218,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"
@@ -257,7 +252,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"
@@ -287,7 +281,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"
@@ -316,7 +309,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"
@@ -350,7 +342,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"
@@ -401,7 +392,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"
@@ -439,7 +429,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"
@@ -470,7 +459,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"
@@ -510,7 +498,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"
@@ -553,7 +540,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"
@@ -600,7 +586,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"
@@ -632,7 +617,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"
@@ -658,7 +642,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"
@@ -686,7 +669,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"
@@ -733,7 +715,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"
@@ -766,6 +747,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"