Merge pull request #6131 from Crazylemon64/robot_module_actions

Robot module actions

code/game/objects/items/robot/robot_items.dm

@@ -34,51 +34,3 @@
 	name = "Overdrive"
 	icon = 'icons/obj/decals.dmi'
 	icon_state = "shock"
-
-/**********************************************************************
-						HUD/SIGHT things
-***********************************************************************/
-/obj/item/borg/sight
-	icon = 'icons/obj/decals.dmi'
-	icon_state = "securearea"
-	var/sight_mode = null
-
-/obj/item/borg/sight/xray
-	name = "X-ray Vision"
-	sight_mode = BORGXRAY
-
-/obj/item/borg/sight/thermal
-	name = "Thermal Vision"
-	sight_mode = BORGTHERM
-	icon_state = "thermal"
-	icon = 'icons/obj/clothing/glasses.dmi'
-
-/obj/item/borg/sight/meson
-	name = "Meson Vision"
-	sight_mode = BORGMESON
-	icon_state = "meson"
-	icon = 'icons/obj/clothing/glasses.dmi'
-
-/obj/item/borg/sight/hud
-	name = "Hud"
-	var/obj/item/clothing/glasses/hud/hud = null
-
-/obj/item/borg/sight/hud/med
-	name = "medical hud"
-	icon_state = "healthhud"
-	icon = 'icons/obj/clothing/glasses.dmi'
-
-/obj/item/borg/sight/hud/med/New()
-	..()
-	hud = new /obj/item/clothing/glasses/hud/health(src)
-	return
-
-/obj/item/borg/sight/hud/sec
-	name = "security hud"
-	icon_state = "securityhud"
-	icon = 'icons/obj/clothing/glasses.dmi'
-
-/obj/item/borg/sight/hud/sec/New()
-	..()
-	hud = new /obj/item/clothing/glasses/hud/security(src)
-	return

code/game/objects/items/robot/robot_upgrades.dm

@@ -35,6 +35,7 @@
 	R.uneq_all()
 	R.hands.icon_state = "nomod"
 	R.icon_state = "robot"
+	R.module.remove_subsystems_and_actions(R)
 	qdel(R.module)
 	R.module = null
 
@@ -328,4 +329,4 @@
 			to_chat(cyborg, "<span class='notice'>Self-repair is active in <span class='boldnotice'>[msgmode]</span> mode.</span>")
 			msg_cooldown = world.time
 	else
-		deactivate()
+		deactivate()

code/game/objects/items/weapons/alien_specific.dm

@@ -64,10 +64,3 @@
 	desc = "Useful for taking pictures, making friends and flash-frying chips."
 	icon = 'icons/mob/alien.dmi'
 	icon_state = "borg-flash"
-
-//heat vision
-
-/obj/item/borg/sight/thermal/alien
-	name = "thermal module"
-	icon = 'icons/mob/alien.dmi'
-	icon_state = "borg-extra-vision"