From 63063ecd9bbdbac0a9db7d178280164a32345b0e Mon Sep 17 00:00:00 2001 From: Chloe Carver-Brown Date: Sat, 20 Feb 2021 14:48:12 +0000 Subject: [PATCH] It liiiiiives --- code/__DEFINES/misc.dm | 10 ++++++++++ code/game/objects/items/cigs_lighters.dm | 19 +++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 5bd83c7d..ae224dad 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -260,6 +260,16 @@ GLOBAL_LIST_INIT(pda_styles, list(MONO, VT, ORBITRON, SHARE)) 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')) +//zippo icon reskins +#define ZIPPO_SKIN_PLAIN "Plain" +#define ZIPPO_SKIN_DAME "Dame" +#define ZIPPO_SKIN_THIRTEEN "Thirteen" +#define ZIPPO_SKIN_SNAKE "Snake" + +GLOBAL_LIST_INIT(lighter_reskins, list(ZIPPO_SKIN_PLAIN = "plain", ZIPPO_SKIN_DAME = "dame", + ZIPPO_SKIN_THIRTEEN = "thirteen", ZIPPO_SKIN_SNAKE = "snake")) + + ///////////////////////////////////// // atom.appearence_flags shortcuts // ///////////////////////////////////// diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index e8b30655..bb53f686 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -522,6 +522,25 @@ CIGARETTE PACKETS ARE IN FANCY.DM overlay_state = pick(overlay_list) update_icon() +/obj/item/lighter/AltClick(mob/living/user) + . = ..() + if(GLOB.lighter_reskins && user.canUseTopic(src, BE_CLOSE, NO_DEXTERY)) + reskin_obj(user) + +/obj/item/lighter/reskin_obj(mob/M) + if(lit) + return to_chat(M, "You need to close the lighter before changing the engraving!") + if(!LAZYLEN(GLOB.lighter_reskins)) + return + + var/choice = input(M, "Choose the a reskin for [src]","Reskin Object") as null|anything in GLOB.lighter_reskins + var/new_icon = GLOB.lighter_reskins[choice] + if(QDELETED(src) || isnull(new_icon) || new_icon == icon || !M.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) + return + overlay_state = new_icon + update_icon() + to_chat(M, "[src] is now skinned as '[choice]'.") + /obj/item/lighter/suicide_act(mob/living/carbon/user) if (lit) user.visible_message("[user] begins holding \the [src]'s flame up to [user.p_their()] face! It looks like [user.p_theyre()] trying to commit suicide!")