Merge branch 'master' of https://github.com/VOREStation/VOREStation into self

# Conflicts:
#	code/game/jobs/job/civilian_chaplain.dm
#	code/modules/mob/language/station_vr.dm

code/modules/reagents/reagent_containers/hypospray.dm

@@ -49,7 +49,7 @@
 				if(H.a_intent != I_HELP)
 					to_chat(user, "<span class='notice'>[H] is resisting your attempt to inject them with \the [src].</span>")
 					to_chat(H, "<span class='danger'> [user] is trying to inject you with \the [src]!</span>")
-					if(!do_after(user, 30))
+					if(!do_after(user, 30, H))
 						return
 
 	user.setClickCooldown(DEFAULT_QUICK_COOLDOWN)

code/modules/reagents/reagent_containers/syringes.dm

@@ -333,8 +333,8 @@
 /obj/item/weapon/reagent_containers/syringe/inaprovaline/New()
 	..()
 	reagents.add_reagent("inaprovaline", 15)
-	mode = SYRINGE_INJECT
-	update_icon()
+	//mode = SYRINGE_INJECT //VOREStation Edit - Starts capped
+	//update_icon()
 
 /obj/item/weapon/reagent_containers/syringe/antitoxin
 	name = "Syringe (anti-toxin)"
@@ -343,8 +343,8 @@
 /obj/item/weapon/reagent_containers/syringe/antitoxin/New()
 	..()
 	reagents.add_reagent("anti_toxin", 15)
-	mode = SYRINGE_INJECT
-	update_icon()
+	//mode = SYRINGE_INJECT //VOREStation Edit - Starts capped
+	//update_icon()
 
 /obj/item/weapon/reagent_containers/syringe/antiviral
 	name = "Syringe (spaceacillin)"
@@ -353,8 +353,8 @@
 /obj/item/weapon/reagent_containers/syringe/antiviral/New()
 	..()
 	reagents.add_reagent("spaceacillin", 15)
-	mode = SYRINGE_INJECT
-	update_icon()
+	//mode = SYRINGE_INJECT //VOREStation Edit - Starts capped
+	//update_icon()
 
 /obj/item/weapon/reagent_containers/syringe/drugs
 	name = "Syringe (drugs)"
@@ -365,8 +365,8 @@
 	reagents.add_reagent("space_drugs",  5)
 	reagents.add_reagent("mindbreaker",  5)
 	reagents.add_reagent("cryptobiolin", 5)
-	mode = SYRINGE_INJECT
-	update_icon()
+	//mode = SYRINGE_INJECT //VOREStation Edit - Starts capped
+	//update_icon()
 
 /obj/item/weapon/reagent_containers/syringe/ld50_syringe/choral/New()
 	..()

code/modules/reagents/reagent_containers/syringes_vr.dm

@@ -43,7 +43,11 @@
 
 	//Dirtiness should be very low if you're the first injectee. If you're spam-injecting 4 people in a row around you though,
 	//This gives the last one a 30% chance of infection.
-	if(prob(dirtiness+(targets.len-1)*10))
+	var/infect_chance = dirtiness        //Start with dirtiness
+	if(infect_chance <= 10 && (hash in targets)) //Extra fast uses on target is free
+		infect_chance = 0
+	infect_chance += (targets.len-1)*10    //Extra 10% per extra target
+	if(prob(infect_chance))
 		log_and_message_admins("[loc] infected [target]'s [eo.name] with \the [src].")
 		infect_limb(eo)