Tangential THICKMATERIAL-related fixes

-Monkey bites now respect THICKMATERIAL. Essential for monkey mode.
-Fixes Combat Hypo for Nuke Ops (wtf were you thinking goofball??), important since their thick hardsuits prevent many other forms of healing. Now it'll be better at healing and very good at helping up ops who are in crit.

code/modules/mob/living/carbon/carbon_defense.dm

@@ -55,15 +55,15 @@
 		if(D.IsSpreadByTouch())
 			ContractDisease(D)
 
+	if(M.a_intent == "help")
+		help_shake_act(M)
+		return 0
+
 	if(..()) //successful monkey bite.
 		for(var/datum/disease/D in M.viruses)
 			ForceContractDisease(D)
 		return 1
 
-	if(M.a_intent == "help")
-		help_shake_act(M)
-	return 0
-
 
 /mob/living/carbon/attack_slime(mob/living/simple_animal/slime/M)
 	if(..()) //successful slime attack

code/modules/mob/living/carbon/human/human_attackpaw.dm

@@ -1,12 +1,15 @@
 /mob/living/carbon/human/attack_paw(mob/living/carbon/monkey/M as mob)
-	if(..()) //successful monkey bite.
-		var/damage = rand(1, 3)
-		var/dam_zone = pick("chest", "l_hand", "r_hand", "l_leg", "r_leg")
-		var/obj/item/organ/limb/affecting = get_organ(ran_zone(dam_zone))
-		if(stat != DEAD)
-			apply_damage(damage, BRUTE, affecting, run_armor_check(affecting, "melee"))
-			updatehealth()
+	var/dam_zone = pick("chest", "l_hand", "r_hand", "l_leg", "r_leg")
+	var/obj/item/organ/limb/affecting = get_organ(ran_zone(dam_zone))
 
-		for(var/datum/disease/D in M.viruses)
-			ContractDisease(D)
-	return
+	if(M.a_intent == "help")
+		..() //shaking
+		return 0
+
+	if(can_inject(M, 1, affecting))//Thick suits can stop monkey bites.
+		if(..()) //successful monkey bite, this handles disease contraction.
+			var/damage = rand(1, 3)
+			if(stat != DEAD)
+				apply_damage(damage, BRUTE, affecting, run_armor_check(affecting, "melee"))
+				updatehealth()
+		return 1

code/modules/reagents/reagent_containers/hypospray.dm

@@ -46,9 +46,9 @@
 	desc = "A modified air-needle autoinjector, used by support operatives to quickly heal injuries in combat."
 	amount_per_transfer_from_this = 10
 	icon_state = "combat_hypo"
-	volume = 60
+	volume = 90
 	ignore_flags = 1 // So they can heal their comrades.
-	list_reagents = list("epinephrine" = 15, "salglu_solution" = 15)
+	list_reagents = list("epinephrine" = 30, "omnizine" = 30, "leporazine" = 15, "atropine" = 15)
 
 /obj/item/weapon/reagent_containers/hypospray/combat/nanites
 	desc = "A modified air-needle autoinjector for use in combat situations. Prefilled with expensive medical nanites for rapid healing."