Pressure tank tweaks

code/game/machinery/_machinery.dm

@@ -513,7 +513,7 @@ Class Procs:
 	if(panel_open && I.tool_behaviour == TOOL_WRENCH)
 		I.play_tool_sound(src, 50)
 		setDir(turn(dir,-90))
-		to_chat(user, span_notice("You rotate [src]."))
+		to_chat(user, span_notice("You rotate [src] facing [dir2text(dir)]."))
 		return TRUE
 	return FALSE
 

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -16,10 +16,10 @@
  * Metal
  */
 GLOBAL_LIST_INIT(metal_recipes, list ( \
-	new/datum/stack_recipe("bar stool", /obj/structure/chair/stool/bar, one_per_turf = TRUE, on_floor = TRUE), \
-	new/datum/stack_recipe("bed", /obj/structure/bed, 2, one_per_turf = TRUE, on_floor = TRUE), \
-	new/datum/stack_recipe("chair", /obj/structure/chair, one_per_turf = TRUE, on_floor = TRUE), \
-	new/datum/stack_recipe("stool", /obj/structure/chair/stool, one_per_turf = TRUE, on_floor = TRUE), \
+		new/datum/stack_recipe("bar stool", /obj/structure/chair/stool/bar, one_per_turf = TRUE, on_floor = TRUE), \
+		new/datum/stack_recipe("bed", /obj/structure/bed, 2, one_per_turf = TRUE, on_floor = TRUE), \
+		new/datum/stack_recipe("chair", /obj/structure/chair, one_per_turf = TRUE, on_floor = TRUE), \
+		new/datum/stack_recipe("stool", /obj/structure/chair/stool, one_per_turf = TRUE, on_floor = TRUE), \
 	null, \
 		new/datum/stack_recipe_list("comfy chairs", list( \
 		new/datum/stack_recipe("beige comfy chair", /obj/structure/chair/comfy/beige, 2, one_per_turf = TRUE, on_floor = TRUE), \
@@ -48,12 +48,15 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
 		new/datum/stack_recipe("purple filing cabinet", /obj/structure/filingcabinet/colored/purple, 2, time = 3 SECONDS, one_per_turf = TRUE, on_floor = TRUE), \
 		new/datum/stack_recipe("red filing cabinet", /obj/structure/filingcabinet/colored/red, 2, time = 3 SECONDS, one_per_turf = TRUE, on_floor = TRUE), \
 		new/datum/stack_recipe("yellow filing cabinet", /obj/structure/filingcabinet/colored/yellow, 2, time = 3 SECONDS, one_per_turf = TRUE, on_floor = TRUE), \
-	new/datum/stack_recipe("rack parts", /obj/item/rack_parts), \
-	new/datum/stack_recipe("crate shelf parts", /obj/item/rack_parts/shelf), \
+		new/datum/stack_recipe("rack parts", /obj/item/rack_parts), \
+		new/datum/stack_recipe("crate shelf parts", /obj/item/rack_parts/shelf), \
 		)), \
 	null, \
-	new/datum/stack_recipe("canister", /obj/machinery/portable_atmospherics/canister, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
-	new/datum/stack_recipe("portable pump", /obj/machinery/portable_atmospherics/pump, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
+	new/datum/stack_recipe_list("atmospherics tanks", list( \
+		new/datum/stack_recipe("canister", /obj/machinery/portable_atmospherics/canister, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
+		new/datum/stack_recipe("portable pump", /obj/machinery/portable_atmospherics/pump, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
+		new/datum/stack_recipe("pressure tank", /obj/machinery/atmospherics/components/unary/tank, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
+		)), \
 	null, \
 	new/datum/stack_recipe("floor tile", /obj/item/stack/tile/plasteel, 1, 4, 20), \
 	new/datum/stack_recipe("metal rod", /obj/item/stack/rods, 1, 2, 60), \

code/modules/atmospherics/machinery/components/unary_devices/tank.dm

@@ -2,7 +2,7 @@
 
 /obj/machinery/atmospherics/components/unary/tank
 	name = "pressure tank"
-	desc = "A large vessel containing pressurized gas."
+	desc = "A large vessel containing pressurized gas. Unanchor with a wrench by left-clicking, rotate with a wrench by right-clicking, relabel or recolor with Alt-click."
 
 	icon = 'icons/obj/atmospherics/pressure_tank.dmi'
 	icon_state = "base"
@@ -11,66 +11,152 @@
 	density = TRUE
 	layer = ABOVE_WINDOW_LAYER
 	pipe_flags = PIPING_ONE_PER_TURF
+	move_resist = MOVE_RESIST_DEFAULT
 
 	greyscale_config = /datum/greyscale_config/pressure_tank
 	greyscale_colors = "#ffffff"
 
+	var/static/list/label2types = list(
+		"air pressure tank" = /obj/machinery/atmospherics/components/unary/tank/air,
+		"plasma pressure tank" = /obj/machinery/atmospherics/components/unary/tank/plasma,
+		"oxygen pressure tank" = /obj/machinery/atmospherics/components/unary/tank/oxygen,
+		"nitrogen pressure tank" = /obj/machinery/atmospherics/components/unary/tank/nitrogen,
+		"carbon dioxide pressure tank" = /obj/machinery/atmospherics/components/unary/tank/carbon_dioxide
+	)
+
 	var/volume = 10000 //in liters
-	var/gas_type = 0
+	var/gas_type = null
 
-/obj/machinery/atmospherics/components/unary/tank/Initialize(mapload)
+/obj/machinery/atmospherics/components/unary/tank/New()
 	. = ..()
 	var/datum/gas_mixture/air_contents = airs[1]
 	air_contents.set_volume(volume)
 	air_contents.set_temperature(T20C)
 	if(gas_type)
 		air_contents.set_moles(gas_type, AIR_CONTENTS)
-		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/attackby(obj/item/I, mob/user, params)
+	if(default_deconstruction_screwdriver(user, icon_state, icon_state, I))
+		return
+	if(panel_open)
+		if(default_unfasten_wrench(user, I, 10))
+			dump_gas()
+			return
+	else
+		to_chat(user, span_warning("Open the panel first!"))
+		return
+	return ..()
+
+/obj/machinery/atmospherics/components/unary/tank/attackby_secondary(obj/item/I, mob/user, params)
+	if(panel_open)
+		if(default_change_direction_wrench(user, I))
+			change_pipe_connection(TRUE, TRUE)
+			return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+	else
+		return SECONDARY_ATTACK_CALL_NORMAL
+
+/obj/machinery/atmospherics/components/unary/tank/proc/dump_gas()
+	var/datum/gas_mixture/contents = airs[1]
+	var/datum/pipeline/pipe = parents[1]
+	for(var/gas_id in contents.get_gases())
+		var/gas_removed = contents.get_moles(gas_id)
+		if(pipe)
+			pipe.air.adjust_moles(gas_id, gas_removed)
+		else
+			var/turf/T = get_turf(src)
+			T.assume_air(contents)
+		contents.adjust_moles(gas_id, -gas_removed)
+
+/obj/machinery/atmospherics/components/unary/tank/default_change_direction_wrench(mob/user, obj/item/I)
+	if(!..())
+		return FALSE
+	set_init_directions()
+	update_icon(UPDATE_ICON)
+	return TRUE
+
+/obj/machinery/atmospherics/components/unary/tank/AltClick(mob/living/L)
+	. = ..()
+	var/list/options = list("Relabel", "Recolor")
+	var/option = tgui_input_list(usr, "Choose to recolor or relabel", "Pressure Tank", options)
+	if(option == "Relabel")
+		var/label = tgui_input_list(usr, "New pressure tank label", "Canister", label2types)
+		if(isnull(label))
+			return
+		if(!..())
+			var/newtype =  label2types[label]
+			if(newtype)
+				var/obj/machinery/portable_atmospherics/canister/replacement = newtype
+				investigate_log("was relabelled to [initial(replacement.name)] by [key_name(usr)].", INVESTIGATE_ATMOS)
+				name = initial(replacement.name)
+				desc = initial(replacement.desc)
+				icon_state = initial(replacement.icon_state)
+				set_greyscale(initial(replacement.greyscale_colors), initial(replacement.greyscale_config))
+
+	else
+		var/initial_config = greyscale_config
+		var/list/allowed_configs = list("[/datum/greyscale_config/pressure_tank]")
+		if(isnull(initial_config))
+			return
+
+		var/datum/greyscale_modify_menu/menu = new(
+			src, usr, allowed_configs, CALLBACK(src, PROC_REF(recolor)),
+			starting_icon_state = initial(icon_state),
+			starting_config = greyscale_config,
+			starting_colors = greyscale_colors
+		)
+		menu.ui_interact(usr)
+
+/obj/machinery/atmospherics/components/unary/tank/proc/recolor(datum/greyscale_modify_menu/menu)
+	set_greyscale(menu.split_colors, menu.config.type)
+
 /obj/machinery/atmospherics/components/unary/tank/air
 	name = "pressure tank (Air)"
 	greyscale_config = null
 	greyscale_colors = null
 
-/obj/machinery/atmospherics/components/unary/tank/air/Initialize(mapload)
+/obj/machinery/atmospherics/components/unary/tank/air/New()
 	. = ..()
 	var/datum/gas_mixture/air_contents = airs[1]
 	air_contents.set_moles(GAS_O2, AIR_CONTENTS * 0.2)
 	air_contents.set_moles(GAS_N2, AIR_CONTENTS * 0.8)
 
 /obj/machinery/atmospherics/components/unary/tank/carbon_dioxide
+	name = "pressure tank (CO2)"
 	gas_type = GAS_CO2
 	greyscale_colors = "#2f2f38"
 
-/obj/machinery/atmospherics/components/unary/tank/carbon_dioxide/Initialize(mapload)
+/obj/machinery/atmospherics/components/unary/tank/carbon_dioxide/New()
 	. = ..()
 	var/datum/gas_mixture/air_contents = airs[1]
 	air_contents.set_moles(GAS_CO2, AIR_CONTENTS)
 
 /obj/machinery/atmospherics/components/unary/tank/plasma
+	name = "pressure tank (Plasma)"
 	gas_type = GAS_PLASMA
 	greyscale_colors = "#f05f16"
 
-/obj/machinery/atmospherics/components/unary/tank/plasma/Initialize(mapload)
+/obj/machinery/atmospherics/components/unary/tank/plasma/New()
 	. = ..()
 	var/datum/gas_mixture/air_contents = airs[1]
 	air_contents.set_moles(GAS_PLASMA, AIR_CONTENTS)
 
 /obj/machinery/atmospherics/components/unary/tank/oxygen
+	name = "pressure tank (O2)"
 	gas_type = GAS_O2
 	greyscale_colors = "#148df4"
 
-/obj/machinery/atmospherics/components/unary/tank/oxygen/Initialize(mapload)
+/obj/machinery/atmospherics/components/unary/tank/oxygen/New()
 	. = ..()
 	var/datum/gas_mixture/air_contents = airs[1]
 	air_contents.set_moles(GAS_O2, AIR_CONTENTS)
 
 /obj/machinery/atmospherics/components/unary/tank/nitrogen
+	name = "pressure tank (N2)"
 	gas_type = GAS_N2
 	greyscale_colors = "#2d8f44"
 
-/obj/machinery/atmospherics/components/unary/tank/nitrogen/Initialize(mapload)
+/obj/machinery/atmospherics/components/unary/tank/nitrogen/New()
 	. = ..()
 	var/datum/gas_mixture/air_contents = airs[1]
 	air_contents.set_moles(GAS_N2, AIR_CONTENTS)

code/modules/atmospherics/machinery/components/unary_devices/unary_devices.dm

@@ -26,10 +26,11 @@
 	uid = num2text(gl_uid++)
 	return uid
 
-/obj/machinery/atmospherics/components/unary/proc/change_pipe_connection(disconnect)
+/obj/machinery/atmospherics/components/unary/proc/change_pipe_connection(disconnect, reconnect=FALSE)
 	if(disconnect)
 		disconnect_pipes()
-		return
+		if(!reconnect)
+			return
 	connect_pipes()
 
 /obj/machinery/atmospherics/components/unary/proc/connect_pipes()