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

Adds trailing comma to lists/canisters.dm and removes single letter vars from cargo/exports/large_objects.dm (#89273)

Browse Source 
## About The Pull Request
title
## Why It's Good For The Game
slightly better code quality?
## Changelog
not player facing
This commit is contained in:
1393F
2025-02-02 20:48:42 -05:00
committed by GitHub
parent bef168fe1c
commit 3a36656ae8
2 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_globalvars/lists/canisters.dm
+1 -1
View File
@@ -25,5 +25,5 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister())
GAS_ZAUKER = /obj/machinery/portable_atmospherics/canister/zauker,
GAS_HELIUM = /obj/machinery/portable_atmospherics/canister/helium,
GAS_ANTINOBLIUM = /obj/machinery/portable_atmospherics/canister/antinoblium,
GAS_HALON = /obj/machinery/portable_atmospherics/canister/halon
GAS_HALON = /obj/machinery/portable_atmospherics/canister/halon,
))
code/modules/cargo/exports/large_objects.dm
+19 -22
View File
@@ -40,9 +40,8 @@
cost = CARGO_CRATE_VALUE * 0.5 // +0-400 depending on amount of reagents left
var/contents_cost = CARGO_CRATE_VALUE * 0.8
/datum/export/large/reagent_dispenser/get_cost(obj/O)
var/obj/structure/reagent_dispensers/D = O
var/ratio = D.reagents.total_volume / D.reagents.maximum_volume
/datum/export/large/reagent_dispenser/get_cost(obj/structure/reagent_dispensers/dispenser)
var/ratio = dispenser.reagents.total_volume / dispenser.reagents.maximum_volume
return ..() + round(contents_cost * ratio)
@@ -60,7 +59,6 @@
contents_cost = CARGO_CRATE_VALUE * 3.5
export_types = list(/obj/structure/reagent_dispensers/beerkeg)
/datum/export/large/pipedispenser
cost = CARGO_CRATE_VALUE * 2.5
unit_name = "pipe dispenser"
@@ -120,27 +118,26 @@
export_types = list(/obj/machinery/portable_atmospherics/canister)
k_elasticity = 0.00033
/datum/export/large/gas_canister/get_cost(obj/O)
var/obj/machinery/portable_atmospherics/canister/C = O
/datum/export/large/gas_canister/get_cost(obj/machinery/portable_atmospherics/canister/canister)
var/worth = cost
var/datum/gas_mixture/canister_mix = C.return_air()
var/datum/gas_mixture/canister_mix = canister.return_air()
var/canister_gas = canister_mix.gases
var/list/gases_to_check = list(
/datum/gas/bz,
/datum/gas/nitrium,
/datum/gas/hypernoblium,
/datum/gas/miasma,
/datum/gas/tritium,
/datum/gas/pluoxium,
/datum/gas/freon,
/datum/gas/hydrogen,
/datum/gas/healium,
/datum/gas/proto_nitrate,
/datum/gas/zauker,
/datum/gas/helium,
/datum/gas/antinoblium,
/datum/gas/halon,
)
/datum/gas/bz,
/datum/gas/nitrium,
/datum/gas/hypernoblium,
/datum/gas/miasma,
/datum/gas/tritium,
/datum/gas/pluoxium,
/datum/gas/freon,
/datum/gas/hydrogen,
/datum/gas/healium,
/datum/gas/proto_nitrate,
/datum/gas/zauker,
/datum/gas/helium,
/datum/gas/antinoblium,
/datum/gas/halon,
)
for(var/gasID in gases_to_check)
canister_mix.assert_gas(gasID)