diff --git a/code/modules/projectiles/ammunition/special/magic.dm b/code/modules/projectiles/ammunition/special/magic.dm index 8380bf82e9..821f6d002f 100644 --- a/code/modules/projectiles/ammunition/special/magic.dm +++ b/code/modules/projectiles/ammunition/special/magic.dm @@ -35,6 +35,9 @@ /obj/item/ammo_casing/magic/spellblade projectile_type = /obj/item/projectile/magic/spellblade +/obj/item/ammo_casing/magic/judgement_cut + projectile_type = /obj/item/projectile/judgement_cut + /obj/item/ammo_casing/magic/arcane_barrage projectile_type = /obj/item/projectile/magic/arcane_barrage diff --git a/code/modules/projectiles/guns/magic/motivation.dm b/code/modules/projectiles/guns/magic/motivation.dm new file mode 100644 index 0000000000..8ce802a227 --- /dev/null +++ b/code/modules/projectiles/guns/magic/motivation.dm @@ -0,0 +1,57 @@ +/obj/item/gun/magic/staff/motivation + name = "Motivation" + desc = "Rumored to have the ability to open up a portal the depths of Lavaland." + icon = 'icons/obj/items_and_weapons.dmi' + icon_state = "motivation" + item_state = "motivation" + lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' + fire_sound = 'sound/magic/fireball.ogg' + ammo_type = /obj/item/ammo_casing/magic/judgement_cut + force = 40 + armour_penetration = 50 + w_class = WEIGHT_CLASS_NORMAL + slot_flags = ITEM_SLOT_BELT + hitsound = 'sound/weapons/bladeslice.ogg' + attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + sharpness = SHARP_EDGED + max_integrity = 200 + resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF + max_charges = 3 + recharge_rate = 5 + var/datum/action/judgement_cut/judgementcut = new/datum/action/judgement_cut() + + +/obj/item/gun/magic/staff/motivation/Initialize() + . = ..() + judgementcut = new(src) + +/obj/item/gun/magic/staff/motivation/shoot_with_empty_chamber(mob/living/user as mob|obj) + to_chat(user, "Judgment Cut is recharging.") + +/datum/action/judgement_cut + name = "Judgement Cut - Allows Motivation to slash at a longer distance." + icon_icon = 'icons/mob/actions/actions_items.dmi' + button_icon_state = "neckchop" + var/judgement_toggled = TRUE + +/datum/action/judgement_cut/Trigger() + judgement_toggled = !judgement_toggled + to_chat(owner, "You [judgement_toggled ? "enable" : "disable"] Judgement Cuts with [src].") + +/obj/item/gun/magic/staff/motivation/can_trigger_gun(mob/living/user) + . = ..() + if(!judgementcut.judgement_toggled) + to_chat(user, " Judgment Cut is disabled.") + return + +/obj/item/gun/magic/staff/motivation/pickup(mob/living/user) + . = ..() + judgementcut.Grant(user, src) + user.update_icons() + playsound(src, 'sound/items/unsheath.ogg', 25, 1) + +/obj/item/gun/magic/staff/motivation/dropped(mob/user) + . = ..() + judgementcut.Remove(user) + user.update_icons() diff --git a/code/modules/projectiles/projectile/special/judgement_cut.dm b/code/modules/projectiles/projectile/special/judgement_cut.dm new file mode 100644 index 0000000000..645ad885cd --- /dev/null +++ b/code/modules/projectiles/projectile/special/judgement_cut.dm @@ -0,0 +1,13 @@ +/obj/item/projectile/judgement_cut + name = "judgement cut" + icon_state = "neurotoxin" + damage = 20 + damage_type = BRUTE + range = 30 + is_reflectable = FALSE + sharpness = SHARP_EDGED + +/* +/obj/item/projectile/judgement_cut/on_hit(atom/target, blocked = FALSE) + ..() +*/ \ No newline at end of file diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi index 119e612c40..6d62053062 100644 Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 532e57148a..1a7d19d6e0 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3073,6 +3073,7 @@ #include "code\modules\projectiles\guns\energy\pulse.dm" #include "code\modules\projectiles\guns\energy\special.dm" #include "code\modules\projectiles\guns\energy\stun.dm" +#include "code\modules\projectiles\guns\magic\motivation.dm" #include "code\modules\projectiles\guns\magic\spell_book.dm" #include "code\modules\projectiles\guns\magic\staff.dm" #include "code\modules\projectiles\guns\magic\wand.dm" @@ -3118,6 +3119,7 @@ #include "code\modules\projectiles\projectile\special\gravity.dm" #include "code\modules\projectiles\projectile\special\hallucination.dm" #include "code\modules\projectiles\projectile\special\ion.dm" +#include "code\modules\projectiles\projectile\special\judgement_cut.dm" #include "code\modules\projectiles\projectile\special\meteor.dm" #include "code\modules\projectiles\projectile\special\mindflayer.dm" #include "code\modules\projectiles\projectile\special\neurotoxin.dm"