From c7796455bced29b7b920ff7843468a20aaa9cf42 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Fri, 5 Aug 2016 20:42:25 -0300 Subject: [PATCH] Fixing custom mech paint kits and adding the tiger's claw custom item (#673) Alright, I will keep the bay system, since it seems to work better, and now exosuit sprites will go in custom objects. Also, fixing a missing item, and zubari spawning with two fancy jakckets, in the new config, which should replace the actual one: --- code/modules/customitems/item_defines.dm | 27 ++++++++++++++++++++++ code/modules/customitems/item_spawning.dm | 2 +- icons/obj/custom_items/moon_baton.dmi | Bin 0 -> 2181 bytes icons/obj/custom_items_obj.dmi | Bin 0 -> 2183 bytes 4 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 icons/obj/custom_items/moon_baton.dmi diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index cad329bb618..7db6f5999c9 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -325,3 +325,30 @@ return ..() + + +/obj/item/weapons/fluff/moon_baton //Tiger Claw - Zander Moon - omnivac - DONE + name = "tiger claw" + desc = "A small energy dagger given to Golden Tigers." + icon = 'icons/obj/custom_items/moon_baton.dmi' + icon_state = "tigerclaw" + slot_flags = SLOT_BELT + force = 2 + w_class = 2 + contained_sprite = 1 + var/active = 0 + +/obj/item/weapons/fluff/moon_baton/attack_self(mob/user) + active= !active + if(active) + playsound(user, 'sound/weapons/saberon.ogg', 50, 1) + user << "\blue \The [src] is now energised." + icon_state = "tigerclaw_active" + slot_flags = null + attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + else + playsound(user, 'sound/weapons/saberoff.ogg', 50, 1) + user << "\blue \The [src] is de-energised." + icon_state = initial(icon_state) + slot_flags = initial(slot_flags) + attack_verb = list() diff --git a/code/modules/customitems/item_spawning.dm b/code/modules/customitems/item_spawning.dm index 60143e55511..48e39d42c55 100644 --- a/code/modules/customitems/item_spawning.dm +++ b/code/modules/customitems/item_spawning.dm @@ -80,7 +80,7 @@ var/obj/item/device/kit/suit/kit = item kit.new_light_overlay = additional_data kit.new_mob_icon_file = CUSTOM_ITEM_MOB - + // for snowflake implants else if(istype(item, /obj/item/weapon/implanter/fluff)) var/obj/item/weapon/implanter/fluff/L = item diff --git a/icons/obj/custom_items/moon_baton.dmi b/icons/obj/custom_items/moon_baton.dmi new file mode 100644 index 0000000000000000000000000000000000000000..f2f2a2a60b683d5977e132676561af65201a5c72 GIT binary patch literal 2181 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 JPDHLkV1kt+2M_=N literal 0 HcmV?d00001