Merge pull request #12780 from BlackMajor/borgo

Even more engiborg power creep

code/modules/mob/living/silicon/robot/inventory.dm

@@ -2,7 +2,18 @@
 //as they handle all relevant stuff like adding it to the player's screen and such
 
 //Returns the thing in our active hand (whatever is in our active module-slot, in this case)
+//This proc has been butchered into a proc that overrides borg item holding for the sake of making grippers work.
+//I'd be immensely thankful if anyone can figure out a less obtuse way of making grippers work without breaking functionality.
 /mob/living/silicon/robot/get_active_held_item()
+	var/item = module_active
+	if(istype(item, /obj/item/weapon/gripper))
+		var/obj/item/weapon/gripper/G = item
+		if(G.wrapped)
+			if(G.wrapped.loc != G)
+				G.wrapped = null
+				return module_active
+			item = G.wrapped
+			return item
 	return module_active
 
 

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,

code/modules/tgui/states/hands.dm

@@ -19,7 +19,7 @@ GLOBAL_DATUM_INIT(hands_state, /datum/ui_state/hands_state, new)
 		return UI_INTERACTIVE
 	return UI_CLOSE
 
-/mob/living/silicon/robot/hands_can_use_topic(src_object)
-	if(activated(src_object))
+/mob/living/silicon/robot/hands_can_use_topic(obj/src_object)
+	if(activated(src_object) || istype(src_object.loc, /obj/item/weapon/gripper))
 		return UI_INTERACTIVE
 	return UI_CLOSE