Merge branch 'master' into upstream-merge-8298

code/modules/pda/pda.dm

@@ -5,7 +5,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 /obj/item/device/pda
 	name = "\improper PDA"
 	desc = "A portable microcomputer by Thinktronic Systems, LTD. Functionality determined by a preprogrammed ROM cartridge."
-	icon = 'icons/obj/pda.dmi'
+	icon = 'icons/obj/pda_vr.dmi'			//VOREStation edit
 	icon_state = "pda"
 	item_state = "electronic"
 	w_class = ITEMSIZE_SMALL
@@ -33,7 +33,11 @@ var/global/list/obj/item/device/pda/PDAs = list()
 								"honk" = 'sound/items/bikehorn.ogg',
 								"SKREE" = 'sound/voice/shriek1.ogg',
 								// "holy" = 'sound/items/PDA/ambicha4-short.ogg',
-								"xeno" = 'sound/voice/hiss1.ogg')
+								"xeno" = 'sound/voice/hiss1.ogg',
+								"dust" = 'sound/effects/supermatter.ogg',
+								"spark" = 'sound/effects/sparks4.ogg',
+								"rad" = 'sound/items/geiger/high1.ogg',
+								"servo" = 'sound/machines/rig/rigservo.ogg')
 	var/hidden = 0 // Is the PDA hidden from the PDA list?
 	var/touch_silent = 0 //If 1, no beeps on interacting.
 
@@ -128,7 +132,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 		pdachoice = 1
 
 	switch(pdachoice)
-		if(1) icon = 'icons/obj/pda.dmi'
+		if(1) icon = 'icons/obj/pda_vr.dmi'			//VOREStation edit
 		if(2) icon = 'icons/obj/pda_slim.dmi'
 		if(3) icon = 'icons/obj/pda_old.dmi'
 		if(4) icon = 'icons/obj/pda_rugged.dmi'
@@ -147,6 +151,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 				SPECIES_TESHARI = 'icons/mob/species/teshari/pda_wrist.dmi',
 				SPECIES_VR_TESHARI = 'icons/mob/species/teshari/pda_wrist.dmi',
 			)
+		if(7) icon = 'icons/obj/pda_clam.dmi'			//VOREStation edit
 		else
 			icon = 'icons/obj/pda_old.dmi'
 			log_debug("Invalid switch for PDA, defaulting to old PDA icons. [pdachoice] chosen.")
@@ -278,6 +283,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 			playsound(src, 'sound/machines/id_swipe.ogg', 100, 1)
 		else
 			id.loc = get_turf(src)
+		cut_overlay("pda-id")
 		id = null
 
 /obj/item/device/pda/proc/remove_pen()
@@ -288,6 +294,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 			if(M.get_active_hand() == null)
 				M.put_in_hands(O)
 				to_chat(usr, "<span class='notice'>You remove \the [O] from \the [src].</span>")
+				cut_overlay("pda-pen")
 				return
 		O.loc = get_turf(src)
 	else
@@ -421,6 +428,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 			if(((src in user.contents) && (C in user.contents)) || (istype(loc, /turf) && in_range(src, user) && (C in user.contents)) )
 				if(id_check(user, 2))
 					to_chat(user, "<span class='notice'>You put the ID into \the [src]'s slot.</span>")
+					add_overlay("pda-id")
 					updateSelfDialog()//Update self dialog on success.
 			return	//Return in case of failed check or when successful.
 		updateSelfDialog()//For the non-input related code.
@@ -438,6 +446,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 			user.drop_item()
 			C.loc = src
 			to_chat(user, "<span class='notice'>You slot \the [C] into \the [src].</span>")
+			add_overlay("pda-pen")
 	return
 
 /obj/item/device/pda/attack(mob/living/C as mob, mob/living/user as mob)
@@ -474,7 +483,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 /obj/item/weapon/storage/box/PDAs
 	name = "box of spare PDAs"
 	desc = "A box of spare PDA microcomputers."
-	icon = 'icons/obj/pda.dmi'
+	icon = 'icons/obj/pda_vr.dmi'			//VOREStation edit
 	icon_state = "pdabox"
 
 /obj/item/weapon/storage/box/PDAs/New()

code/modules/pda/pda_vr.dm

@@ -15,12 +15,12 @@
 
 /obj/item/device/pda/pathfinder
 	default_cartridge = /obj/item/weapon/cartridge/explorer
-	icon_state = "pda-lawyer-old"
+	icon_state = "pda-transp"			//Might as well let this sprite actually get seen, otherwise it's going to be hidden forever.
 
 /obj/item/device/pda/explorer
 	default_cartridge = /obj/item/weapon/cartridge/explorer
-	icon_state = "pda-det"
+	icon_state = "pda-lawyer-old"			//Explorer's can get the PF's old style instead, rather than re-using the detective PDA
 
 /obj/item/device/pda/sar
 	default_cartridge = /obj/item/weapon/cartridge/sar
-	icon_state = "pda-h"
+	icon_state = "pda-gene"			//Gives FM's a distinct PDA of their own, rather than sharing with the bridge-secretary & CCO's.

code/modules/pda/utilities.dm

@@ -10,6 +10,10 @@
 	name = fon ? "Disable Flashlight" : "Enable Flashlight"
 	pda.update_shortcuts()
 	pda.set_light(fon ? f_lum : 0)
+	if(fon)
+		pda.add_overlay("light-o")
+	else
+		pda.cut_overlay("light-o")
 
 /datum/data/pda/utility/honk
 	name = "Honk Synthesizer"