From 71dfa910dc20ab7b908ec3e152cfb0d8a48aefab Mon Sep 17 00:00:00 2001 From: Menown Date: Fri, 20 Sep 2019 15:14:25 -0500 Subject: [PATCH] Custom item fixes - Menown (#7023) * Fixes the bedroll duplication * Fixes a message that was left unedited. --- code/modules/customitems/item_defines.dm | 5 +++-- icons/obj/custom_items/muhawir_items.dmi | Bin 1711 -> 1916 bytes 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 7ee9fbc353d..50f3b8dd49b 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -3147,12 +3147,13 @@ All custom items with worn sprites must follow the contained sprite system: http return usr.visible_message( - "[usr] begins setting up the [src.name].", - "You begin setting up the [src.name].") + "[usr] begins taking apart the [src.name].", + "You begin taking apart the [src.name].") if(has_bedroll) if(do_after(usr, 20 SECONDS, act_target = src)) to_chat(usr, "You roll up the bedroll inside \the [src].") new/obj/item/weapon/fluff/muhawir_bedroll(get_turf(usr)) + has_bedroll = FALSE if(do_after(usr, 50 SECONDS, act_target = src)) to_chat(usr, "You take down \the [src].") new/obj/item/weapon/fluff/muhawir_tent(get_turf(usr)) diff --git a/icons/obj/custom_items/muhawir_items.dmi b/icons/obj/custom_items/muhawir_items.dmi index 73f086cd803ff52477a3e875828a2bb4596b266c..2b5c61d6928bdb6adcd5f713098bf64cd289e213 100644 GIT binary patch delta 1533 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