diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm index 5ed89de5b0..585b6e896a 100644 --- a/code/modules/atmospherics/machinery/portable/canister.dm +++ b/code/modules/atmospherics/machinery/portable/canister.dm @@ -41,9 +41,14 @@ "co2" = /obj/machinery/portable_atmospherics/canister/carbon_dioxide, "plasma" = /obj/machinery/portable_atmospherics/canister/toxins, "n2o" = /obj/machinery/portable_atmospherics/canister/nitrous_oxide, + "no2" = /obj/machinery/portable_atmospherics/canister/nitryl, "bz" = /obj/machinery/portable_atmospherics/canister/bz, "air" = /obj/machinery/portable_atmospherics/canister/air, "water vapor" = /obj/machinery/portable_atmospherics/canister/water_vapor, + "tritium" = /obj/machinery/portable_atmospherics/canister/tritium, + "hyper-noblium" = /obj/machinery/portable_atmospherics/canister/nob, + "stimulum" = /obj/machinery/portable_atmospherics/canister/stimulum, + "pluoxium" = /obj/machinery/portable_atmospherics/canister/pluoxium, "caution" = /obj/machinery/portable_atmospherics/canister, ) @@ -98,26 +103,31 @@ /obj/machinery/portable_atmospherics/canister/tritium name = "tritium canister" desc = "Tritium. Inhalation might cause irradiation." + icon_state = "green" gas_type = /datum/gas/tritium /obj/machinery/portable_atmospherics/canister/nob name = "hyper-noblium canister" desc = "Hyper-Noblium. More noble than all other gases." + icon_state = "freon" gas_type = /datum/gas/hypernoblium /obj/machinery/portable_atmospherics/canister/nitryl name = "nitryl canister" desc = "Nitryl gas. Feels great 'til the acid eats your lungs." + icon_state = "brown" gas_type = /datum/gas/nitryl /obj/machinery/portable_atmospherics/canister/stimulum name = "stimulum canister" desc = "Stimulum. High energy gas, high energy people." + icon_state = "darkpurple" gas_type = /datum/gas/stimulum /obj/machinery/portable_atmospherics/canister/pluoxium name = "pluoxium canister" desc = "Pluoxium. Like oxygen, but more bang for your buck." + icon_state = "darkblue" gas_type = /datum/gas/pluoxium /obj/machinery/portable_atmospherics/canister/water_vapor @@ -127,7 +137,6 @@ gas_type = /datum/gas/water_vapor filled = 1 - /obj/machinery/portable_atmospherics/canister/proc/get_time_left() if(timing) . = round(max(0, valve_timer - world.time) / 10, 1) diff --git a/icons/obj/atmos.dmi b/icons/obj/atmos.dmi index a74e9dfbfc..1abc0b5ca7 100644 Binary files a/icons/obj/atmos.dmi and b/icons/obj/atmos.dmi differ