Merge pull request #957 from Krausus/CyborgHotkeys

Cyborg Pointing and Deselect/Unequip Module Hotkeys

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

@@ -37,6 +37,8 @@
 	else if(module_state_3 == O)
 		module_state_3 = null
 		inv3.icon_state = "inv3"
+	if(hud_used)
+		hud_used.update_robot_modules_display()
 	return 1
 
 /mob/living/silicon/robot/proc/activate_module(var/obj/item/O)
@@ -77,6 +79,17 @@
 	uneq_module(module_state_2)
 	uneq_module(module_state_3)
 
+/mob/living/silicon/robot/proc/uneq_numbered(var/module)
+	if(module < 1 || module > 3) return
+
+	switch(module)
+		if(1)
+			uneq_module(module_state_1)
+		if(2)
+			uneq_module(module_state_2)
+		if(3)
+			uneq_module(module_state_3)
+
 /mob/living/silicon/robot/proc/activated(obj/item/O)
 	if(module_state_1 == O)
 		return 1

code/modules/mob/mob_movement.dm

@@ -43,6 +43,14 @@
 	if(iscarbon(usr))
 		var/mob/living/carbon/C = usr
 		C.toggle_throw_mode()
+	else if(isrobot(usr))
+		var/mob/living/silicon/robot/R = usr
+		var/module = R.get_selected_module()
+		if(!module)
+			usr << "\red You have no module selected."
+			return
+		R.cycle_modules()
+		R.uneq_numbered(module)
 	else
 		usr << "\red This mob type cannot throw items."
 	return
@@ -55,6 +63,12 @@
 			usr << "\red You have nothing to drop in your hand."
 			return
 		drop_item()
+	else if(isrobot(usr))
+		var/mob/living/silicon/robot/R = usr
+		if(!R.get_selected_module())
+			usr << "\red You have no module selected."
+			return
+		R.deselect_module(R.get_selected_module())
 	else
 		usr << "\red This mob type cannot drop items."
 	return