Merge branch 'master' of https://github.com/ParadiseSS13/Paradise

Conflicts:
	code/modules/reagents/reagent_containers/syringes.dm

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -1243,8 +1243,7 @@
 	icon_state = "chinese2"
 	New()
 		..()
-		reagents.add_reagent("nutriment", 5)
-		reagents.add_reagent("carpotoxin", 1)
+		reagents.add_reagent("nutriment", 6)
 		bitesize = 2
 
 /obj/item/weapon/reagent_containers/food/snacks/chinese/newdles

code/modules/reagents/reagent_containers/syringes.dm

@@ -64,11 +64,11 @@
 			user << "\red This syringe is broken!"
 			return
 
-		if (user.a_intent == "harm" && ismob(target))
+/*		if (user.a_intent == "harm" && ismob(target))
 			if((CLUMSY in user.mutations) && prob(50))
 				target = user
 			syringestab(target, user)
-			return
+			return */
 
 
 		switch(mode)
@@ -357,7 +357,7 @@
 	attack_paw()
 		return attack_hand()
 
-	attackby(obj/item/I as obj, mob/user as mob, params)
+	attackby(obj/item/I as obj, mob/user as mob)
 
 		return