Merge branch 'master' of https://github.com/Markolie/Paradise

Conflicts:
	maps/cyberiad.dmm

code/modules/computer3/component.dm

@@ -50,16 +50,6 @@
 	var/mob/living/silicon/ai/occupant	= null
 	var/busy = 0
 
-	// Ninja gloves check
-	attack_hand(mob/user as mob)
-		if(ishuman(user) && istype(user:gloves, /obj/item/clothing/gloves/space_ninja) && user:gloves:candrain && !user:gloves:draining)
-			if(user:wear_suit:s_control)
-				user:wear_suit.transfer_ai("AIFIXER","NINJASUIT",src,user)
-			else
-				user << "\red <b>ERROR</b>: \black Remote access channel disabled."
-			return
-		..()
-
 	attackby(obj/I as obj,mob/user as mob, params)
 		if(computer && !computer.stat)
 			if(istype(I, /obj/item/device/aicard))
@@ -91,7 +81,7 @@
 			computer.emagged = 1
 			return 1
 		else
-			usr << "You are unable to insert \the card, as the reader slot is occupied"	
+			usr << "You are unable to insert \the card, as the reader slot is occupied"
 			return 0
 
 	attackby(var/obj/item/I as obj, var/mob/user as mob, params)

code/modules/computer3/lapvend.dm

@@ -320,8 +320,8 @@
 		newlap.spawn_files += (/datum/file/camnet_key/anomalyisolation)
 		newlap.spawn_files += (/datum/file/camnet_key/toxins)
 		newlap.spawn_files += (/datum/file/camnet_key/telepad)
-	if(access_rd in C.access)
-		newlap.spawn_files += (/datum/file/program/borg_control)
+/*	if(access_rd in C.access)
+		newlap.spawn_files += (/datum/file/program/borg_control) */
 	if(access_cent_specops in C.access)
 		newlap.spawn_files += (/datum/file/camnet_key/ert)
 		newlap.spawn_files += (/datum/file/camnet_key/centcom)

code/modules/computer3/program.dm

@@ -361,12 +361,12 @@ Programs are a file that can be executed
 	drm = 1
 	active_state = "power"
 	volume = 5000
-
+/*
 /datum/file/program/borg_control
 	name = "Cyborg Maint"
 	image = 'icons/ntos/borgcontrol.png'
 	active_state = "robot"
-	volume = 9050
+	volume = 9050 */
 
 /datum/file/program/AIupload
 	name = "AI Upload"