Merge branch 'master' into fourth_week_preparation_and_fixes

# Conflicts:
#	code/game/jobs/faction/zavodskoi.dm

code/modules/reagents/reagent_containers/hypospray.dm

@@ -113,6 +113,7 @@
 	desc_info = "Autoinjectors are spent after using them. To re-use, use a screwdriver to open the back panel, then simply pour any desired reagent inside. Use in-hand, or click it while it's in your active hand to prepare it for reuse."
 	icon_state = "autoinjector"
 	item_state = "autoinjector"
+	slot_flags = SLOT_EARS
 	var/name_label
 	var/spent = TRUE
 	amount_per_transfer_from_this = 5
@@ -296,4 +297,4 @@
 /obj/item/reagent_containers/hypospray/combat/empty
 	name = "combat hypospray"
 	desc = "A sleek black hypospray. Its needle has the ability to bypass armor."
-	reagents_to_add = FALSE
+	reagents_to_add = FALSE