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
@@ -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