From d06b6fd83e8a287791f69effc4614ac8a3d8892a Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Mon, 11 Nov 2019 21:34:47 +0100 Subject: [PATCH] Adding a new PDA reskin, sprites from CEV-Eris (plus bits from Beestation and Cit-RP) --- code/__DEFINES/misc.dm | 4 +++- code/game/objects/items/devices/PDA/PDA.dm | 2 +- icons/obj/pda_minimal.dmi | Bin 0 -> 8744 bytes 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 icons/obj/pda_minimal.dmi diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 4b76f41c61..2e29497a02 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -281,9 +281,11 @@ GLOBAL_LIST_INIT(pda_styles, list(MONO, VT, ORBITRON, SHARE)) #define PDA_SKIN_ALT "Holographic" #define PDA_SKIN_RUGGED "Rugged" #define PDA_SKIN_MODERN "Modern" +#define PDA_SKIN_MINIMAL "Minimal" GLOBAL_LIST_INIT(pda_reskins, list(PDA_SKIN_CLASSIC = 'icons/obj/pda.dmi', PDA_SKIN_ALT = 'icons/obj/pda_alt.dmi', - PDA_SKIN_RUGGED = 'icons/obj/pda_rugged.dmi', PDA_SKIN_MODERN = 'icons/obj/pda_modern.dmi')) + PDA_SKIN_RUGGED = 'icons/obj/pda_rugged.dmi', PDA_SKIN_MODERN = 'icons/obj/pda_modern.dmi', + PDA_SKIN_MINIMAL = 'icons/obj/pda_minimal.dmi')) ///////////////////////////////////// // atom.appearence_flags shortcuts // diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 92d936e0d4..fa1ae55282 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -140,7 +140,7 @@ GLOBAL_LIST_EMPTY(PDAs) var/choice = input(M, "Choose the a reskin for [src]","Reskin Object") as null|anything in GLOB.pda_reskins var/new_icon = GLOB.pda_reskins[choice] - if(QDELETED(src) || isnull(new_icon) || new_icon == icon || M.incapacitated() || !in_range(M,src)) + if(QDELETED(src) || isnull(new_icon) || new_icon == icon || !M.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) return icon = new_icon update_icon(FALSE, TRUE) diff --git a/icons/obj/pda_minimal.dmi b/icons/obj/pda_minimal.dmi new file mode 100644 index 0000000000000000000000000000000000000000..a62688cbaf3d7c7f4e8717fe548fa8e4dab60fb1 GIT binary patch literal 8744 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