Merge pull request #1914 from CIB/master

Added tramadol to med storage and more

code/game/objects/items/weapons/storage/firstaid.dm

@@ -28,13 +28,13 @@
 /obj/item/weapon/storage/firstaid/regular/New()
 	..()
 	if (empty) return
+	new /obj/item/device/healthanalyzer( src )
 	new /obj/item/weapon/reagent_containers/hypospray/autoinjector( src )
 	new /obj/item/stack/medical/bruise_pack(src)
 	new /obj/item/stack/medical/bruise_pack(src)
 	new /obj/item/stack/medical/bruise_pack(src)
 	new /obj/item/stack/medical/ointment(src)
 	new /obj/item/stack/medical/ointment(src)
-	new /obj/item/stack/medical/ointment(src)
 	return
 
 /obj/item/weapon/storage/firstaid/toxin/New()

code/modules/reagents/reagent_containers/hypospray.dm

@@ -55,7 +55,7 @@
 /obj/item/weapon/reagent_containers/hypospray/autoinjector
 	name = "autoinjector"
 	desc = "A rapid and safe way to administer small amounts of drugs by untrained or trained personnel."
-	icon_state = "autoinjector"
+	icon_state = "autoinjector1"
 	item_state = "autoinjector"
 	amount_per_transfer_from_this = 5
 	volume = 5