mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-22 03:27:46 +01:00
Merge branch 'master' into upstream-merge-8298
This commit is contained in:
@@ -151,10 +151,11 @@ 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
|
||||
if(7) icon = 'icons/obj/pda_slider.dmi' //VOREStation edit
|
||||
else
|
||||
icon = 'icons/obj/pda_old.dmi'
|
||||
log_debug("Invalid switch for PDA, defaulting to old PDA icons. [pdachoice] chosen.")
|
||||
add_overlay("pda-pen")
|
||||
start_program(find_program(/datum/data/pda/app/main_menu))
|
||||
|
||||
/obj/item/device/pda/proc/can_use(mob/user)
|
||||
|
||||
@@ -24,3 +24,6 @@
|
||||
/obj/item/device/pda/sar
|
||||
default_cartridge = /obj/item/weapon/cartridge/sar
|
||||
icon_state = "pda-gene" //Gives FM's a distinct PDA of their own, rather than sharing with the bridge-secretary & CCO's.
|
||||
|
||||
/obj/item/device/pda/pilot
|
||||
icon_state = "pda-pilot" //New sprites, but still no ROM cartridge or anything
|
||||
|
||||
Reference in New Issue
Block a user