From 79390b6177c9852c4a49029156666413dde0ece1 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Sat, 4 Feb 2017 22:42:06 -0600 Subject: [PATCH] Adds rugged style PDAs --- 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 | 2 +- code/modules/mob/new_player/preferences_setup.dm | 2 +- icons/obj/pda_rugged.dmi | Bin 0 -> 3353 bytes 6 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 icons/obj/pda_rugged.dmi diff --git a/code/_helpers/global_lists.dm b/code/_helpers/global_lists.dm index 044b2264ce..fcc2d0c91b 100644 --- a/code/_helpers/global_lists.dm +++ b/code/_helpers/global_lists.dm @@ -56,7 +56,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") +var/global/list/pdachoicelist = list("Default", "Slim", "Old", "Rugged") 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 e72b4ba484..7bacc244bc 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -419,6 +419,7 @@ var/global/list/obj/item/device/pda/PDAs = list() if(1) icon = 'icons/obj/pda.dmi' if(2) icon = 'icons/obj/pda_slim.dmi' if(3) icon = 'icons/obj/pda_old.dmi' + if(4) icon = 'icons/obj/pda_rugged.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 79adec9afc..f8bd40f076 100644 --- a/code/modules/client/preference_setup/general/04_equipment.dm +++ b/code/modules/client/preference_setup/general/04_equipment.dm @@ -38,7 +38,7 @@ pref.backbag = 1 //Same as above character.backbag = pref.backbag - if(pref.pdachoice > 3 || pref.pdachoice < 1) + if(pref.pdachoice > 4 || 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 f265e3febb..0a1817e6b2 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -37,7 +37,7 @@ 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, or Old. + var/pdachoice = 1 //Which PDA type the player has chosen. Default, Slim, Old, or Rugged. // 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 92f0f512bd..4cf3499b8a 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,3) + pdachoice = rand(1,4) age = rand(current_species.min_age, current_species.max_age) b_type = RANDOM_BLOOD_TYPE if(H) diff --git a/icons/obj/pda_rugged.dmi b/icons/obj/pda_rugged.dmi new file mode 100644 index 0000000000000000000000000000000000000000..ab43c99ca10f36d5ff91ca230e0ffac27bb72696 GIT binary patch literal 3353 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 P+AGj6Xv^Ji<4*h^J@J}) literal 0 HcmV?d00001