Merge pull request #1468 from SamCroswell/computerupdate

Computer Lighting Update

code/modules/atmos_automation/console.dm

@@ -1,6 +1,7 @@
 /obj/machinery/computer/general_air_control/atmos_automation
 	icon = 'icons/obj/computer.dmi'
-	icon_state = "aac"
+	icon_screen = "area_atmos"
+	icon_keyboard = "atmos_key"
 	circuit = "/obj/item/weapon/circuitboard/atmos_automation"
 	req_one_access_txt = "24;10"
 	Mtoollink = 1

code/modules/mob/living/simple_animal/parrot.dm

@@ -74,11 +74,10 @@
 	var/obj/parrot_perch = null
 	var/obj/desired_perches = list(/obj/structure/computerframe, 		/obj/structure/displaycase, \
 									/obj/structure/filingcabinet,		/obj/machinery/teleport, \
-									/obj/machinery/computer,			/obj/machinery/clonepod, \
+									/obj/machinery/suit_storage_unit,			/obj/machinery/clonepod, \
 									/obj/machinery/dna_scannernew,		/obj/machinery/telecomms, \
 									/obj/machinery/nuclearbomb,			/obj/machinery/particle_accelerator, \
-									/obj/machinery/recharge_station,	/obj/machinery/smartfridge, \
-									/obj/machinery/suit_storage_unit)
+									/obj/machinery/recharge_station,	/obj/machinery/smartfridge)
 
 	//Parrots are kleptomaniacs. This variable ... stores the item a parrot is holding.
 	var/obj/item/held_item = null

code/modules/research/rdconsole.dm

@@ -33,7 +33,8 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 
 /obj/machinery/computer/rdconsole
 	name = "R&D Console"
-	icon_state = "rdcomp"
+	icon_screen = "rdcomp"
+	icon_keyboard = "rd_key"
 	light_color = LIGHT_COLOR_FADEDPURPLE
 	circuit = /obj/item/weapon/circuitboard/rdconsole
 	var/datum/research/files							//Stores all the collected research data.

code/modules/research/server.dm

@@ -175,7 +175,8 @@
 
 /obj/machinery/computer/rdservercontrol
 	name = "R&D Server Controller"
-	icon_state = "rdcomp"
+	icon_screen = "rdcomp"
+	icon_keyboard = "rd_key"
 	light_color = LIGHT_COLOR_FADEDPURPLE
 	circuit = /obj/item/weapon/circuitboard/rdservercontrol
 	var/screen = 0

code/modules/research/xenoarchaeology/genetics/reconstitutor.dm

@@ -13,7 +13,8 @@ datum/genesequence
 /obj/machinery/computer/reconstitutor
 	name = "Flora reconstitution console"
 	icon = 'icons/obj/computer.dmi'
-	icon_state = "dna"
+	icon_keyboard = "med_key"
+	icon_screen = "dna"
 	circuit = "/obj/item/weapon/circuitboard/reconstitutor"
 	req_access = list(access_heads) //Only used for record deletion right now.
 	var/obj/machinery/clonepod/pod1 = 1 //Linked cloning pod.

code/modules/shuttles/antagonist.dm

@@ -2,16 +2,20 @@
 	name = "skipjack control console"
 	req_access = list(access_vox)
 	shuttle_tag = "Vox Skipjack"
-	
+	icon_screen = "syndishuttle"
+	icon_keyboard = "syndie_key"
+
 /obj/machinery/computer/shuttle_control/multi/vox/attack_ai(user as mob)
 	user << "\red Access Denied."
-	return 1	
+	return 1
 
 /obj/machinery/computer/shuttle_control/multi/syndicate
 	name = "Syndicate control console"
 	req_access = list(access_syndicate)
 	shuttle_tag = "Syndicate"
-	
+	icon_screen = "syndishuttle"
+	icon_keyboard = "syndie_key"
+
 /obj/machinery/computer/shuttle_control/multi/syndicate/attack_ai(user as mob)
 	user << "\red Access Denied."
-	return 1	
+	return 1

code/modules/shuttles/shuttle_console.dm

@@ -1,7 +1,8 @@
 /obj/machinery/computer/shuttle_control
 	name = "shuttle control console"
 	icon = 'icons/obj/computer.dmi'
-	icon_state = "shuttle"
+	icon_screen = "shuttle"
+	icon_keyboard = "med_key"
 	circuit = null
 
 	var/shuttle_tag  // Used to coordinate data in shuttle controller.
@@ -15,7 +16,7 @@
 	if(!allowed(user))
 		user << "\red Access Denied."
 		return 1
-	
+
 	ui_interact(user)
 
 /obj/machinery/computer/shuttle_control/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
@@ -84,7 +85,7 @@
 	if (!istype(shuttle))
 		return
 	shuttle.launch(user)
-	
+
 /obj/machinery/computer/shuttle_control/proc/force_launch(var/mob/user)
 	var/datum/shuttle/ferry/shuttle = shuttle_controller.shuttles[shuttle_tag]
 	if (!istype(shuttle))

code/modules/shuttles/shuttle_specops.dm

@@ -1,6 +1,8 @@
 /obj/machinery/computer/shuttle_control/specops
 	name = "special operations shuttle console"
 	shuttle_tag = "Special Operations"
+	icon_screen = "syndishuttle"
+	icon_keyboard = "syndie_key"
 	req_access = list(access_cent_specops)
 
 /obj/machinery/computer/shuttle_control/specops/attack_ai(user as mob)

code/modules/shuttles/shuttles_multi.dm

@@ -43,7 +43,8 @@
 	command_announcement.Announce(arrival_message,(announcer ? announcer : "Central Command"))
 
 /obj/machinery/computer/shuttle_control/multi
-	icon_state = "syndishuttle"
+	icon_screen = "syndishuttle"
+	icon_keyboard = "syndie_key"
 
 /obj/machinery/computer/shuttle_control/multi/attack_hand(user as mob)
 
@@ -84,7 +85,7 @@
 
 	var/datum/shuttle/multi_shuttle/MS = shuttle_controller.shuttles[shuttle_tag]
 	if(!istype(MS)) return
-	
+
 	//world << "multi_shuttle: last_departed=[MS.last_departed], origin=[MS.origin], interim=[MS.interim], travel_time=[MS.move_time]"
 
 	if (MS.moving_status != SHUTTLE_IDLE)
@@ -102,7 +103,7 @@
 			//TODO: Actually end the mission.
 			MS.return_warning = 1
 			return
-		
+
 		MS.long_jump(MS.last_departed,MS.origin,MS.interim,MS.move_time)
 		MS.last_departed = MS.origin
 		MS.at_origin = 1
@@ -127,7 +128,7 @@
 			MS.last_departed = MS.origin
 			MS.at_origin = 0
 
-			
+
 			MS.long_jump(MS.last_departed, MS.destinations[choice], MS.interim, MS.move_time)
 			MS.last_departed = MS.destinations[choice]
 			return

code/modules/telesci/telesci_computer.dm

@@ -1,7 +1,8 @@
 /obj/machinery/computer/telescience
 	name = "\improper Telepad Control Console"
 	desc = "Used to teleport objects to and from the telescience telepad."
-	icon_state = "teleport"
+	icon_keyboard = "telesci_key"
+	icon_screen = "telesci"
 	circuit = /obj/item/weapon/circuitboard/telesci_console
 	req_access = list(access_research)
 	var/sending = 1
@@ -318,8 +319,10 @@
 	return
 
 /obj/machinery/computer/telescience/proc/eject()
+
 	for(var/obj/item/I in crystals)
-		I.loc = src.loc
+		I.loc = loc
+		I.pixel_y = -9
 		crystals -= I
 	power = 0
 
@@ -360,7 +363,7 @@
 
 	if(href_list["ejectGPS"])
 		if(inserted_gps)
-			inserted_gps.loc = loc
+			usr.put_in_hands(inserted_gps)
 			inserted_gps = null
 
 	if(href_list["setMemory"])

code/modules/virus2/diseasesplicer.dm

@@ -1,7 +1,8 @@
 /obj/machinery/computer/diseasesplicer
 	name = "Disease Splicer"
 	icon = 'icons/obj/computer.dmi'
-	icon_state = "crew"
+	icon_screen = "crew"
+	icon_keyboard = "med_key"
 
 	var/datum/disease2/effectholder/memorybank = null
 	var/list/species_buffer = null