mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-06 06:52:39 +00:00
87ebbba36a
## About The Pull Request The list of options you could choose from when screwdrivering a custom vending machine circuit board was hard-coded and also contained copy pastes of every vending machine name (some of which were outdated). It was yucky - Add a new var on `/obj/machinery/vending` called `allow_custom`, defaults to FALSE and determines whether that type shows up as an option when screwdrivering a custom vending machine board, I've went through and made assignments for it mirror what was in the old static list i.e. this won't introduce any new options - Change the hard-coded static list to be built on Initialize, populating with every subtype that has `allow_custom` set to TRUE - Eliminate a second static list that was just the inverse of the first one (first one was typepath = name and this one was just name = typepath) - Changed an `istype` check to `==` because old behavior meant subtypes of a given vending machine would have their type set to the supertype if that was also a valid custom vending machine option ## Why It's Good For The Game Cleaner code, no needing to maintain two separate entries for the name of a vending machine, eligibility for a machine to be used in custom vending machines is now a var on the type instead of in a random file pertaining to circuit boards ## Changelog 🆑 refactor: refactored custom vending machine brand code, a new var on /obj/machinery/vending called allow_custom now determines whether the machine can be chosen when screwdrivering the circuit board /🆑
54 lines
1.9 KiB
Plaintext
54 lines
1.9 KiB
Plaintext
/obj/machinery/vending/security
|
|
name = "\improper SecTech"
|
|
desc = "A security equipment vendor."
|
|
product_ads = "Crack communist skulls!;Beat some heads in!;Don't forget - harm is good!;Your weapons are right here.;Handcuffs!;Freeze, scumbag!;Don't tase me bro!;Tase them, bro.;Why not have a donut?"
|
|
icon_state = "sec"
|
|
icon_deny = "sec-deny"
|
|
panel_type = "panel6"
|
|
light_mask = "sec-light-mask"
|
|
products = list(
|
|
/obj/item/restraints/handcuffs = 8,
|
|
/obj/item/restraints/handcuffs/cable/zipties = 10,
|
|
/obj/item/grenade/flashbang = 4,
|
|
/obj/item/assembly/flash/handheld = 5,
|
|
/obj/item/food/donut/plain = 12,
|
|
/obj/item/storage/box/evidence = 6,
|
|
/obj/item/flashlight/seclite = 4,
|
|
/obj/item/restraints/legcuffs/bola/energy = 7,
|
|
/obj/item/clothing/gloves/tackler = 5,
|
|
/obj/item/holosign_creator/security = 2,
|
|
/obj/item/gun_maintenance_supplies = 2,
|
|
)
|
|
contraband = list(
|
|
/obj/item/clothing/glasses/sunglasses = 2,
|
|
/obj/item/storage/fancy/donut_box = 2,
|
|
)
|
|
premium = list(
|
|
/obj/item/storage/belt/security/webbing = 5,
|
|
/obj/item/coin/antagtoken = 1,
|
|
/obj/item/clothing/head/helmet/blueshirt = 1,
|
|
/obj/item/clothing/gloves/color/black/security/blu = 1,
|
|
/obj/item/clothing/suit/armor/vest/blueshirt = 1,
|
|
/obj/item/grenade/stingbang = 1,
|
|
/obj/item/watertank/pepperspray = 2,
|
|
/obj/item/storage/belt/holster/energy = 4,
|
|
)
|
|
refill_canister = /obj/item/vending_refill/security
|
|
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))
|
|
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"
|
|
icon_state = "refill_sec"
|