diff --git a/code/_helpers/global_lists.dm b/code/_helpers/global_lists.dm index 9cf186592e..0f9563bfcb 100644 --- a/code/_helpers/global_lists.dm +++ b/code/_helpers/global_lists.dm @@ -48,7 +48,7 @@ var/datum/category_collection/underwear/global_underwear = new() //Backpacks var/global/list/backbaglist = list("Nothing", "Backpack", "Satchel", "Satchel Alt", "Messenger Bag") -var/global/list/pdachoicelist = list("Default", "Slim", "Old", "Rugged") +var/global/list/pdachoicelist = list("Default", "Slim", "Old", "Rugged", "Holographic") var/global/list/exclude_jobs = list(/datum/job/ai,/datum/job/cyborg) // Visual nets diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 8fc77ffb65..66e7e46008 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -439,6 +439,7 @@ var/global/list/obj/item/device/pda/PDAs = list() if(2) icon = 'icons/obj/pda_slim.dmi' if(3) icon = 'icons/obj/pda_old.dmi' if(4) icon = 'icons/obj/pda_rugged.dmi' + if(5) icon = 'icons/obj/pda_holo.dmi' else icon = 'icons/obj/pda_old.dmi' log_debug("Invalid switch for PDA, defaulting to old PDA icons. [pdachoice] chosen.") diff --git a/code/modules/client/preference_setup/general/04_equipment.dm b/code/modules/client/preference_setup/general/04_equipment.dm index 7197635e5b..0f633ae7a6 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 = 1 //Same as above character.backbag = pref.backbag - if(pref.pdachoice > 4 || pref.pdachoice < 1) + if(pref.pdachoice > 5 || pref.pdachoice < 1) pref.pdachoice = 1 character.pdachoice = pref.pdachoice diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index 5df33d70e2..18e0babf42 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -45,8 +45,8 @@ var/list/all_underwear = list() var/list/all_underwear_metadata = list() var/list/hide_underwear = list() - var/backbag = 2 //Which backpack type the player has chosen. Nothing, Satchel or Backpack. - var/pdachoice = 1 //Which PDA type the player has chosen. Default, Slim, Old, or Rugged. + var/backbag = 2 //Which backpack type the player has chosen. + var/pdachoice = 1 //Which PDA type the player has chosen. // General information var/home_system = "" diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm index d8ad2a1297..65d3156d53 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,5) - pdachoice = rand(1,4) + pdachoice = rand(1,5) age = rand(current_species.min_age, current_species.max_age) b_type = RANDOM_BLOOD_TYPE if(H) diff --git a/html/changelogs/lorilili - Holographic-PDA.yml b/html/changelogs/lorilili - Holographic-PDA.yml new file mode 100644 index 0000000000..74a947abfe --- /dev/null +++ b/html/changelogs/lorilili - Holographic-PDA.yml @@ -0,0 +1,4 @@ +author: lorilili +delete-after: True +changes: + - imageadd: "Added Holographic PDA type." diff --git a/icons/obj/pda_holo.dmi b/icons/obj/pda_holo.dmi new file mode 100644 index 0000000000..add15b941f Binary files /dev/null and b/icons/obj/pda_holo.dmi differ