Merge remote-tracking branch 'citadel/master' into combat_v7

code/modules/projectiles/projectile/bullets/dart_syringe.dm

@@ -38,6 +38,10 @@
 	reagents.add_reagent(/datum/reagent/foaming_agent, 5)
 	reagents.add_reagent(/datum/reagent/toxin/acid, 5)
 
+/obj/item/projectile/bullet/dart/catranq/Initialize()
+	. = ..()
+	reagents.add_reagent(/datum/reagent/fermi/furranium, 5) // Turns out I don't even need to give this guy actual tranquilizer chems.
+
 /obj/item/projectile/bullet/dart/syringe
 	name = "syringe"
 	icon_state = "syringeproj"

code/modules/projectiles/projectile/special/judgement_cut.dm

@@ -0,0 +1,15 @@
+/obj/item/projectile/judgement_cut
+	name = "judgement cut"
+	icon_state = "judgement_fire"
+	hitsound = 'sound/weapons/judgementfire.ogg'
+	damage = 10
+	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))
+		new /obj/effect/temp_visual/impact_effect/judgement_cut(src)