[MIRROR] General maintenance for canisters [MDB IGNORE] (#1036)

* General maintenance for canisters (#80145) --------- Co-authored-by: SkyratBot <[email protected]> Co-authored-by: SyncIt21 <[email protected]>
Fluffy-Frontier · Dec 9, 2023 · 207ea0f · 207ea0f
1 parent d44f2bb
commit 207ea0f
Show file tree

Hide file tree

Showing 9 changed files with 175 additions and 313 deletions.
diff --git a/code/__DEFINES/atmospherics/atmos_machinery.dm b/code/__DEFINES/atmospherics/atmos_machinery.dm
@@ -77,3 +77,8 @@
 ///What direction is the machine pumping (into pump/port or out to the tank/area)?
 #define PUMP_IN TRUE
 #define PUMP_OUT FALSE
+
+///Max allowed pressure for canisters to release air per tick
+#define CAN_MAX_RELEASE_PRESSURE (ONE_ATMOSPHERE * 25)
+///Min allowed pressure for canisters to release air per tick
+#define CAN_MIN_RELEASE_PRESSURE (ONE_ATMOSPHERE * 0.1)
diff --git a/code/_globalvars/lists/canisters.dm b/code/_globalvars/lists/canisters.dm
@@ -0,0 +1,29 @@
+///List of all the gases, used in labelling the canisters
+GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister())
+
+///Returns a map of canister id to its type path
+/proc/init_gas_id_to_canister()
+	return sort_list(list(
+		GAS_N2 = /obj/machinery/portable_atmospherics/canister/nitrogen,
+		GAS_O2 = /obj/machinery/portable_atmospherics/canister/oxygen,
+		GAS_CO2 = /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
+		GAS_PLASMA = /obj/machinery/portable_atmospherics/canister/plasma,
+		GAS_N2O = /obj/machinery/portable_atmospherics/canister/nitrous_oxide,
+		GAS_NITRIUM = /obj/machinery/portable_atmospherics/canister/nitrium,
+		GAS_BZ = /obj/machinery/portable_atmospherics/canister/bz,
+		GAS_AIR = /obj/machinery/portable_atmospherics/canister/air,
+		GAS_WATER_VAPOR = /obj/machinery/portable_atmospherics/canister/water_vapor,
+		GAS_TRITIUM = /obj/machinery/portable_atmospherics/canister/tritium,
+		GAS_HYPER_NOBLIUM = /obj/machinery/portable_atmospherics/canister/nob,
+		GAS_PLUOXIUM = /obj/machinery/portable_atmospherics/canister/pluoxium,
+		"caution" = /obj/machinery/portable_atmospherics/canister,
+		GAS_MIASMA = /obj/machinery/portable_atmospherics/canister/miasma,
+		GAS_FREON = /obj/machinery/portable_atmospherics/canister/freon,
+		GAS_HYDROGEN = /obj/machinery/portable_atmospherics/canister/hydrogen,
+		GAS_HEALIUM = /obj/machinery/portable_atmospherics/canister/healium,
+		GAS_PROTO_NITRATE = /obj/machinery/portable_atmospherics/canister/proto_nitrate,
+		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
+	))
diff --git a/code/datums/greyscale/config_types/greyscale_configs/greyscale_objects.dm b/code/datums/greyscale/config_types/greyscale_configs/greyscale_objects.dm
@@ -112,11 +112,6 @@
 	name = "Hazard Striped Canister"
 	json_config = 'code/datums/greyscale/json_configs/canister_hazard.json'
 
-/datum/greyscale_config/prototype_canister
-	name = "Prototype Canister"
-	icon_file = 'icons/obj/pipes_n_cables/prototype_canister.dmi'
-	json_config = 'code/datums/greyscale/json_configs/canister_proto.json'
-
 /datum/greyscale_config/stationary_canister
 	name = "Stationary Canister"
 	icon_file = 'icons/obj/pipes_n_cables/stationary_canisters.dmi'

diff --git a/code/datums/greyscale/json_configs/canister_proto.json b/code/datums/greyscale/json_configs/canister_proto.json