Merge branch 'master' into Dwarf

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

@@ -6,8 +6,7 @@
 
 /obj/item/projectile/bullet/dart/Initialize()
 	. = ..()
-	create_reagents(50)
-	reagents.set_reacting(FALSE)
+	create_reagents(50, NO_REACT)
 
 /obj/item/projectile/bullet/dart/on_hit(atom/target, blocked = FALSE, skip = FALSE)
 	if(iscarbon(target))
@@ -26,7 +25,7 @@
 									   "<span class='userdanger'>You were protected against \the [src]!</span>")
 
 	..(target, blocked)
-	reagents.set_reacting(TRUE)
+	DISABLE_BITFIELD(reagents.reagents_holder_flags, NO_REACT)
 	reagents.handle_reactions()
 	return TRUE
 

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

@@ -18,6 +18,7 @@
 /obj/item/projectile/bullet/shotgun_stunslug
 	name = "stunslug"
 	damage = 5
+	stamina = 20
 	knockdown = 100
 	stutter = 5
 	jitter = 20