Merge pull request #11268 from PsiOmegaDelta/151010-LessHolographicHoloComputer

Fixes #11263.

code/game/machinery/computer/computer.dm

@@ -12,6 +12,11 @@
 	var/light_range_on = 3
 	var/light_power_on = 1
 
+/obj/machinery/computer/Destroy()
+	qdel(circuit)
+	circuit = null
+	return ..()
+
 /obj/machinery/computer/initialize()
 	power_change()
 
@@ -70,7 +75,6 @@
 		for(var/x in verbs)
 			verbs -= x
 		set_broken()
-		density = 0
 
 /obj/machinery/computer/update_icon()
 	..()
@@ -124,22 +128,15 @@
 			for (var/obj/C in src)
 				C.loc = src.loc
 			if (src.stat & BROKEN)
-				user << "\blue The broken glass falls out."
+				user << "<span class='notice'>The broken glass falls out.</span>"
 				new /obj/item/weapon/material/shard( src.loc )
 				A.state = 3
 				A.icon_state = "3"
 			else
-				user << "\blue You disconnect the monitor."
+				user << "<span class='notice'>You disconnect the monitor.</span>"
 				A.state = 4
 				A.icon_state = "4"
 			M.deconstruct(src)
 			qdel(src)
 	else
-		src.attack_hand(user)
-	return
-
-
-
-
-
-
+		..()

code/game/objects/items/weapons/circuitboards/computer/holodeckcontrol.dm

@@ -0,0 +1,31 @@
+#ifndef T_BOARD
+#error T_BOARD macro is not defined but we need it!
+#endif
+
+/obj/item/weapon/circuitboard/holodeckcontrol
+	name = T_BOARD("holodeck control console")
+	build_path = /obj/machinery/computer/HolodeckControl
+	origin_tech = "programming=2;bluespace=2"
+	var/last_to_emag
+	var/linkedholodeck_area
+	var/list/supported_programs
+	var/list/restricted_programs
+
+/obj/item/weapon/circuitboard/holodeckcontrol/construct(var/obj/machinery/computer/HolodeckControl/HC)
+	if (..(HC))
+		HC.supported_programs	= supported_programs.Copy()
+		HC.restricted_programs	= restricted_programs.Copy()
+		if(linkedholodeck_area)
+			HC.linkedholodeck	= locate(linkedholodeck_area)
+		if(last_to_emag)
+			HC.last_to_emag		= last_to_emag
+			HC.emagged 			= 1
+			HC.safety_disabled	= 1
+
+/obj/item/weapon/circuitboard/holodeckcontrol/deconstruct(var/obj/machinery/computer/HolodeckControl/HC)
+	if (..(HC))
+		linkedholodeck_area		= HC.linkedholodeck_area
+		supported_programs		= HC.supported_programs.Copy()
+		restricted_programs 	= HC.restricted_programs.Copy()
+		last_to_emag			= HC.last_to_emag
+		HC.emergencyShutdown()