Fixes merge conflict and makes minor adjustments

TItle
2021-01-29 09:32:28 -05:00
parent a4e933185e
commit 4346cb937a
3 changed files with 2 additions and 2 deletions
@@ -8,7 +8,7 @@
 	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
 	fire_sound = 'sound/weapons/judgementhit.ogg'
 	ammo_type = /obj/item/ammo_casing/magic/judgement_cut
-	force = 10
+	force = 20
 	armour_penetration = 50
 	w_class = WEIGHT_CLASS_NORMAL
 	slot_flags = ITEM_SLOT_BELT
@@ -2,7 +2,7 @@
 	name = "judgement cut"
 	icon_state = "judgement_fire"
 	hitsound = 'sound/weapons/judgementfire.ogg'
-	damage = 5
+	damage = 10
 	damage_type = BRUTE
 	range = 30
 	is_reflectable = FALSE