diff --git a/_maps/RandomRuins/StationRuins/BoxStation/engine_teg.dmm b/_maps/RandomRuins/StationRuins/BoxStation/engine_teg.dmm index 93d28abe08a3..cb8108cb54b1 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/engine_teg.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/engine_teg.dmm @@ -352,7 +352,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/tank/toxins{ +/obj/machinery/atmospherics/components/unary/tank/plasma{ dir = 8; volume = 6e+006 }, diff --git a/_maps/RandomRuins/StationRuins/MetaStation/meta_teg.dmm b/_maps/RandomRuins/StationRuins/MetaStation/meta_teg.dmm index df5bd9f0eb6c..b61308f19584 100644 --- a/_maps/RandomRuins/StationRuins/MetaStation/meta_teg.dmm +++ b/_maps/RandomRuins/StationRuins/MetaStation/meta_teg.dmm @@ -908,7 +908,7 @@ /turf/open/floor/engine, /area/engine/engineering) "Hc" = ( -/obj/machinery/atmospherics/components/unary/tank/toxins{ +/obj/machinery/atmospherics/components/unary/tank/plasma{ dir = 4; volume = 6e+006 }, diff --git a/_maps/map_files/AsteroidStation/AsteroidStation.dmm b/_maps/map_files/AsteroidStation/AsteroidStation.dmm index 7ac0ab0170ba..df0b0f6b43c5 100644 --- a/_maps/map_files/AsteroidStation/AsteroidStation.dmm +++ b/_maps/map_files/AsteroidStation/AsteroidStation.dmm @@ -78649,7 +78649,7 @@ /turf/open/floor/circuit/telecomms/server, /area/ai_monitored/secondarydatacoreserver) "xyw" = ( -/obj/machinery/atmospherics/components/unary/tank/toxins{ +/obj/machinery/atmospherics/components/unary/tank/plasma{ dir = 4 }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index bef3f0129778..d7a483a5e432 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -34297,7 +34297,7 @@ /turf/open/floor/plasteel/cafeteria, /area/security/prison) "jjR" = ( -/obj/machinery/atmospherics/components/unary/tank/toxins, +/obj/machinery/atmospherics/components/unary/tank/plasma, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "jjS" = ( diff --git a/code/datums/greyscale/config_types/greyscale_configs.dm b/code/datums/greyscale/config_types/greyscale_configs.dm index cea426a3aeb3..7733f98d8cd1 100644 --- a/code/datums/greyscale/config_types/greyscale_configs.dm +++ b/code/datums/greyscale/config_types/greyscale_configs.dm @@ -28,10 +28,10 @@ icon_file = 'icons/obj/atmospherics/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/atmospherics/stationary_canisters.dmi' - json_config = 'code/datums/greyscale/json_configs/smooth_canister_stationary.json' +/datum/greyscale_config/pressure_tank + name = "Pressure Tank" + icon_file = 'icons/obj/atmospherics/pressure_tank.dmi' + json_config = 'code/datums/greyscale/json_configs/pressure_tank.json' /datum/greyscale_config/carp name = "Space Carp" diff --git a/code/datums/greyscale/json_configs/pressure_tank.json b/code/datums/greyscale/json_configs/pressure_tank.json new file mode 100644 index 000000000000..06a706288cfa --- /dev/null +++ b/code/datums/greyscale/json_configs/pressure_tank.json @@ -0,0 +1,10 @@ +{ + "base": [ + { + "type": "icon_state", + "icon_state": "base", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/smooth_canister_stationary.json b/code/datums/greyscale/json_configs/smooth_canister_stationary.json deleted file mode 100644 index df01ce1e6d25..000000000000 --- a/code/datums/greyscale/json_configs/smooth_canister_stationary.json +++ /dev/null @@ -1,186 +0,0 @@ -{ - "smooth": [ - { - "type": "icon_state", - "icon_state": "smooth", - "blend_mode": "overlay", - "color_ids": [ 1 ] - } - ], - "window-fg": [ - { - "type": "icon_state", - "icon_state": "window-fg", - "blend_mode": "overlay", - "color_ids": [ 1 ] - } - ], - "window-bg": [ - { - "type": "icon_state", - "icon_state": "window-bg", - "blend_mode": "overlay", - "color_ids": [ 1 ] - } - ], - "1-i": [ - { - "type": "icon_state", - "icon_state": "1-i", - "blend_mode": "overlay", - "color_ids": [ 1 ] - } - ], - "2-i": [ - { - "type": "icon_state", - "icon_state": "2-i", - "blend_mode": "overlay", - "color_ids": [ 1 ] - } - ], - "3-i": [ - { - "type": "icon_state", - "icon_state": "3-i", - "blend_mode": "overlay", - "color_ids": [ 1 ] - } - ], - "4-i": [ - { - "type": "icon_state", - "icon_state": "4-i", - "blend_mode": "overlay", - "color_ids": [ 1 ] - } - ], - "1-n": [ - { - "type": "icon_state", - "icon_state": "1-n", - "blend_mode": "overlay", - "color_ids": [ 1 ] - } - ], - "2-n": [ - { - "type": "icon_state", - "icon_state": "2-n", - "blend_mode": "overlay", - "color_ids": [ 1 ] - } - ], - "3-s": [ - { - "type": "icon_state", - "icon_state": "3-s", - "blend_mode": "overlay", - "color_ids": [ 1 ] - } - ], - "4-s": [ - { - "type": "icon_state", - "icon_state": "4-s", - "blend_mode": "overlay", - "color_ids": [ 1 ] - } - ], - "1-w": [ - { - "type": "icon_state", - "icon_state": "1-w", - "blend_mode": "overlay", - "color_ids": [ 1 ] - } - ], - "2-e": [ - { - "type": "icon_state", - "icon_state": "2-e", - "blend_mode": "overlay", - "color_ids": [ 1 ] - } - ], - "3-w": [ - { - "type": "icon_state", - "icon_state": "3-w", - "blend_mode": "overlay", - "color_ids": [ 1 ] - } - ], - "4-e": [ - { - "type": "icon_state", - "icon_state": "4-e", - "blend_mode": "overlay", - "color_ids": [ 1 ] - } - ], - "1-nw": [ - { - "type": "icon_state", - "icon_state": "1-nw", - "blend_mode": "overlay", - "color_ids": [ 1 ] - } - ], - "2-ne": [ - { - "type": "icon_state", - "icon_state": "2-ne", - "blend_mode": "overlay", - "color_ids": [ 1 ] - } - ], - "3-sw": [ - { - "type": "icon_state", - "icon_state": "3-sw", - "blend_mode": "overlay", - "color_ids": [ 1 ] - } - ], - "4-se": [ - { - "type": "icon_state", - "icon_state": "4-se", - "blend_mode": "overlay", - "color_ids": [ 1 ] - } - ], - "1-f": [ - { - "type": "icon_state", - "icon_state": "1-f", - "blend_mode": "overlay", - "color_ids": [ 1 ] - } - ], - "2-f": [ - { - "type": "icon_state", - "icon_state": "2-f", - "blend_mode": "overlay", - "color_ids": [ 1 ] - } - ], - "3-f": [ - { - "type": "icon_state", - "icon_state": "3-f", - "blend_mode": "overlay", - "color_ids": [ 1 ] - } - ], - "4-f": [ - { - "type": "icon_state", - "icon_state": "4-f", - "blend_mode": "overlay", - "color_ids": [ 1 ] - } - ] -} diff --git a/code/modules/atmospherics/machinery/components/unary_devices/tank.dm b/code/modules/atmospherics/machinery/components/unary_devices/tank.dm index ad9e2229e583..f091bb466de1 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/tank.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/tank.dm @@ -1,18 +1,18 @@ #define AIR_CONTENTS ((25*ONE_ATMOSPHERE)*(air_contents.return_volume())/(R_IDEAL_GAS_EQUATION*air_contents.return_temperature())) /obj/machinery/atmospherics/components/unary/tank - icon = 'icons/obj/atmospherics/stationary_canisters.dmi' - icon_state = "smooth" - name = "pressure tank" desc = "A large vessel containing pressurized gas." + icon = 'icons/obj/atmospherics/pressure_tank.dmi' + icon_state = "base" + max_integrity = 800 density = TRUE layer = ABOVE_WINDOW_LAYER pipe_flags = PIPING_ONE_PER_TURF - greyscale_config = /datum/greyscale_config/stationary_canister + greyscale_config = /datum/greyscale_config/pressure_tank greyscale_colors = "#ffffff" var/volume = 10000 //in liters @@ -25,12 +25,12 @@ air_contents.set_temperature(T20C) if(gas_type) air_contents.set_moles(gas_type, AIR_CONTENTS) - name = "[name] ([GLOB.gas_data.names[gas_type]])" + name = "[name] ([GLOB.gas_data.names[gas_type]])" // Automatically names them after gas type set_piping_layer(piping_layer) /obj/machinery/atmospherics/components/unary/tank/air - greyscale_colors = "#c6c0b5" name = "pressure tank (Air)" + greyscale_colors = "#f5f3f0" /obj/machinery/atmospherics/components/unary/tank/air/Initialize(mapload) . = ..() @@ -40,24 +40,27 @@ /obj/machinery/atmospherics/components/unary/tank/carbon_dioxide gas_type = GAS_CO2 + greyscale_colors = "#2f2f38" /obj/machinery/atmospherics/components/unary/tank/carbon_dioxide/Initialize(mapload) . = ..() var/datum/gas_mixture/air_contents = airs[1] air_contents.set_moles(GAS_CO2, AIR_CONTENTS) -/obj/machinery/atmospherics/components/unary/tank/toxins - greyscale_colors = "#f62800" +/obj/machinery/atmospherics/components/unary/tank/plasma gas_type = GAS_PLASMA + greyscale_config = null + greyscale_colors = null + icon_state = "plasma" -/obj/machinery/atmospherics/components/unary/tank/toxins/Initialize(mapload) +/obj/machinery/atmospherics/components/unary/tank/plasma/Initialize(mapload) . = ..() var/datum/gas_mixture/air_contents = airs[1] air_contents.set_moles(GAS_PLASMA, AIR_CONTENTS) /obj/machinery/atmospherics/components/unary/tank/oxygen - greyscale_colors = "#2786E5" gas_type = GAS_O2 + greyscale_colors = "#148df4" /obj/machinery/atmospherics/components/unary/tank/oxygen/Initialize(mapload) . = ..() @@ -65,8 +68,8 @@ air_contents.set_moles(GAS_O2, AIR_CONTENTS) /obj/machinery/atmospherics/components/unary/tank/nitrogen - greyscale_colors = "#d41010" gas_type = GAS_N2 + greyscale_colors = "#2d8f44" /obj/machinery/atmospherics/components/unary/tank/nitrogen/Initialize(mapload) . = ..() diff --git a/icons/obj/atmospherics/pipes/pressure_tank.dmi b/icons/obj/atmospherics/pipes/pressure_tank.dmi deleted file mode 100644 index 95103015cfd6..000000000000 Binary files a/icons/obj/atmospherics/pipes/pressure_tank.dmi and /dev/null differ diff --git a/icons/obj/atmospherics/pressure_tank.dmi b/icons/obj/atmospherics/pressure_tank.dmi new file mode 100644 index 000000000000..3897684e92ec Binary files /dev/null and b/icons/obj/atmospherics/pressure_tank.dmi differ diff --git a/icons/obj/atmospherics/stationary_canisters.dmi b/icons/obj/atmospherics/stationary_canisters.dmi deleted file mode 100644 index 4f87a50845b0..000000000000 Binary files a/icons/obj/atmospherics/stationary_canisters.dmi and /dev/null differ