I've had to cut back my joking in the office to almost zero. It sucks, but people are way to sensitive nowadays.
I spoke to my supervisor about it. He didn't see the humor in what I said either, which I conceded to. But he passed it on to the woman's supervisor. (We sat in different rows and have different supervisors)