diff --git a/code/_helpers/global_lists.dm b/code/_helpers/global_lists.dm
index 63c9c1a24eb..bf65deddedf 100644
--- a/code/_helpers/global_lists.dm
+++ b/code/_helpers/global_lists.dm
@@ -53,7 +53,7 @@ var/datum/category_collection/underwear/global_underwear = new()
//Backpacks
var/global/list/backbaglist = list("Nothing", "Backpack", "Satchel", "Satchel Alt", "Messenger Bag", "Sports Bag")
-var/global/list/pdachoicelist = list("Default", "Slim", "Old", "Rugged", "Holographic", "Wrist-Bound")
+var/global/list/pdachoicelist = list("Default", "Slim", "Old", "Rugged", "Holographic", "Wrist-Bound", "Slider")
var/global/list/exclude_jobs = list(/datum/job/ai,/datum/job/cyborg)
// Visual nets
diff --git a/code/modules/client/preference_setup/general/04_equipment.dm b/code/modules/client/preference_setup/general/04_equipment.dm
index 6c0aa767307..010e587fc82 100644
--- a/code/modules/client/preference_setup/general/04_equipment.dm
+++ b/code/modules/client/preference_setup/general/04_equipment.dm
@@ -40,7 +40,7 @@
pref.backbag = 2 //Same as above
character.backbag = pref.backbag
- if(pref.pdachoice > 6 || pref.pdachoice < 1)
+ if(pref.pdachoice > 7 || pref.pdachoice < 1)
pref.pdachoice = 1
character.pdachoice = pref.pdachoice
@@ -148,4 +148,4 @@
return TOPIC_REFRESH
- return ..()
\ No newline at end of file
+ return ..()
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index 651ed85b14d..66d712bc449 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -30,7 +30,7 @@
backbag = rand(1,6)
- pdachoice = rand(1,5)
+ pdachoice = rand(1,7)
age = rand(current_species.min_age, current_species.max_age)
b_type = RANDOM_BLOOD_TYPE
if(H)
diff --git a/code/modules/pda/pda.dm b/code/modules/pda/pda.dm
index 5fbc8aa271d..bda75db610b 100644
--- a/code/modules/pda/pda.dm
+++ b/code/modules/pda/pda.dm
@@ -6,7 +6,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
@@ -127,7 +127,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
new /obj/item/weapon/pen(src)
pdachoice = isnull(H) ? 1 : (ishuman(H) ? H.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'
@@ -146,6 +146,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.")
@@ -277,6 +278,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()
@@ -287,6 +289,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
if(M.get_active_hand() == null)
M.put_in_hands(O)
to_chat(usr, "You remove \the [O] from \the [src].")
+ cut_overlay("pda-pen")
return
O.loc = get_turf(src)
else
@@ -420,6 +423,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, "You put the ID into \the [src]'s slot.")
+ 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.
@@ -437,6 +441,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
user.drop_item()
C.loc = src
to_chat(user, "You slot \the [C] into \the [src].")
+ add_overlay("pda-pen")
return
/obj/item/device/pda/attack(mob/living/C as mob, mob/living/user as mob)
@@ -473,7 +478,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()
diff --git a/code/modules/pda/pda_vr.dm b/code/modules/pda/pda_vr.dm
index 32551625c96..0e4b53d6986 100644
--- a/code/modules/pda/pda_vr.dm
+++ b/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.
diff --git a/code/modules/pda/utilities.dm b/code/modules/pda/utilities.dm
index be8bb8f4445..36ef40a8006 100644
--- a/code/modules/pda/utilities.dm
+++ b/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"
diff --git a/icons/obj/pda_clam.dmi b/icons/obj/pda_clam.dmi
new file mode 100644
index 00000000000..e27eeff1413
Binary files /dev/null and b/icons/obj/pda_clam.dmi differ
diff --git a/icons/obj/pda_holo.dmi b/icons/obj/pda_holo.dmi
index 4e92a6d6d96..82c2e5f2191 100644
Binary files a/icons/obj/pda_holo.dmi and b/icons/obj/pda_holo.dmi differ
diff --git a/icons/obj/pda_old.dmi b/icons/obj/pda_old.dmi
index d3934be3411..954c15acba1 100644
Binary files a/icons/obj/pda_old.dmi and b/icons/obj/pda_old.dmi differ
diff --git a/icons/obj/pda_rugged.dmi b/icons/obj/pda_rugged.dmi
index b7002c90cdc..dedacce457c 100644
Binary files a/icons/obj/pda_rugged.dmi and b/icons/obj/pda_rugged.dmi differ
diff --git a/icons/obj/pda_slim.dmi b/icons/obj/pda_slim.dmi
index 0e5e8b7ee32..5ac097b348c 100644
Binary files a/icons/obj/pda_slim.dmi and b/icons/obj/pda_slim.dmi differ
diff --git a/icons/obj/pda_vr.dmi b/icons/obj/pda_vr.dmi
index 9a3f7829efe..1e088cc090c 100644
Binary files a/icons/obj/pda_vr.dmi and b/icons/obj/pda_vr.dmi differ
diff --git a/icons/obj/pda_wrist.dmi b/icons/obj/pda_wrist.dmi
index 1cc3dda1a67..931ef0b2fe4 100644
Binary files a/icons/obj/pda_wrist.dmi and b/icons/obj/pda_wrist.dmi differ