Motivation near final

Should be almost done after this.
This commit is contained in:
keronshb
2021-01-28 22:06:25 -05:00
parent a2833ea85f
commit a6725b3c23
8 changed files with 26 additions and 12 deletions
@@ -367,6 +367,12 @@
icon_state = "shieldsparkles"
duration = 6
/obj/effect/temp_visual/impact_effect/judgement_cut
name = "judgement cut impact"
icon = 'icons/effects/effects.dmi'
icon_state = "impact_judgement"
duration = 6
/obj/effect/temp_visual/heart
name = "heart"
icon = 'icons/mob/animal.dmi'
@@ -524,3 +530,7 @@
/obj/effect/temp_visual/slime_puddle/reverse
icon_state = "from_puddle"
duration = 7
/obj/effect/temp_visual/gib_animation
icon = 'icons/mob/mob.dmi'
duration = 15
@@ -43,4 +43,4 @@
/obj/effect/projectile/impact/laser/emitter
name = "emitter impact"
icon_state = "impact_emitter"
icon_state = "impact_emitter"
@@ -6,9 +6,9 @@
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'
fire_sound = 'sound/weapons/judgementhit.ogg'
ammo_type = /obj/item/ammo_casing/magic/judgement_cut
force = 40
force = 10
armour_penetration = 50
w_class = WEIGHT_CLASS_NORMAL
slot_flags = ITEM_SLOT_BELT
@@ -31,19 +31,19 @@
/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"
icon_icon = 'icons/obj/projectiles.dmi'
button_icon_state = "judgement_fire"
var/judgement_toggled = TRUE
/datum/action/judgement_cut/Trigger()
judgement_toggled = !judgement_toggled
to_chat(owner, "<span class='notice'>You [judgement_toggled ? "enable" : "disable"] Judgement Cuts with [src].</span>")
to_chat(owner, "<span class='notice'>You [judgement_toggled ? "enable" : "disable"] Judgement Cuts with Motivation.</span>")
/obj/item/gun/magic/staff/motivation/can_trigger_gun(mob/living/user)
. = ..()
if(!judgementcut.judgement_toggled)
to_chat(user, "<span class='notice'> Judgment Cut is disabled.</span>")
return
return FALSE
/obj/item/gun/magic/staff/motivation/pickup(mob/living/user)
. = ..()
@@ -1,13 +1,17 @@
/obj/item/projectile/judgement_cut
name = "judgement cut"
icon_state = "neurotoxin"
damage = 20
icon_state = "judgement_fire"
hitsound = 'sound/weapons/judgementfire.ogg'
damage = 5
damage_type = BRUTE
range = 30
is_reflectable = FALSE
sharpness = SHARP_EDGED
impact_effect_type = /obj/effect/temp_visual/impact_effect/judgement_cut
/*
/obj/item/projectile/judgement_cut/on_hit(atom/target, blocked = FALSE)
..()
*/
. = ..()
if(ishuman(target))
var/mob/living/carbon/human/H = target
new /obj/effect/temp_visual/impact_effect/judgement_cut(src)
Binary file not shown.

Before

Width:  |  Height:  |  Size: 884 KiB

After

Width:  |  Height:  |  Size: 885 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 128 KiB

After

Width:  |  Height:  |  Size: 129 KiB

Binary file not shown.
Binary file not shown.