From 1c7dd9631cf5dc88bdc47042dbf2c9932c19a842 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Wed, 26 Feb 2020 18:03:51 -0800 Subject: [PATCH] Merge pull request #6744 from listerla/pda-holo Adds holoPDA from Aurora --- code/_helpers/global_lists.dm | 2 +- code/game/objects/items/devices/PDA/PDA.dm | 1 + .../preference_setup/general/04_equipment.dm | 2 +- .../mob/living/carbon/human/human_defines.dm | 4 ++-- code/modules/mob/new_player/preferences_setup.dm | 2 +- html/changelogs/lorilili - Holographic-PDA.yml | 4 ++++ icons/obj/pda_holo.dmi | Bin 0 -> 6918 bytes 7 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 html/changelogs/lorilili - Holographic-PDA.yml create mode 100644 icons/obj/pda_holo.dmi 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 0000000000000000000000000000000000000000..add15b941fb8f8f727c8a984a75fed863a47c3aa GIT binary patch literal 6918 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 literal 0 HcmV?d00001