From ba2a49999a29123392a2adbdee47f3610542bf0e Mon Sep 17 00:00:00 2001 From: Greenjoe12345 Date: Wed, 17 Jun 2020 00:24:54 +0100 Subject: [PATCH] adds wrist PDAs --- code/_helpers/global_lists.dm | 2 +- code/game/objects/items.dm | 4 ++-- code/game/objects/items/devices/PDA/PDA.dm | 14 ++++++++++++++ .../preference_setup/general/04_equipment.dm | 2 +- icons/mob/pda_wrist.dmi | Bin 0 -> 1303 bytes icons/mob/species/seromi/pda_wrist.dmi | Bin 0 -> 1301 bytes icons/obj/pda_wrist.dmi | Bin 0 -> 2506 bytes polaris.dme | 4 ++-- 8 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 icons/mob/pda_wrist.dmi create mode 100644 icons/mob/species/seromi/pda_wrist.dmi create mode 100644 icons/obj/pda_wrist.dmi diff --git a/code/_helpers/global_lists.dm b/code/_helpers/global_lists.dm index 58b1707a8c..76049d9c05 100644 --- a/code/_helpers/global_lists.dm +++ b/code/_helpers/global_lists.dm @@ -43,7 +43,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", "Holographic") +var/global/list/pdachoicelist = list("Default", "Slim", "Old", "Rugged", "Holographic", "Wrist-Bound") var/global/list/exclude_jobs = list(/datum/job/ai,/datum/job/cyborg) // Visual nets diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index dc3a151686..3651690dd6 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -609,7 +609,7 @@ GLOBAL_LIST_EMPTY(blood_overlays_by_type) // Already got one if(blood_overlay) return - + // Already cached if(GLOB.blood_overlays_by_type[type]) blood_overlay = GLOB.blood_overlays_by_type[type] @@ -619,7 +619,7 @@ GLOBAL_LIST_EMPTY(blood_overlays_by_type) var/image/blood = image(icon = 'icons/effects/blood.dmi', icon_state = "itemblood") // Needs to be a new one each time since we're slicing it up with filters. blood.filters += filter(type = "alpha", icon = icon(icon, icon_state)) // Same, this filter is unique for each blood overlay per type GLOB.blood_overlays_by_type[type] = blood - + // And finally blood_overlay = blood diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index cf32e30c90..6c9700e319 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -452,6 +452,20 @@ var/global/list/obj/item/device/pda/PDAs = list() if(3) icon = 'icons/obj/pda_old.dmi' if(4) icon = 'icons/obj/pda_rugged.dmi' if(5) icon = 'icons/obj/pda_holo.dmi' + if(6) + icon = 'icons/obj/pda_wrist.dmi' + item_state = icon_state + item_icons = list( + slot_belt_str = 'icons/mob/pda_wrist.dmi', + slot_wear_id_str = 'icons/mob/pda_wrist.dmi', + slot_gloves_str = 'icons/mob/pda_wrist.dmi' + ) + desc = "A portable microcomputer by Thinktronic Systems, LTD. This model is a wrist-bound version." + slot_flags = SLOT_ID | SLOT_BELT | SLOT_GLOVES + sprite_sheets = list( + SPECIES_TESHARI = 'icons/mob/species/seromi/pda_wrist.dmi', + SPECIES_VR_TESHARI = 'icons/mob/species/seromi/pda_wrist.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 0f633ae7a6..c5a940e868 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 > 5 || pref.pdachoice < 1) + if(pref.pdachoice > 6 || pref.pdachoice < 1) pref.pdachoice = 1 character.pdachoice = pref.pdachoice diff --git a/icons/mob/pda_wrist.dmi b/icons/mob/pda_wrist.dmi new file mode 100644 index 0000000000000000000000000000000000000000..fda5d9ad1972d0ca064fd2839972da810b4ab6c8 GIT binary patch literal 1303 zcmZvadrVVz6vux}p(66w5C}sQqarht$0i`4_EH6V%Gv1Nl35-sjO>hsStcb zumqS$tX$+ZCj;grFv;jGf+Gr8EOu29D%MagQ!7HHPrBQ>bpM!}-~HX+FZX=T_k7Q} zcqrw7yQ{w|0KlD`7=IW5oDf@CE_m#woX+sXw&X(x(-NdoY1D2AO3$t#gMw%fpG=_~ zp;1}<=W0#oz{AlT0IUGyU=OGRU+=zW&gb zk704_!zrmCZuTh_15j?-QFi>v!V{-+^Vzv9CIB39W$hl1d*N>7nptn^t};C>;|rhp zIBiuFbM2EYK^OhGykl4Ws-|<2;Zx7F51f(O-dnRu-u+n=3Dz2%CM-rFbOxI77UOQ2%Hw^{N z1ZBAJvo5)XW?L$vu5Nf(x$*oqb0nXZIZVtgaADmqiXQ}l~n{qwo#t(t?8nzlyV3HF)l zdNrK<2d*w3A38(Wy_^6y4!h5->5EoeH&#=|(E_}&G&ChrBaz@vWscv!s~+4OvWB?f z2!f+b**@R(F?E4wb7t-^yk128qq2*!zl0(5E~W8lX+R-r5iSXa-s;lFh2QqYK6o-| zGSSZDQ>%XwA%U>UV4z*nPd1jh5E|fH0 zO8q2;!|@cc2k!L>{62@3FD{@a(}ZqfaUo$RVwLI^P~(C@zhtrezZ?ELJJbMLl5AMp zFW?ea)Y@T9Zy7W^H@^jG7Zei(TAg}vf!77YA{CGCh!BRfYShaNXip%rY~%MUMRtO~ z7Jzg7)>GRcLR4B?a|JZZQnC4cq<4VSkAD624+<>6Gt*Y3Ex};F>LoCirkd%xMeH)C>0Z5gkD370j;lgExph8;8F)8ZggTS}jX4kU(ye%K~AM zmJ#aAlA^6V@$2r7K8a9CF;TKh7X&v>s0mBXba4_?A|Oh5oR*UVbY;iN<|=`}!L~az zp}W>&DaxCSN`{WoF|*)KmH1jIq2jTEoMY>ham?Vwls>|eKH~H7&#@*Kq6R(N^4Xbe z)oLk9$~S!m%c@QhMJY;Fso>7QItc>Np)h_)$*021-6chei1IhMcCAedIUyy!b8lAZ EzuZW9uK)l5 literal 0 HcmV?d00001 diff --git a/icons/mob/species/seromi/pda_wrist.dmi b/icons/mob/species/seromi/pda_wrist.dmi new file mode 100644 index 0000000000000000000000000000000000000000..e064cf3be8e5039a71c2cd8d5907046dd887c54d GIT binary patch literal 1301 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