diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm
index 1f69cdae2e..a440b95562 100644
--- a/code/game/objects/items/robot/robot_items.dm
+++ b/code/game/objects/items/robot/robot_items.dm
@@ -746,8 +746,8 @@
 ***********************************************************************/
 
 /obj/item/weapon/gripper
-	name = "circuit gripper"
-	desc = "A simple grasping tool for inserting circuitboards into machinary."
+	name = "engineering gripper"
+	desc = "A simple grasping tool for interacting with various engineering related items, such as circuits, gas tanks and conveyer belts. Alt Click to open held item UI"
 	icon = 'icons/obj/device.dmi'
 	icon_state = "gripper"
 
@@ -755,17 +755,33 @@
 
 	//Has a list of items that it can hold.
 	var/list/can_hold = list(
-		/obj/item/circuitboard
+		/obj/item/circuitboard,
+		/obj/item/light,
+		/obj/item/electronics,
+		/obj/item/tank/internals,
+		/obj/item/conveyor_switch_construct,
+		/obj/item/stack/conveyor,
+		/obj/item/wallframe,
+		/obj/item/vending_refill
 		)
 
 	var/obj/item/wrapped = null // Item currently being held.
 
-/obj/item/weapon/gripper/attack_self()
+/obj/item/weapon/gripper/attack_self(mob/user)
 	if(wrapped)
 		wrapped.forceMove(get_turf(wrapped))
+		to_chat(user, "<span class='notice'>You drop the [wrapped].</span>")
 		wrapped = null
 	return ..()
 
+//Used to interact with UI's of held items, such as gas tanks and airlock electronics.
+/obj/item/weapon/gripper/AltClick(mob/user)
+	if(wrapped)
+		wrapped.loc = user
+		wrapped.ui_interact(user, "main", null, TRUE, null, GLOB.deep_inventory_state)
+		wrapped.loc = src
+	return ..()
+
 /obj/item/weapon/gripper/afterattack(var/atom/target, var/mob/living/user, proximity, params)
 
 	if(!proximity)
@@ -803,7 +819,7 @@
 
 		//We can grab the item, finally.
 		if(grab)
-			to_chat(user, "You collect \the [I].")
+			to_chat(user, "<span class='notice'>You collect \the [I].</span>")
 			I.loc = src
 			wrapped = I
 			return
diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm
index 6a8175b921..49540918fa 100644
--- a/code/game/objects/structures/tank_dispenser.dm
+++ b/code/game/objects/structures/tank_dispenser.dm
@@ -74,6 +74,9 @@
 		ui = new(user, src, ui_key, "tank_dispenser", name, 275, 103, master_ui, state)
 		ui.open()
 
+/obj/structure/tank_dispenser/attack_robot(mob/user)
+	ui_interact(user)
+
 /obj/structure/tank_dispenser/ui_data(mob/user)
 	var/list/data = list()
 	data["oxygen"] = oxygentanks
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 8f103c496e..ccf38a547b 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -444,7 +444,7 @@
 		/obj/item/t_scanner,
 		/obj/item/analyzer,
 		/obj/item/storage/part_replacer/cyborg,
-		/obj/item/holosign_creator/atmos,
+		/obj/item/holosign_creator/combifan,
 		/obj/item/weapon/gripper,
 		/obj/item/lightreplacer/cyborg,
 		/obj/item/geiger_counter/cyborg,