diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm
index 44fa231c07..7e7ee1bc17 100644
--- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm
+++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm
@@ -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
\ No newline at end of file
diff --git a/code/game/objects/effects/temporary_visuals/projectiles/impact.dm b/code/game/objects/effects/temporary_visuals/projectiles/impact.dm
index a98c40d4fc..66b770926f 100644
--- a/code/game/objects/effects/temporary_visuals/projectiles/impact.dm
+++ b/code/game/objects/effects/temporary_visuals/projectiles/impact.dm
@@ -43,4 +43,4 @@
/obj/effect/projectile/impact/laser/emitter
name = "emitter impact"
- icon_state = "impact_emitter"
+ icon_state = "impact_emitter"
\ No newline at end of file
diff --git a/code/modules/projectiles/guns/magic/motivation.dm b/code/modules/projectiles/guns/magic/motivation.dm
index 8ce802a227..176816ed63 100644
--- a/code/modules/projectiles/guns/magic/motivation.dm
+++ b/code/modules/projectiles/guns/magic/motivation.dm
@@ -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, "You [judgement_toggled ? "enable" : "disable"] Judgement Cuts with [src].")
+ to_chat(owner, "You [judgement_toggled ? "enable" : "disable"] Judgement Cuts with Motivation.")
/obj/item/gun/magic/staff/motivation/can_trigger_gun(mob/living/user)
. = ..()
if(!judgementcut.judgement_toggled)
to_chat(user, " Judgment Cut is disabled.")
- return
+ return FALSE
/obj/item/gun/magic/staff/motivation/pickup(mob/living/user)
. = ..()
diff --git a/code/modules/projectiles/projectile/special/judgement_cut.dm b/code/modules/projectiles/projectile/special/judgement_cut.dm
index 645ad885cd..d05dfa81f8 100644
--- a/code/modules/projectiles/projectile/special/judgement_cut.dm
+++ b/code/modules/projectiles/projectile/special/judgement_cut.dm
@@ -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)
- ..()
-*/
\ No newline at end of file
+ . = ..()
+ if(ishuman(target))
+ var/mob/living/carbon/human/H = target
+ new /obj/effect/temp_visual/impact_effect/judgement_cut(src)
\ No newline at end of file
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
index 52164e1d33..fc523ead32 100644
Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ
diff --git a/icons/obj/projectiles.dmi b/icons/obj/projectiles.dmi
index 94568b8633..71391a035e 100644
Binary files a/icons/obj/projectiles.dmi and b/icons/obj/projectiles.dmi differ
diff --git a/sound/weapons/judgementfire.ogg b/sound/weapons/judgementfire.ogg
new file mode 100644
index 0000000000..f356a094de
Binary files /dev/null and b/sound/weapons/judgementfire.ogg differ
diff --git a/sound/weapons/judgementhit.ogg b/sound/weapons/judgementhit.ogg
new file mode 100644
index 0000000000..23816a537f
Binary files /dev/null and b/sound/weapons/judgementhit.ogg differ