Thickmaterial Flag

code/modules/reagents/reagent_containers/hypospray.dm

@@ -14,18 +14,19 @@
 	possible_transfer_amounts = list(1,2,3,4,5,10,15,20,25,30)
 	flags = OPENCONTAINER
 	slot_flags = SLOT_BELT
+	var/ignore_flags = 0
 
 /obj/item/weapon/reagent_containers/hypospray/attack_paw(mob/user as mob)
 	return src.attack_hand(user)
 
 
-/obj/item/weapon/reagent_containers/hypospray/attack(mob/M as mob, mob/user as mob)
+/obj/item/weapon/reagent_containers/hypospray/attack(mob/living/M, mob/user)
 	if(!reagents.total_volume)
 		user << "\red [src] is empty."
 		return
-	if (!( istype(M, /mob) ))
+	if(!istype(M))
 		return
-	if (reagents.total_volume)
+	if(reagents.total_volume && (ignore_flags || M.can_inject(user, 1)))
 		user << "\blue You inject [M] with [src]."
 		M << "\red You feel a tiny prick!"
 
@@ -61,6 +62,7 @@
 	possible_transfer_amounts = list(10)
 	icon_state = "combat_hypo"
 	volume = 60
+	ignore_flags = 1 // So they can heal their comrades.
 
 /obj/item/weapon/reagent_containers/hypospray/combat/New()
 	..()
@@ -75,6 +77,7 @@
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(10)
 	volume = 10
+	ignore_flags = 1 //so you can medipen through hardsuits
 	flags = null
 
 /obj/item/weapon/reagent_containers/hypospray/autoinjector/New()

code/modules/reagents/reagent_containers/syringes.dm

@@ -55,6 +55,11 @@
 		if(!proximity) return
 		if(!target.reagents) return
 
+		if(isliving(target))
+			var/mob/living/M = target
+			if(!M.can_inject(user, 1))
+				return
+
 		if(mode == SYRINGE_BROKEN)
 			user << "\red This syringe is broken!"
 			return