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

Removes vestigial req_access from vending machines + some cleanup (#86550)

Browse Source 
## About The Pull Request

Once upon a time, vending machines were access locked I guess? It's been
so many years since that has been the case that most people don't
remember (including myself).

This just removes all the old unused req_access lists that reside on the
various vending machines.

## Why It's Good For The Game

Less chance of cargo culting something that serves no purpose anymore.

## Changelog

Nothing player facing I should hope

---------

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
This commit is contained in:
Bloop
2024-09-10 14:41:42 +00:00
committed by GitHub
co-authored by Ghom
parent 0d3c8b92d5
commit feb474550f
51 changed files with 118 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vending/autodrobe.dm
+1 -5
View File
@@ -224,7 +224,6 @@ GLOBAL_VAR_INIT(all_autodrobe_items, (autodrobe_costumes_items +\
icon_state = "theater"
icon_deny = "theater-deny"
panel_type = "panel16"
req_access = list(ACCESS_THEATRE)
product_slogans = "Dress for success!;Suited and booted!;It's show time!;Why leave style up to fate? Use AutoDrobe!"
vend_reply = "Thank you for using AutoDrobe!"
@@ -236,7 +235,7 @@ GLOBAL_VAR_INIT(all_autodrobe_items, (autodrobe_costumes_items +\
default_price = PAYCHECK_CREW * 0.8 //Default of 40.
extra_price = PAYCHECK_COMMAND
payment_department = ACCOUNT_SRV
light_mask="theater-light-mask"
light_mask = "theater-light-mask"
/obj/machinery/vending/autodrobe/Initialize(mapload)
product_categories = list(
@@ -281,9 +280,6 @@ GLOBAL_VAR_INIT(all_autodrobe_items, (autodrobe_costumes_items +\
. = ..()
/obj/machinery/vending/autodrobe/all_access
desc = "A vending machine for costumes. This model appears to have no access restrictions."
req_access = null
/obj/item/vending_refill/autodrobe
machine_name = "AutoDrobe"
icon_state = "refill_costume"
code/modules/vending/boozeomat.dm
+1 -7
View File
@@ -85,19 +85,13 @@
product_slogans = "I hope nobody asks me for a bloody cup o' tea...;Alcohol is humanity's friend. Would you abandon a friend?;Quite delighted to serve you!;Is nobody thirsty on this station?"
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_CREW * 0.9
extra_price = PAYCHECK_COMMAND
payment_department = ACCOUNT_SRV
light_mask = "boozeomat-light-mask"
/obj/machinery/vending/boozeomat/all_access
desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one. This model appears to have no access restrictions."
req_access = null
/obj/machinery/vending/boozeomat/syndicate_access
req_access = list(ACCESS_SYNDICATE)
/obj/machinery/vending/boozeomat/syndicate
age_restrictions = FALSE
initial_language_holder = /datum/language_holder/syndicate
code/modules/vending/cartridge.dm
+1 -1
View File
@@ -19,7 +19,7 @@
default_price = PAYCHECK_COMMAND
extra_price = PAYCHECK_COMMAND * 2.5
payment_department = ACCOUNT_SRV
light_mask="cart-light-mask"
light_mask = "cart-light-mask"
/obj/item/vending_refill/cart
machine_name = "PTech"
code/modules/vending/cigarette.dm
+4 -4
View File
@@ -75,7 +75,7 @@
machine_name = "ShadyCigs Deluxe"
icon_state = "refill_smoke"
/obj/machinery/vending/cigarette/pre_throw(obj/item/I)
if(istype(I, /obj/item/lighter))
var/obj/item/lighter/L = I
L.set_lit(TRUE)
/obj/machinery/vending/cigarette/pre_throw(obj/item/thrown_item)
if(istype(thrown_item, /obj/item/lighter))
var/obj/item/lighter/thrown_lighter = thrown_item
thrown_lighter.set_lit(TRUE)
code/modules/vending/cola.dm
-1
View File
@@ -36,7 +36,6 @@
extra_price = PAYCHECK_CREW
payment_department = ACCOUNT_SRV
/obj/item/vending_refill/cola
machine_name = "Robust Softdrinks"
icon_state = "refill_cola"
code/modules/vending/engineering.dm
-1
View File
@@ -5,7 +5,6 @@
icon_state = "engi"
icon_deny = "engi-deny"
panel_type = "panel10"
req_access = list(ACCESS_ENGINE_EQUIP)
products = list(
/obj/item/clothing/under/rank/engineering/chief_engineer = 4,
/obj/item/clothing/under/rank/engineering/engineer = 4,
code/modules/vending/engivend.dm
-1
View File
@@ -4,7 +4,6 @@
icon_state = "engivend"
icon_deny = "engivend-deny"
panel_type = "panel10"
req_access = list(ACCESS_ENGINE_EQUIP)
products = list(
/obj/item/clothing/glasses/meson/engine = 2,
/obj/item/clothing/glasses/welding = 3,
code/modules/vending/medical.dm
+4 -8
View File
@@ -5,7 +5,6 @@
icon_deny = "med-deny"
panel_type = "panel11"
product_ads = "Go save some lives!;The best stuff for your medbay.;Only the finest tools.;Natural chemicals!;This stuff saves lives.;Don't you want some?;Ping!"
req_access = list(ACCESS_MEDICAL)
products = list(
/obj/item/stack/medical/gauze = 8,
/obj/item/reagent_containers/syringe = 12,
@@ -45,13 +44,11 @@
machine_name = "NanoMed Plus"
icon_state = "refill_medical"
/obj/machinery/vending/medical/syndicate_access
/obj/machinery/vending/medical/syndicate
name = "\improper SyndiMed Plus"
req_access = list(ACCESS_SYNDICATE)
initial_language_holder = /datum/language_holder/syndicate
/obj/machinery/vending/medical/infested_frigate
req_access = list("theatre")
products = list(
/obj/item/stack/medical/gauze = 0,
/obj/item/reagent_containers/syringe = 7,
@@ -75,7 +72,6 @@
icon_deny = "drug-deny"
panel_type = "panel11"
product_ads = "Go save some lives!;The best stuff for your medbay.;Only the finest tools.;Natural chemicals!;This stuff saves lives.;Don't you want some?;Ping!"
req_access = list(ACCESS_MEDICAL)
products = list(
/obj/item/reagent_containers/pill/patch/libital = 5,
/obj/item/reagent_containers/pill/patch/aiuri = 5,
@@ -93,17 +89,17 @@
/obj/item/reagent_containers/medigel/libital = 2,
/obj/item/reagent_containers/medigel/aiuri = 2,
/obj/item/reagent_containers/medigel/sterilizine = 1,
)
)
contraband = list(
/obj/item/reagent_containers/pill/tox = 3,
/obj/item/reagent_containers/pill/morphine = 4,
/obj/item/reagent_containers/pill/multiver = 6,
)
)
premium = list(
/obj/item/reagent_containers/medigel/synthflesh = 2,
/obj/item/storage/pill_bottle/psicodine = 2,
/obj/item/storage/pill_bottle/sansufentanyl = 1,
)
)
default_price = 50
extra_price = 100
payment_department = ACCOUNT_MED
code/modules/vending/robotics.dm
-1
View File
@@ -6,7 +6,6 @@
icon_deny = "robotics-deny"
panel_type = "panel14"
light_mask = "robotics-light-mask"
req_access = list(ACCESS_ROBOTICS)
products = list(
/obj/item/clothing/suit/toggle/labcoat = 4,
/obj/item/clothing/under/rank/rnd/roboticist = 4,
code/modules/vending/security.dm
+8 -9
View File
@@ -6,7 +6,6 @@
icon_deny = "sec-deny"
panel_type = "panel6"
light_mask = "sec-light-mask"
req_access = list(ACCESS_SECURITY)
products = list(
/obj/item/restraints/handcuffs = 8,
/obj/item/restraints/handcuffs/cable/zipties = 10,
@@ -38,14 +37,14 @@
extra_price = PAYCHECK_COMMAND * 1.5
payment_department = ACCOUNT_SEC
/obj/machinery/vending/security/pre_throw(obj/item/I)
if(isgrenade(I))
var/obj/item/grenade/G = I
G.arm_grenade()
else if(istype(I, /obj/item/flashlight))
var/obj/item/flashlight/F = I
F.set_light_on(TRUE)
F.update_brightness()
/obj/machinery/vending/security/pre_throw(obj/item/thrown_item)
if(isgrenade(thrown_item))
var/obj/item/grenade/thrown_grenade = thrown_item
thrown_grenade.arm_grenade()
else if(istype(thrown_item, /obj/item/flashlight))
var/obj/item/flashlight/thrown_flashlight = thrown_item
thrown_flashlight.set_light_on(TRUE)
thrown_flashlight.update_brightness()
/obj/item/vending_refill/security
machine_name = "SecTech"