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

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

Browse Source
This commit is contained in:
xPokee
2025-09-10 14:12:16 -04:00
parent ee99d0e5b0 392f1d93e8
commit 939f2fc9ac
277 changed files with 8854 additions and 7401 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vending/medical.dm
+2
View File
@@ -91,6 +91,8 @@
/obj/item/reagent_containers/cup/bottle/salglu_solution = 3,
/obj/item/reagent_containers/cup/bottle/toxin = 3,
/obj/item/reagent_containers/syringe/antiviral = 6,
/obj/item/reagent_containers/medigel/libital = 2,
/obj/item/reagent_containers/medigel/aiuri = 2,
/obj/item/reagent_containers/medigel/sterilizine = 6, // BUBBER EDIT CHANGE - ORIGINAL: 3
)
contraband = list(
code/modules/vending/medical_wall.dm
+8 -7
View File
@@ -6,19 +6,20 @@
panel_type = "wallmed-panel"
density = FALSE
products = list(
/obj/item/stack/medical/bandage = 1,
/obj/item/stack/medical/ointment = 1,
/obj/item/stack/medical/gauze = 1,
/obj/item/reagent_containers/hypospray/medipen/ekit = 1,
/obj/item/healthanalyzer/simple = 1,
/obj/item/stack/medical/bandage = 4,
/obj/item/stack/medical/ointment = 2,
/obj/item/reagent_containers/applicator/pill/multiver = 2,
/obj/item/stack/medical/gauze = 4,
/obj/item/reagent_containers/hypospray/medipen/ekit = 2,
/obj/item/healthanalyzer/simple = 2,
)
contraband = list(
/obj/item/storage/box/bandages = 1,
/obj/item/storage/box/gum/happiness = 1,
)
premium = list(
/obj/item/reagent_containers/applicator/patch/libital = 1,
/obj/item/reagent_containers/applicator/patch/aiuri = 1,
/obj/item/reagent_containers/applicator/patch/libital = 2,
/obj/item/reagent_containers/applicator/patch/aiuri = 2,
)
refill_canister = /obj/item/vending_refill/wallmed
default_price = PAYCHECK_CREW * 0.3 // Cheap since crew should be able to affort it in emergency situations
code/modules/vending/vendor/inventory.dm
Vendored
+1 -1
View File
@@ -273,7 +273,7 @@
var/datum/bank_account/account = paying_id_card.registered_account
//deduct money from person
if(!discountless && account.account_job.paycheck_department == payment_department)
if(!discountless && account.account_job?.paycheck_department == payment_department)
price_to_use = max(round(price_to_use * DEPARTMENT_DISCOUNT), 1) //No longer free, but signifigantly cheaper.
if(attempt_charge(src, mob_paying, price_to_use) & COMPONENT_OBJ_CANCEL_CHARGE)
speak("You do not possess the funds to purchase [product_to_vend.name].")