Fix merge conflicts

code/modules/modular_computers/computers/item/computer.dm

@@ -126,7 +126,7 @@
 			portable_drive.verb_pickup()
 
 /obj/item/modular_computer/AltClick(mob/user)
-	..()
+	. = ..()
 	if(issilicon(user))
 		return
 
@@ -142,7 +142,7 @@
 				return
 			if(ai_slot)
 				ai_slot.try_eject(null, user)
-
+		return TRUE
 
 // Gets IDs/access levels from card slot. Would be useful when/if PDAs would become modular PCs.
 /obj/item/modular_computer/GetAccess()

code/modules/modular_computers/computers/item/laptop.dm

@@ -86,8 +86,8 @@
 /obj/item/modular_computer/laptop/AltClick(mob/user)
 	if(screen_on) // Close it.
 		try_toggle_open(user)
-	else
-		return ..()
+		return TRUE
+	return ..()
 
 /obj/item/modular_computer/laptop/proc/toggle_open(mob/living/user=null)
 	if(screen_on)

code/modules/modular_computers/computers/machinery/modular_computer.dm

@@ -92,8 +92,9 @@
 		cpu.eject_card()
 
 /obj/machinery/modular_computer/AltClick(mob/user)
+	. = ..()
 	if(cpu)
-		cpu.AltClick(user)
+		return cpu.AltClick(user)
 
 //ATTACK HAND IGNORING PARENT RETURN VALUE
 // On-click handling. Turns on the computer if it's off and opens the GUI.