Pick-up/Drop added; Equip removed from flow

Need to add armor pickup/drop and onscreen equip