diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm index b6af3d4730de..937201d09ac8 100644 --- a/code/game/objects/items/melee/energy.dm +++ b/code/game/objects/items/melee/energy.dm @@ -222,6 +222,40 @@ else return ..() +/obj/item/melee/transforming/energy/sword/bikehorn + name = "bike horn" + desc = "A horn off of a bicycle." + icon_state = "swordhonk" + lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' + icon_state_on = "swordpink" + saber_color = null + light_color = "#ff3399" + force = 0 + throwforce = 0 + attack_verb = list("HONKED") + hitsound = null + +/obj/item/melee/transforming/energy/sword/bikehorn/Initialize(mapload) + . = ..() + AddComponent(/datum/component/squeak, list('sound/items/bikehorn.ogg'=1), 50) + qdel(GetComponent(/datum/component/cleave_attack)) + +/obj/item/melee/transforming/energy/sword/bikehorn/attack(mob/living/carbon/M, mob/living/carbon/user) + SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "honk", /datum/mood_event/honk) + return ..() + +/obj/item/melee/transforming/energy/sword/bikehorn/transform_weapon(mob/living/user, supress_message_text) + . = ..() + if(active) + name += " energy sword" + desc += " It has a powerful hardlight sword attached to it." + AddComponent(/datum/component/cleave_attack) + else + name = initial(name) + desc = initial(desc) + qdel(GetComponent(/datum/component/cleave_attack)) + /obj/item/melee/transforming/energy/sword/pirate name = "energy cutlass" desc = "Arrrr matey." diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index d6877797c692..c11dff131d41 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -2579,6 +2579,13 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) restricted_roles = list("Research Director", "Scientist", "Roboticist") include_objectives = list(/datum/objective/hijack, /datum/objective/martyr) //yogs // >Increase price to reduce grief > limit it to hijack only :think: +/datum/uplink_item/role_restricted/honksword + name = "Bike Horn Energy Sword" + desc = "All the features of the original energy sword, with additional fun! Functionally identical to a bike horn when concealed. Activating it produces a loud, distinctive noise." + item = /obj/item/melee/transforming/energy/sword/bikehorn + cost = 9 //1tc more than esword as it's a little more stealthy + restricted_roles = list("Clown") + /datum/uplink_item/role_restricted/clowncar name = "Clown Car" desc = "The Clown Car is the ultimate transportation method for any worthy clown! \ diff --git a/icons/mob/inhands/weapons/swords_lefthand.dmi b/icons/mob/inhands/weapons/swords_lefthand.dmi index d37c6a3960e6..95ede04381c4 100644 Binary files a/icons/mob/inhands/weapons/swords_lefthand.dmi and b/icons/mob/inhands/weapons/swords_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/swords_righthand.dmi b/icons/mob/inhands/weapons/swords_righthand.dmi index 1164a7cb7db2..840660158dae 100644 Binary files a/icons/mob/inhands/weapons/swords_righthand.dmi and b/icons/mob/inhands/weapons/swords_righthand.dmi differ diff --git a/icons/obj/weapons/energy.dmi b/icons/obj/weapons/energy.dmi index b52bcd7fcc90..1a4704c13c8c 100644 Binary files a/icons/obj/weapons/energy.dmi and b/icons/obj/weapons/energy.dmi differ